From eb208a2ae8b893b3938a50081f596426004d7365 Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Sun, 8 Jun 2025 03:51:38 +1200 Subject: [PATCH] Genpop wall lockers (#38102) * sprites * genpop wall lockers * number 5 alive * slight boilerplate code, thank you slarti --- Content.Server/Security/GenpopSystem.cs | 12 +- .../Storage/Closets/Lockers/lockers.yml | 39 ++-- .../Storage/Closets/base_structureclosets.yml | 5 + .../Storage/Closets/wall_lockers.yml | 79 ++++++-- .../Storage/wall_locker.rsi/genpop.png | Bin 0 -> 481 bytes .../Storage/wall_locker.rsi/genpop_door_1.png | Bin 0 -> 557 bytes .../Storage/wall_locker.rsi/genpop_door_2.png | Bin 0 -> 563 bytes .../Storage/wall_locker.rsi/genpop_door_3.png | Bin 0 -> 558 bytes .../Storage/wall_locker.rsi/genpop_door_4.png | Bin 0 -> 554 bytes .../Storage/wall_locker.rsi/genpop_door_5.png | Bin 0 -> 559 bytes .../Storage/wall_locker.rsi/genpop_door_6.png | Bin 0 -> 563 bytes .../Storage/wall_locker.rsi/genpop_door_7.png | Bin 0 -> 557 bytes .../Storage/wall_locker.rsi/genpop_door_8.png | Bin 0 -> 561 bytes .../Storage/wall_locker.rsi/genpop_open.png | Bin 0 -> 536 bytes .../Storage/wall_locker.rsi/meta.json | 180 ++++++++++++++---- 15 files changed, 239 insertions(+), 76 deletions(-) create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_1.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_2.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_3.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_4.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_5.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_6.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_7.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_8.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_open.png diff --git a/Content.Server/Security/GenpopSystem.cs b/Content.Server/Security/GenpopSystem.cs index 0a4233308e..5bff46ad38 100644 --- a/Content.Server/Security/GenpopSystem.cs +++ b/Content.Server/Security/GenpopSystem.cs @@ -1,14 +1,24 @@ using Content.Shared.Security.Components; using Content.Shared.Security.Systems; +using Content.Shared.Wall; namespace Content.Server.Security; public sealed class GenpopSystem : SharedGenpopSystem { + private const float GenpopIDEjectDistanceFromWall = 1f; protected override void CreateId(Entity ent, string name, float sentence, string crime) { + // Default to prisoner locker coordinates for ID spawn var xform = Transform(ent); - var uid = Spawn(ent.Comp.IdCardProto, xform.Coordinates); + var spawnCoordinates = xform.Coordinates; + // Offset prisoner wall locker coordinates in wallmount direction for ID spawn; avoids spawning ID inside wall + if (TryComp(ent, out var wallMountComponent)) + { + var offset = (wallMountComponent.Direction + xform.LocalRotation - Math.PI / 2).ToVec() * GenpopIDEjectDistanceFromWall; + spawnCoordinates = spawnCoordinates.Offset(offset); + } + var uid = Spawn(ent.Comp.IdCardProto, spawnCoordinates); ent.Comp.LinkedId = uid; IdCard.TryChangeFullName(uid, name); diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 47075f07e5..6713a8303d 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -398,11 +398,8 @@ # Genpop Storage - type: entity - id: LockerPrisoner - parent: LockerBaseSecure - name: prisoner closet - description: It's a secure locker for an inmate's personal belongings during their time in prison. - suffix: 1 + id: GenpopBase + abstract: true components: - type: GenpopLocker - type: EntityStorageVisuals @@ -418,6 +415,19 @@ - type: Lock locked: false useAccess: false + - type: EntityStorage + open: True + removedMasks: 20 + - type: PlaceableSurface + isPlaceable: True + +- type: entity + parent: [ GenpopBase , LockerBaseSecure ] + id: LockerPrisoner + name: prisoner closet + description: It's a secure locker for an inmate's personal belongings during their time in prison. + suffix: 1 + components: - type: Fixtures fixtures: fix1: @@ -439,63 +449,58 @@ hard: True restitution: 0 friction: 0.4 - - type: EntityStorage - open: True - removedMasks: 20 - - type: PlaceableSurface - isPlaceable: True - type: entity - id: LockerPrisoner2 parent: LockerPrisoner + id: LockerPrisoner2 suffix: 2 components: - type: EntityStorageVisuals stateDoorClosed: genpop_door_2 - type: entity - id: LockerPrisoner3 parent: LockerPrisoner + id: LockerPrisoner3 suffix: 3 components: - type: EntityStorageVisuals stateDoorClosed: genpop_door_3 - type: entity - id: LockerPrisoner4 parent: LockerPrisoner + id: LockerPrisoner4 suffix: 4 components: - type: EntityStorageVisuals stateDoorClosed: genpop_door_4 - type: entity - id: LockerPrisoner5 parent: LockerPrisoner + id: LockerPrisoner5 suffix: 5 components: - type: EntityStorageVisuals stateDoorClosed: genpop_door_5 - type: entity - id: LockerPrisoner6 parent: LockerPrisoner + id: LockerPrisoner6 suffix: 6 components: - type: EntityStorageVisuals stateDoorClosed: genpop_door_6 - type: entity - id: LockerPrisoner7 parent: LockerPrisoner + id: LockerPrisoner7 suffix: 7 components: - type: EntityStorageVisuals stateDoorClosed: genpop_door_7 - type: entity - id: LockerPrisoner8 parent: LockerPrisoner + id: LockerPrisoner8 suffix: 8 components: - type: EntityStorageVisuals diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index 84b25d1351..211eee609a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -195,6 +195,11 @@ SheetSteel1: min: 1 max: 1 + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: generic + stateDoorOpen: generic_open + stateDoorClosed: generic_door - type: Construction graph: ClosetWall node: done diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml index 311cccd429..7943e74e94 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml @@ -4,7 +4,6 @@ name: maintenance wall closet description: It's a storage unit. components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -16,7 +15,6 @@ parent: BaseWallCloset description: It's a storage unit for emergency breath masks and O2 tanks. components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: emergency stateDoorOpen: emergency_open @@ -28,7 +26,6 @@ name: emergency nitrogen wall closet description: It's full of life-saving equipment. Assuming, that is, that you breathe nitrogen. components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: n2 stateDoorOpen: n2_open @@ -40,7 +37,6 @@ parent: BaseWallCloset description: It's a storage unit for fire-fighting supplies. components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: fire stateDoorOpen: fire_open @@ -52,7 +48,6 @@ name: blue wall closet description: "A wardrobe packed with stylish blue clothing." components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -64,7 +59,6 @@ name: pink wall closet description: "A wardrobe packed with fabulous pink clothing." components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -76,7 +70,6 @@ name: black wall closet description: "A wardrobe packed with stylish black clothing." components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -88,7 +81,6 @@ name: green wall closet description: "A wardrobe packed with stylish green clothing." components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -99,7 +91,6 @@ parent: BaseWallCloset name: prison wall closet components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -111,7 +102,6 @@ name: yellow wall closet description: "A wardrobe packed with stylish yellow clothing." components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -123,7 +113,6 @@ name: white wall closet description: "A wardrobe packed with stylish white clothing." components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -135,7 +124,6 @@ name: grey wall closet description: "A wardrobe packed with a tide of grey clothing." components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -147,7 +135,6 @@ name: mixed wall closet description: "A wardrobe packed with a mix of colorful clothing." components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -158,7 +145,6 @@ parent: BaseWallCloset name: atmospherics wall closet components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: generic stateDoorOpen: generic_open @@ -169,7 +155,6 @@ parent: BaseWallLocker name: medical wall locker components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: med stateDoorOpen: med_open @@ -183,10 +168,72 @@ name: emergency shuttle emergency wall locker description: It's emergencies all the way down. components: - - type: Appearance - type: EntityStorageVisuals stateBaseClosed: eng stateDoorOpen: eng_open stateDoorClosed: eng_evac_door - type: AccessReader access: [["Engineering"]] + +- type: entity + parent: [ GenpopBase , BaseWallLocker ] + id: LockerWallBasePrisoner + name: prisoner wall closet + description: It's a secure locker for an inmate's personal belongings during their time in prison. + suffix: 1 + +- type: entity + parent: LockerWallBasePrisoner + id: LockerWallPrisoner2 + suffix: 2 + components: + - type: EntityStorageVisuals + stateDoorClosed: genpop_door_2 + +- type: entity + parent: LockerWallBasePrisoner + id: LockerWallPrisoner3 + suffix: 3 + components: + - type: EntityStorageVisuals + stateDoorClosed: genpop_door_3 + +- type: entity + parent: LockerWallBasePrisoner + id: LockerWallPrisoner4 + suffix: 4 + components: + - type: EntityStorageVisuals + stateDoorClosed: genpop_door_4 + +- type: entity + parent: LockerWallBasePrisoner + id: LockerWallPrisoner5 + suffix: 5 + components: + - type: EntityStorageVisuals + stateDoorClosed: genpop_door_5 + +- type: entity + parent: LockerWallBasePrisoner + id: LockerWallPrisoner6 + suffix: 6 + components: + - type: EntityStorageVisuals + stateDoorClosed: genpop_door_6 + +- type: entity + parent: LockerWallBasePrisoner + id: LockerWallPrisoner7 + suffix: 7 + components: + - type: EntityStorageVisuals + stateDoorClosed: genpop_door_7 + +- type: entity + parent: LockerWallBasePrisoner + id: LockerWallPrisoner8 + suffix: 8 + components: + - type: EntityStorageVisuals + stateDoorClosed: genpop_door_8 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop.png new file mode 100644 index 0000000000000000000000000000000000000000..530eb5f14935ccd50806d8d80778ea1e3e42ccaf GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?ST6J=y<1O+uTG_0(w`1ttr_4I6PY#bdOU0hs%N}Td*%YhVENswRg ze;8ocbVlbqP?WR4BeIx*f$uN~Gak=hkpdKyC~=J_3C>R|DNig)We7;j%q!9Ja}7~2 z)iczykj{Ly0;pzNYJ_K+r>7PJ2avM7EfkicmY%dqtPs707^|@XJ7%UG%zwYU|aw(6=Wmp0*FadfNT(8 z0-DPNRvBbz0c1gS85$UXWOvD1IREU?>jW|bJY5_^Ec~yYy2#aFz~g-J>e{lu|K-1_ zUSJV)oUrk?5XbVT-qnq1L4R*-aW=ZcW3^RVf{X1P)4BtN#uh8*I|ST6uq2G}CEuZ? f2Vx(r{HpMoNiAJ=v*i}qevmz$u6{1-oD!M<5N~z3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_1.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_1.png new file mode 100644 index 0000000000000000000000000000000000000000..2de76478ceda3d280aef1888bf2c810ab6e7406e GIT binary patch literal 557 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUXX@yzH!?b*tE;K0`Tzg__fMbPcW}76e@{k6MnXaY5IZ?_U#$SD*_ImNnda%K#lQjNurf$7vNA9N zSzbUa4P}FTs=>$%7H0yo4H=mj1b}oD5NEctfW@nsj7$7hj%~A%S)C6`0 z7NAN4BVz-`1rSp~HnJ{&m^1~*1_36ZxlCY{L6#Ok7F3s^fdNSNX>Dd}QsC5mKxTud zi(`m||J^=Mz6J#WmQ)te!kPc~hh4a~MR59&$=75&vbdZUn*Y(&;Bk~%zG~v7X<$hXq!Q9lOl_Gkv^Y2y&OFtDnm{r-UW|^F5mU literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_2.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c2e82b1f42dc6ef739340d4f9ad414d29204d148 GIT binary patch literal 563 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUXX@yzH!?b*tE;K0`Tzg__fMbPcW}76e@{k6MnXaY5IZPD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ z7Z6KB*&v^4FfxP1nSg9VMkWRUARPt7ne8lK@hl)41U{89GQ0o=2#iLvlmRF;ft`T` zsM5g5*nn{X#8i-ttP3C}O#!k&fC*?W6If-Cr3H`$)n#a40FphECsyMX{6YrEZ1Z$+ z46*RP+jo$!SwVm`)p6pY(*OUnW8bWYIm+5i7WwR=FW^K|udS?83{ F1OSraqiO&E literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_3.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_3.png new file mode 100644 index 0000000000000000000000000000000000000000..d3b8adf01ffc602ef97a4dbbe6fcc52805bdfc26 GIT binary patch literal 558 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUXX@yzH!?b*tE;K0`Tzg__fMbPcW}76e@{k6MnXaY5IZPD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ z7Z6KB*&v^4FfxP1nSg9VMkWRUARPt7ne8lK@hl)41U{89GQ0o=2#iLvlmRF;ft`T` zsM5g5*nn{X#8i-ttP3C}O#!k&fC*?W6If-Cr3H`$)n#a40FphECsyMX{6YrEZ1i+- z46*RP+vm;Kpuoerw5jXI%fJ5GkBlqbM1;ewVkh{h^G+4}5gj1eWD*yuymjr`j$)-G z1Jnb-Ja!SPe=ihL^U%HQ~#0yvh5 zo(MKr{;{sbhE?&b?}vYf{LCyEP99{H=LivRG%@?L!}C2bt{E6SUHx3vIVCg!08F}? AL;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_4.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_4.png new file mode 100644 index 0000000000000000000000000000000000000000..a553c10ccd207632cebe0bcbeba665c62f28c94a GIT binary patch literal 554 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUXX@yzH!?b*tE;K0`Tzg__fMbPcW}76e@{k6MnXaY5IZPD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ z7Z6KB*&v^4FfxP1nSg9VMkWRUARPt7ne8lK@hl)41U{89GQ0o=2#iLvlmRF;ft`T` zsM5g5*nn{X#8i-ttP3C}O#!k&fC*?W6If-Cr3H`$)n#a40FphECsyMX{6YrEto3wp z46*RP+k2C*L4k*5>7tH`FaP(4nXHa{)Ob;SuH6J5^`#eh>bbd`CmdUywPedu(Up%n z8lNl>lXeVnUdE^wGBaV{M-zoUCUN`w1ruaU<^ko7o@&?QQ(?FLX5KV`vrY0utbyL+ uTK=8fhm6Dz{^r(hcVtpwSFceBn9DHfr8!gN5w}8+qdZ;xT-G@yGywqfvY6oj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_5.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_5.png new file mode 100644 index 0000000000000000000000000000000000000000..589f524ef077b19fbbc5405e578ad9a442810543 GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUXX@yzH!?b*tE;K0`Tzg__fMbPcW}76e@{k6MnXaY5IZPD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ z7Z6KB*&v^4FfxP1nSg9VMkWRUARPt7ne8lK@hl)41U{89GQ0o=2#iLvlmRF;ft`T` zsM5g5*nn{X#8i-ttP3C}O#!k&fC*?W6If-Cr3H`$)n#a40FphECsyMX{6YrEZ1Qw* z46*RP+k26(S%JrOY11i*&Hw*z4J(RWCwTG5^0!|apA=jwt2(%!b*{3<8zgw&ZH)tnb58;#!PADA0oG0nPR&dM+2x((zqPgg&ebxsLQ0If=( A82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_6.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_6.png new file mode 100644 index 0000000000000000000000000000000000000000..2a0949de4a96ccfe17a6917a55df7e6323b5b4f8 GIT binary patch literal 563 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUXX@yzH!?b*tE;K0`Tzg__fMbPcW}76e@{k6MnXaY5IZPD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ z7Z6KB*&v^4FfxP1nSg9VMkWRUARPt7ne8lK@hl)41U{89GQ0o=2#iLvlmRF;ft`T` zsM5g5*nn{X#8i-ttP3C}O#!k&fC*?W6If-Cr3H`$)n#a40FphECsyMX{6YrEZ1Z$+ z46*RP+k26(S%JrOVbiG@oB#jcDps~VX7Qqv^PatAKKatKu`EaX-a zTHMk8WWn@=8~3DMDqcVM+et@!mgCNg`wD)rZWQPF_H#Ppq-I0I2{JYtynbdfpFG&| zw^d<2%X+3KYBOFhF>%amidioBr|#k5ybVl~nwkG81jI7TTyM_mJUiwl$aS8selF{r G5}E+aK&Nv6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_7.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_7.png new file mode 100644 index 0000000000000000000000000000000000000000..5d865d58a8a7de28f010b25ea74a8157990384d1 GIT binary patch literal 557 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUXX@yzH!?b*tE;K0`Tzg__fMbPcW}76e@{k6MnXaY5IZPD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ z7Z6KB*&v^4FfxP1nSg9VMkWRUARPt7ne8lK@hl)41U{89GQ0o=2#iLvlmRF;ft`T` zsM5g5*nn{X#8i-ttP3C}O#!k&fC*?W6If-Cr3H`$)n#a40FphECsyMX{6YrEZ18k( z46*RP+vm;KY{0|X>B*7F_2b|2qZh8fa;*vCEOk8I?eTcxR5$HE(HAV5OyWY-*XHl_ z;BY+RSahM&{K$p{%{tB3TT}mUZn(j{sP?~e%aaBEJSyz`Yl7--ITRTr{CAz8eQ*cE yPR?beK~f6lj&aXbcGNvQn-{=v@*tx*M@V|pUb8;}7Z)A`xy#el&t;ucLK6UUhMzD1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_8.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/genpop_door_8.png new file mode 100644 index 0000000000000000000000000000000000000000..da6e8b06a7aa2cafdac56c17a85f3b3240865d44 GIT binary patch literal 561 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbUXX@yzH!?b*tE;K0`Tzg__fMbPcW}76e@{k6MnXaY5IZPD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ z7Z6KB*&v^4FfxP1nSg9VMkWRUARPt7ne8lK@hl)41U{89GQ0o=2#iLvlmRF;ft`T` zsM5g5*nn{X#8i-ttP3C}O#!k&fC*?W6If-Cr3H`$)n#a40FphECsyMX{6YrEZ1Hq) z46*RP+jo(#S%JrOX;askoB#huaqrf|6|__)3EOg8w4}2G;|3P5@;%3p^r=feH?TFyrz36)8YLi4xa{lHmNblJdl& zREB`W%)AmkKi3ciQ$0gH3+c>PD}ZXYrABzBd3tIwZ~!^13{s4&42(dQ7Z6KB*&yF( zFfxP1LH;vjWMU8i(osO1+0FtM&jPYRVDV%Ih8I9ZFdEHL2B6dgb_N!pN&_Qf1I7gq zQ$aSeE`XRc1;_>gCZM@YV3k3Z7C;tMm!W|HNOqUJh4arIy-pyr+|$J|#KQmTWJ|sV z10EK0l{sqv|LbkrIyKOPtK~?^y_wfm$kvH22>r#Uplbhqh4JiVWeH)G96t3zDSUzo zyY-FRJJ^>_Nqs7CaNFw8SqC@Hmg5lPo7mW}Pnx6sgo8r!!IO%Q8YN_uq&j5S+BxLr ge7+ZN@{(n1-0CZOp+RpwUW1(D>FVdQ&MBb@0HRor_y7O^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json index 18a7b2065c..f5b67de849 100644 --- a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json @@ -1,44 +1,140 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh, N2 lockers edited by Lamrr, Evac lockers by EmoGarbage404 (GitHub)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { "name": "atmos_door" }, - { "name": "black_door" }, - { "name": "blue_door" }, - { "name": "emergency" }, - { "name": "emergency_door" }, - { "name": "emergency_open" }, - { "name": "fire" }, - { "name": "fire_door" }, - { "name": "fire_open" }, - { "name": "generic" }, - { "name": "generic_door" }, - { "name": "generic_icon" }, - { "name": "generic_open" }, - { "name": "gray_door" }, - { "name": "green_door" }, - { "name": "locked" }, - { "name": "med" }, - { "name": "med_door" }, - { "name": "med_open" }, - { "name": "mixed_door" }, - { "name": "n2" }, - { "name": "n2_door" }, - { "name": "n2_open" }, - { "name": "orange_door" }, - { "name": "pink_door" }, - { "name": "red_door" }, - { "name": "unlocked" }, - { "name": "welded" }, - { "name": "white_door" }, - { "name": "yellow_door" }, - { "name": "eng" }, - { "name": "eng_open" }, - { "name": "eng_evac_door" } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh, N2 lockers edited by Lamrr, Evac lockers by EmoGarbage404 (GitHub), genpop* derived from Wizards Den SS14 by K-Dynamic (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "atmos_door" + }, + { + "name": "black_door" + }, + { + "name": "blue_door" + }, + { + "name": "emergency" + }, + { + "name": "emergency_door" + }, + { + "name": "emergency_open" + }, + { + "name": "fire" + }, + { + "name": "fire_door" + }, + { + "name": "fire_open" + }, + { + "name": "generic" + }, + { + "name": "generic_door" + }, + { + "name": "generic_icon" + }, + { + "name": "generic_open" + }, + { + "name": "gray_door" + }, + { + "name": "green_door" + }, + { + "name": "locked" + }, + { + "name": "med" + }, + { + "name": "med_door" + }, + { + "name": "med_open" + }, + { + "name": "mixed_door" + }, + { + "name": "n2" + }, + { + "name": "n2_door" + }, + { + "name": "n2_open" + }, + { + "name": "orange_door" + }, + { + "name": "pink_door" + }, + { + "name": "red_door" + }, + { + "name": "unlocked" + }, + { + "name": "welded" + }, + { + "name": "white_door" + }, + { + "name": "yellow_door" + }, + { + "name": "eng" + }, + { + "name": "eng_open" + }, + { + "name": "eng_evac_door" + }, + { + "name": "genpop" + }, + { + "name": "genpop_open" + }, + { + "name": "genpop_door_1" + }, + { + "name": "genpop_door_2" + }, + { + "name": "genpop_door_3" + }, + { + "name": "genpop_door_4" + }, + { + "name": "genpop_door_5" + }, + { + "name": "genpop_door_6" + }, + { + "name": "genpop_door_7" + }, + { + "name": "genpop_door_8" + } + ] }