Adds a Wallmount Nitrogen Locker and Combined O2/N2 Emergency Lockers (…

…#1895)

* Adds a wallmount nitrogen locker

* Adds combined o2n2 closets

* Adjust attribution

* N2/N2O2 storage fills, "internals closet"

* abstract emergency fills

* standing locker attribution, rename n2 wall locker

* fix wallmount weld sprites

* OFF BY ONE

* wall_locker_color: move weld over one pixel

---------

Co-authored-by: Whatstone <[email protected]>

Resources/Prototypes/_NF/Catalog/Fills/Lockers/closets.yml

@@ -0,0 +1,5 @@
+#EMERGENCY
+- type: entity
+  parent: [ClosetO2N2, StorageFillO2N2Random]
+  id: ClosetO2N2FilledRandom
+  suffix: Filled, Random

Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml

@@ -177,3 +177,14 @@
   parent: [ LockerWallEVAColorNfsd, StorageFillEVASuitNfsd ]
   id: LockerWallEVAColorNfsdFilled
   suffix: Filled
+
+# Emergency
+- type: entity
+  parent: [ ClosetWallN2, StorageFillN2Random ]
+  id: ClosetWallN2FilledRandom
+  suffix: Filled, Random
+
+- type: entity
+  parent: [ ClosetWallO2N2, StorageFillO2N2Random ]
+  id: ClosetWallO2N2FilledRandom
+  suffix: Filled, Random

Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/emergency.yml

@@ -0,0 +1,41 @@
+#EMERGENCY
+- type: entity
+  abstract: true
+  id: StorageFillO2N2Random
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterSuitEmergency
+      - id: ClothingMaskBreath
+      - id: EmergencyOxygenTankFilled
+        prob: 0.80
+        orGroup: EmergencyO2TankOrRegularTank
+      - id: OxygenTankFilled
+        prob: 0.20
+        orGroup: EmergencyO2TankOrRegularTank
+      - id: EmergencyNitrogenTankFilled
+        prob: 0.80
+        orGroup: EmergencyN2TankOrRegularTank
+      - id: NitrogenTankFilled
+        prob: 0.20
+        orGroup: EmergencyN2TankOrRegularTank
+      - id: ToolboxEmergencyFilled
+        prob: 0.4
+      - id: MedkitOxygenFilled
+        prob: 0.2
+      - id: WeaponFlareGun
+        prob: 0.05
+
+- type: entity
+  abstract: true
+  id: StorageFillN2Random
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskBreath
+      - id: EmergencyNitrogenTankFilled
+        prob: 0.80
+        orGroup: EmergencyTankOrRegularTank
+      - id: NitrogenTankFilled
+        prob: 0.20
+        orGroup: EmergencyTankOrRegularTank

Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/closets.yml

@@ -0,0 +1,14 @@
+#Frontier specific for new closets without needing to touch upstream entities.
+- type: entity
+  id: ClosetO2N2
+  name: emergency internals closet
+  parent: ClosetSteelBase
+  description: It's a storage unit for emergency breathing equipment for all species.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Storage/closet.rsi
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: o2n2
+    stateDoorOpen: o2n2_open
+    stateDoorClosed: o2n2_door

Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml

@@ -207,3 +207,31 @@
 - type: entity
   id: LockerWallChemistryFilled
   parent: [LockerWallChemistry, LockerChemistryFilled]
+
+- type: entity
+  id: ClosetWallN2
+  name: emergency nitrogen wall closet
+  parent: BaseWallCloset
+  description: It's a storage unit for emergency breath masks and N2 tanks.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Storage/wall_locker.rsi
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: n2
+    stateDoorOpen: n2_open
+    stateDoorClosed: n2_door
+
+- type: entity
+  id: ClosetWallO2N2
+  name: emergency internals wall closet
+  parent: BaseWallCloset
+  description: It's a storage unit for emergency breathing equipment for all species.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Storage/wall_locker.rsi
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: o2n2
+    stateDoorOpen: o2n2_open
+    stateDoorClosed: o2n2_door

Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json

@@ -4,7 +4,7 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Taken from tgstation, mercenary and pilot lockers are resprited armory locker by erhardsteinhauer (discord), janitor is by SungYandy",
+  "copyright": "Taken from tgstation, mercenary and pilot lockers are resprited armory locker by erhardsteinhauer (discord), janitor is by SungYandy, O2N2 locker by Tych0theSynth",
   "license": "CC-BY-SA-3.0",
   "states": [
     {
@@ -18,102 +18,102 @@
     },
     {
       "name": "generic"
-	},
-	{
+    },
+    {
       "name": "generic_door"
-	},
-	{
+    },
+    {
       "name": "locked"
-	},
-	{
+    },
+    {
       "name": "mercenary"
-	},
-	{
+    },
+    {
       "name": "mercenary_door"
-	},
-	{
+    },
+    {
       "name": "mercenary_open"
-	},
-	{
+    },
+    {
       "name": "pilot"
-	},
-	{
+    },
+    {
       "name": "pilot_door"
-	},
-	{
+    },
+    {
       "name": "pilot_open"
-	},
-	{
+    },
+    {
       "name": "mail"
-	},
-	{
+    },
+    {
       "name": "mail_door"
-	},
-	{
+    },
+    {
       "name": "mail_open"
-	},
-	{
-	  "name": "nfsd"
-	},
-	{
-	  "name": "nfsd_door"
-	},
-	{
-	  "name": "nfsd_open"
-	},
-	{
-	  "name": "nfsd_brigmed"
-	},
-	{
-	  "name": "nfsd_brigmed_door"
-	},
-	{
-	  "name": "nfsd_brigmed_open"
-	},
-	{
-	  "name": "nfsd_copper"
-	},
-	{
-	  "name": "nfsd_copper_door"
-	},
-	{
-	  "name": "nfsd_copper_open"
-	},
-	{
-	  "name": "nfsd_silver"
-	},
-	{
-	  "name": "nfsd_silver_door"
-	},
-	{
-	  "name": "nfsd_silver_open"
-	},
-	{
-	  "name": "nfsd_gold"
-	},
-	{
-	  "name": "nfsd_gold_door"
-	},
-	{
-	  "name": "nfsd_gold_open"
-	},
-	{
-	  "name": "nfsd_sheriff"
-	},
-	{
-	  "name": "nfsd_sheriff_door"
-	},
-	{
-	  "name": "nfsd_sheriff_open"
-	},
+    },
+    {
+      "name": "nfsd"
+    },
+    {
+      "name": "nfsd_door"
+    },
+    {
+      "name": "nfsd_open"
+    },
+    {
+      "name": "nfsd_brigmed"
+    },
+    {
+      "name": "nfsd_brigmed_door"
+    },
+    {
+      "name": "nfsd_brigmed_open"
+    },
+    {
+      "name": "nfsd_copper"
+    },
+    {
+      "name": "nfsd_copper_door"
+    },
+    {
+      "name": "nfsd_copper_open"
+    },
+    {
+      "name": "nfsd_silver"
+    },
+    {
+      "name": "nfsd_silver_door"
+    },
+    {
+      "name": "nfsd_silver_open"
+    },
+    {
+      "name": "nfsd_gold"
+    },
+    {
+      "name": "nfsd_gold_door"
+    },
+    {
+      "name": "nfsd_gold_open"
+    },
+    {
+      "name": "nfsd_sheriff"
+    },
+    {
+      "name": "nfsd_sheriff_door"
+    },
+    {
+      "name": "nfsd_sheriff_open"
+    },
     {
       "name": "unlocked"
     },
     {
       "name": "welded"
     },
-	{
-	  "name": "wooden_cabinet_icon"
+    {
+      "name": "wooden_cabinet_icon"
     },
     {
       "name": "sparking"
@@ -126,7 +126,15 @@
     },
     {
       "name": "sr_door"
+    },
+    {
+      "name": "o2n2"
+    },
+    {
+      "name": "o2n2_open"
+    },
+    {
+      "name": "o2n2_door"
     }
   ]
-}
-
+}

Resources/Textures/_NF/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 Dusty Lens",
+  "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Dusty Lens. N2 and O2N2 locker by Tych0theSynth",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,12 @@
     { "name": "unlocked" },
     { "name": "med" },
     { "name": "med_open" },
-    { "name": "chem_door" }
+    { "name": "chem_door" },
+    { "name": "n2" },
+    { "name": "n2_open" },
+    { "name": "n2_door" },
+    { "name": "o2n2" },
+    { "name": "o2n2_open" },
+    { "name": "o2n2_door" }
   ]
-}
+}