From 4017f9bd28251a3cbf3c0fb34499c6b821051498 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Wed, 10 Apr 2024 16:20:05 -0500 Subject: [PATCH] Add emergency nitrogen lockers (#26752) --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 15 +++++++++++++++ .../Structures/Storage/Closets/closets.yml | 13 +++++++++++++ .../Structures/Storage/closet.rsi/meta.json | 5 ++++- .../Structures/Storage/closet.rsi/n2_door.png | Bin 0 -> 357 bytes 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/n2_door.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index d8b6004ec3..fac36ba710 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -61,6 +61,21 @@ - id: BoxMRE prob: 0.1 +- type: entity + id: ClosetEmergencyN2FilledRandom + parent: ClosetEmergencyN2 + suffix: Filled, Random + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyNitrogenTankFilled + prob: 0.80 + orGroup: EmergencyTankOrRegularTank + - id: NitrogenTankFilled + prob: 0.20 + orGroup: EmergencyTankOrRegularTank + - type: entity id: ClosetFireFilled parent: ClosetFire diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml index 5fda0ddbe2..fb00db7aa6 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml @@ -37,6 +37,19 @@ stateDoorOpen: emergency_open stateDoorClosed: emergency_door +# Emergency N2 closet +- type: entity + id: ClosetEmergencyN2 + name: emergency nitrogen closet + parent: ClosetSteelBase + description: It's full of life-saving equipment. Assuming, that is, that you breathe nitrogen. + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: fire + stateDoorOpen: fire_open + stateDoorClosed: n2_door + # Fire safety closet - type: entity id: ClosetFire diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index cf0c204447..c52bc13540 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github)", + "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e", "license": "CC-BY-SA-3.0", "states": [ { @@ -398,6 +398,9 @@ { "name": "mixed_door" }, + { + "name": "n2_door" + }, { "name": "oldcloset" }, diff --git a/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png b/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png new file mode 100644 index 0000000000000000000000000000000000000000..f6d9499f10ab3a034df4055af67a163859fd68d3 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikV0(?STA8y#PMMdT0$&=5YKi8FGm?I^1LRa_N(xoR>t~_!0@ZrUan^IFd zLqaM9MfB)x#KzYsrkH}&M2EM}} z%y>M1MG8=GlBbJfh=u>%zK48G20U!;(P|w$Ti^d*S2MHpTFTUTwPW0pPs(0bKgyLAq>xb#0h^knT`$K6g%+Q+W@_bqGS4?6eLB+>J4 zf}MF<@B!A-OE=D7(u*+M6Xa#cy6a$>DeFFwDOW`*`17XDIs72*r@)^>E$WUB3|M0> dJXZ*~%V_e{;ZwMjj404`44$rjF6*2UngH?&jmZE2 literal 0 HcmV?d00001 -- 2.51.2