From 9005183e6e56804e42e075745b4533d3d8f89c67 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Wed, 12 Mar 2025 17:42:15 -0500 Subject: [PATCH] Add wallmount N2 closets, Revived (#34042) * Add standard, wallmount and improvised N2 closets, Revived * remove improvised locker * Parent>ID * Undo sprite replacement * Update meta.json --------- Co-authored-by: Velcroboy Co-authored-by: Milon --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 36 ++++++++++++++---- .../Storage/Closets/wall_lockers.yml | 14 ++++++- .../Storage/wall_locker.rsi/meta.json | 5 ++- .../Structures/Storage/wall_locker.rsi/n2.png | Bin 0 -> 262 bytes .../Storage/wall_locker.rsi/n2_door.png | Bin 0 -> 498 bytes .../Storage/wall_locker.rsi/n2_open.png | Bin 0 -> 310 bytes 6 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/n2.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/n2_door.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/n2_open.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 340083f404..33b0ab1a50 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -54,6 +54,22 @@ entity_storage: !type:NestedSelector tableId: FillLockerEmergencyStandard +- type: entityTable + id: FillLockerEmergencyN2Standard + table: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: ClothingOuterSuitEmergency + - id: BoxMRE + prob: 0.1 + - id: ToolboxEmergencyFilled + prob: 0.05 + - !type:GroupSelector + children: + - id: EmergencyNitrogenTankFilled + weight: 4 + - id: NitrogenTankFilled + - type: entity id: ClosetEmergencyN2FilledRandom parent: ClosetEmergencyN2 @@ -61,14 +77,18 @@ components: - type: EntityTableContainerFill containers: - entity_storage: !type:AllSelector - children: - - id: ClothingMaskBreath - - id: ClothingOuterSuitEmergency - - !type:GroupSelector - children: - - id: EmergencyNitrogenTankFilled - - id: NitrogenTankFilled + entity_storage: !type:NestedSelector + tableId: FillLockerEmergencyN2Standard + +- type: entity + parent: ClosetWallEmergencyN2 + id: ClosetWallEmergencyN2FilledRandom + suffix: Filled, Random + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillLockerEmergencyN2Standard - type: entityTable id: FillLockerFireStandard diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml index 4280b960b4..02b9fa8271 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml @@ -22,6 +22,18 @@ stateDoorOpen: emergency_open stateDoorClosed: emergency_door +- type: entity + parent: BaseWallCloset + id: ClosetWallEmergencyN2 + 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 + stateDoorClosed: n2_door + - type: entity id: ClosetWallFire name: fire-safety wall closet @@ -163,4 +175,4 @@ stateDoorOpen: med_open stateDoorClosed: med_door - type: AccessReader - access: [["Medical"]] \ No newline at end of file + access: [["Medical"]] diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json index b6ed63c7a3..2466cc53d7 100644 --- a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json @@ -1,7 +1,7 @@ { "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", + "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh, N2 lockers edited by Lamrr", "size": { "x": 32, "y": 32 @@ -27,6 +27,9 @@ { "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" }, diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/n2.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/n2.png new file mode 100644 index 0000000000000000000000000000000000000000..34d71d0586e52fb2317fccc8f3fd43f8a6a095c6 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7lsoIx(vFZITIHHMK}vQ zB8wRqxP?KOkzv*x383IIPZ!6Kh{JEg4EY)q1e~27Et)L-FxT$fcELjr(&qSFn7iQ4 z!iHI|@5Ibz_L5W<&|2I$!ENccDGw)KyZDnyX`e;A*n3O%k1Q^CB$|b$2Q}^7^G#Mj z;L?PP2h7bbD7NRt-#TEgzp(a}gVrAwURC822Udyr-L!nR{CT8N6VI8b`?p-GC-!{d z+QcHLHsb|H*Ppg;XQeyJwq5ZOTa~d;{2F+mVp2w9n`YLg{1h#?E2A(S?uQ*?y@ zeecn!^{CgE`|dqG@1ENNDN_7*2(*FUjYdElJJ&Rv8U|JFBiiEKW)rd`#m1Vh3#C>A z412$+qS&}f(uDt9+Hqf$jTDN%NUZvNnt+-UU{YTm%4MAYX6Y zub9I%64Al6Z!pCY=sQkm!@lF}Y?^4C?fXEx9S)|%6p$qe=CB9mGkZwH5*QHzc_SeW zo^1QqF}WPS3qA&epm=tU@nped(fi8_JbM8ibH|WdEnHP9LZWjZDa2kuPgRkfP7f;5 zQ&oNfp049YWEbiaz%3E*KAWMS>xa3(bY1G^Tj4IB57#ftCI7deZdt;JkXS$OBcI4G o*+Z!m9MT7M%My?xMT#x>0r%RLDUz!cD*ylh07*qoM6N<$g6p!*pa1{> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/n2_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/n2_open.png new file mode 100644 index 0000000000000000000000000000000000000000..5d3050e30c73248849d06ae3cc4b4e9fd2bdf5ea GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7lsoIx(vFZITIHHMK}vQ zB8wRqxP?KOkzv*x383ILPZ!6Kh{JEE8FDonNVLXxr%dDtDmZav?*qnNJ9d_QGP<`c zJfnQO-rmN=4^$jAB=5w$5y`mNw{OXW^2Yb4=Rf(#tf;8CZ&^r|-qcy!pSffwFziT^ zWO#7zyG>)z%9~C3x!yCsBr&Z|JdiAt8NRpt@3lW-Czh6|Pw?*a$~I@x`QhK_l|85X z&|hf_RZjl{(=I6bGBTXsb*ylfg=@;gZGUIvO4OPy;9cGJS4-*I_TTHZ-nBg7jCu5f z`wnO0F^QbLqORG?b9*-4zR