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 <velcroboy333@hotmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 340083f40416c4d8d1b8313bbcde3a5b6d5e011b..33b0ab1a509e2b7497a3376e2c5cf059487f29ef 100644 (file)
--- 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 4280b960b4c38e2d647c9b639aafa95c29256dcb..02b9fa8271de2ec6300a9c7eeaad6fffdcf40cde 100644 (file)
--- 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 b6ed63c7a3ed38733c7ae7a56bdc11da2f935b5a..2466cc53d744c540b8c3b92dd19e9e4888fec4cf 100644 (file)
--- 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 (file)
index 0000000..34d71d0
Binary files /dev/null and b/Resources/Textures/Structures/Storage/wall_locker.rsi/n2.png differ

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/n2_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/n2_door.png
new file mode 100644 (file)
index 0000000..e4d95b3
Binary files /dev/null and b/Resources/Textures/Structures/Storage/wall_locker.rsi/n2_door.png differ

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 (file)
index 0000000..5d3050e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/wall_locker.rsi/n2_open.png differ