Evac Repair Lockers (#38075)

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 294184f379ce6ae44b83be7bfa103e4bd780d7da..05e48c664d63e4227e3af08de7ca0af312daad5d 100644 (file)
--- 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 df62854818ce55d82bdcf032534b8527f4c7a19d..4fb07fc3f6737c3579c4f17afa55ce1bd9bd304d 100644 (file)
--- 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 02b9fa8271de2ec6300a9c7eeaad6fffdcf40cde..7c1d3ce3ff955bccbc9d881bf9ae69616e205b79 100644 (file)
--- 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 (file)
index 0000000..91e2ba2
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/eng_evac_door.png differ

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index 36807d8790f708a71951d3b8e463082dcb198795..f3295b97183115f0cdb7b9654c1d96909ee0dacd 100644 (file)
--- 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), n2 sprites based on fire and emergency sprites, genpop lockers by EmoGarbage404 (github), sci bio locker is a resprited bio viro locker by Alpha-Two (github)",
+    "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites, genpop lockers by EmoGarbage404 (github), sci bio locker is a resprited bio viro locker by Alpha-Two (github), Evac lockers by EmoGarbage404 (GitHub)",
     "license": "CC-BY-SA-3.0",
     "states": [
         {
@@ -305,6 +305,9 @@
         {
             "name": "eng_weld_door"
         },
+        {
+            "name": "eng_evac_door"
+        },
         {
             "name": "fire"
         },

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

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

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

diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json b/Resources/Textures/Structures/Storage/wall_locker.rsi/meta.json
index 2466cc53d744c540b8c3b92dd19e9e4888fec4cf..18a7b2065c74629ef7ce762ce0d821d54bb2f7bc 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, 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" }
   ]
 }