From 9bb3140550c3c27950951909ae14d0375e92092c Mon Sep 17 00:00:00 2001 From: Spanky Date: Thu, 5 Jun 2025 02:08:38 -0400 Subject: [PATCH] Evac Repair Lockers (#38075) Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- .../Catalog/Fills/Lockers/engineer.yml | 31 ++++++++++++++++++ .../Storage/Closets/Lockers/lockers.yml | 14 ++++++++ .../Storage/Closets/wall_lockers.yml | 13 ++++++++ .../Storage/closet.rsi/eng_evac_door.png | Bin 0 -> 318 bytes .../Structures/Storage/closet.rsi/meta.json | 5 ++- .../Storage/wall_locker.rsi/eng.png | Bin 0 -> 190 bytes .../Storage/wall_locker.rsi/eng_evac_door.png | Bin 0 -> 270 bytes .../Storage/wall_locker.rsi/eng_open.png | Bin 0 -> 191 bytes .../Storage/wall_locker.rsi/meta.json | 7 ++-- 9 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/eng_evac_door.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/eng.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/eng_evac_door.png create mode 100644 Resources/Textures/Structures/Storage/wall_locker.rsi/eng_open.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index 294184f379..05e48c664d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -232,3 +232,34 @@ - id: GeigerCounter amount: !type:ConstantNumberSelector value: 2 + +- type: entity + parent: LockerEvacRepair + id: LockerEvacRepairFilled + suffix: Filled + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillLockerEvacRepair + +- type: entity + parent: LockerWallEvacRepair + id: LockerWallEvacRepairFilled + suffix: Filled + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillLockerEvacRepair + +- type: entityTable + id: FillLockerEvacRepair + table: !type:AllSelector + children: + - id: BoxInflatable + - id: HolofanProjector + - id: MetalFoamGrenade + amount: 3 + - id: AirGrenade + amount: 3 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index df62854818..4fb07fc3f6 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -155,6 +155,20 @@ - type: AccessReader access: [ [ "Engineering" ] ] +# Evac Repair +- type: entity + parent: LockerBase + id: LockerEvacRepair + name: evac repair locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: eng + stateDoorOpen: eng_open + stateDoorClosed: eng_evac_door + - type: AccessReader + access: [ [ "Engineering" ] ] + # Freezer - type: entity id: LockerFreezerBase diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml index 02b9fa8271..7c1d3ce3ff 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml @@ -176,3 +176,16 @@ stateDoorClosed: med_door - type: AccessReader access: [["Medical"]] + +- type: entity + parent: BaseWallLocker + id: LockerWallEvacRepair + name: evac repair wall locker + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: eng + stateDoorOpen: eng_open + stateDoorClosed: eng_evac_door + - type: AccessReader + access: [["Engineering"]] diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_evac_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_evac_door.png new file mode 100644 index 0000000000000000000000000000000000000000..91e2ba2145779de7b17bc5d5875878bb47281a38 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|JOX?|T!AzY zFf+2rF>*->v)SqMrH6B;_=wkJ@>ZmaHYCe+l!`Xhrp{@TTHK_%X}ZeR*{WOSsBD>} zd19SzXG6&0eT$!5?KpA#@J#(Pp+JKqN`m}?8UAAjFYmaR0o62kx;Tbd^uE1tny<-$ zr!}!pY|hN0K)zGI_pdyxBILZxxk+05&+NQ?TRd04%DJ5U(r(E__MYA*=}e|ZmPHH_ z4GOFQ%o8p$$=*E9`jN?+d&7E7wHfoXi^aBFj+)I{_mesFs%1FSg=eem8SgUso?==r o@=~|JQ}lp+&X1Ia^_w0f!P{$S;`TKLlJo6=DQZ@9E+gV$qwNAQ9Hk zD#^MbK_el}h4D;;h=F2bW6*&nmJ`7Tx>7s3g;&a-hHqTT!u}-(MA>_%`juXcZzrDJ04N#9j zNswPK!+%t8AfVeBC|BU=;uvDl`}D#^t_B63)^YD~uM|4gYw{Ljyt>Eak-(R=rjAs^6G=fDLO z|Fxq_*x1>5>)&!01}yPEw(2aKw_^_jS3_udg7gE`j)|v&AIu5$UQkuvczy*#_%!CS eKa+3%@Dy$rVlo$6c+d}MD1)b~pUXO@geCw(r96TF 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 2466cc53d7..18a7b2065c 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, N2 lockers edited by Lamrr", + "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 @@ -36,6 +36,9 @@ { "name": "unlocked" }, { "name": "welded" }, { "name": "white_door" }, - { "name": "yellow_door" } + { "name": "yellow_door" }, + { "name": "eng" }, + { "name": "eng_open" }, + { "name": "eng_evac_door" } ] } -- 2.51.2