Lockable Suit Storages (#20950)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 09afc383495f85d42f3dd468d074ec535d421789..7ee7351fbe2d20e8fe713b1f78a82ae9d4205cc1 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -39,7 +39,7 @@
         - id: OxygenTankFilled
         - id: ClothingOuterSuitEmergency
         - id: ClothingMaskBreath
-     
+
 #Prisoner EVA
 - type: entity
   id: SuitStorageEVAPrisoner
@@ -80,7 +80,7 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitPirateEVA
         - id: ClothingMaskGas
-        
+
 #NTSRA Voidsuit
 - type: entity
   id: SuitStorageNTSRA
@@ -93,7 +93,7 @@
         - id: ClothingOuterHardsuitAncientEVA
         - id: ClothingHeadHelmetAncient
         - id: ClothingMaskBreath
-        
+
 #HARDSUITS
 #Basic hardsuit
 - type: entity
@@ -121,6 +121,8 @@
         - id: ClothingShoesBootsMag
         - id: ClothingOuterHardsuitEngineering
         - id: ClothingMaskBreath
+  - type: AccessReader
+    access: [["Engineering"]]
 
 #Atmospherics hardsuit
 - type: entity
@@ -134,6 +136,8 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
+  - type: AccessReader
+    access: [["Atmospherics"]]
 
 #Security hardsuit
 - type: entity
@@ -147,6 +151,8 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitSecurity
         - id: ClothingMaskBreath
+  - type: AccessReader
+    access: [["Security"]]
 
 #CE's hardsuit
 - type: entity
@@ -162,6 +168,8 @@
         - id: ClothingShoesBootsMagAdv
         - id: ClothingOuterHardsuitEngineeringWhite
         - id: ClothingMaskBreath
+  - type: AccessReader
+    access: [["ChiefEngineer"]]
 
 #CMO's hardsuit
 - type: entity
@@ -175,6 +183,8 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitMedical
         - id: ClothingMaskBreathMedical
+  - type: AccessReader
+    access: [ [ "ChiefMedicalOfficer" ] ]
 
 #RD's hardsuit
 - type: entity
@@ -188,6 +198,8 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitRd
         - id: ClothingMaskBreath
+  - type: AccessReader
+    access: [ [ "ResearchDirector" ] ]
 
 #HOS's hardsuit
 - type: entity
@@ -202,6 +214,8 @@
         - id: JetpackSecurityFilled
         - id: ClothingOuterHardsuitSecurityRed
         - id: ClothingMaskGasSwat
+  - type: AccessReader
+    access: [["HeadOfSecurity"]]
 
 #Warden's hardsuit
 - type: entity
@@ -215,6 +229,8 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitWarden
         - id: ClothingMaskBreath
+  - type: AccessReader
+    access: [["Armory"]]
 
 #Captain's hardsuit
 - type: entity
@@ -228,6 +244,8 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
+  - type: AccessReader
+    access: [["Captain"]]
 
 #Salvage hardsuit
 - type: entity
@@ -242,6 +260,8 @@
       - id: ClothingShoesBootsMag
       - id: ClothingOuterHardsuitSpatio
       - id: ClothingMaskGasExplorer
+  - type: AccessReader
+    access: [["Salvage"]]
 
 #Blood-red hardsuit
 - type: entity
@@ -282,4 +302,3 @@
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitWizard
         - id: ClothingMaskBreath
-        
\ No newline at end of file

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index f39938fd9550c8d28c9fd57a1ded772bd23ea8d8..5edad73e3377e14d18f7f80efced66c10a2ec4bb 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -184,6 +184,8 @@
   name: suit storage unit
   description: A fancy hi-tech storage unit made for storing space suits.
   components:
+  - type: AccessReader
+  - type: Lock
   - type: Anchorable
     delay: 2
   - type: StaticPrice
@@ -196,11 +198,14 @@
     sprite: Structures/Storage/suit_storage.rsi
     layers:
     - state: base
-    - state: closed
+    - state: door
       map: ["enum.StorageVisualLayers.Door"]
     - state: welded
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
   - type: MovedByPressure
   - type: DamageOnHighSpeedImpact
     damage:
@@ -257,5 +262,7 @@
   - type: Appearance
   - type: EntityStorageVisuals
     stateBase: base
+    stateLocked: locked
+    stateUnlocked: unlocked
     stateDoorOpen: base
-    stateDoorClosed: closed
+    stateDoorClosed: door

diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png
index 3a686cd6ecbbf57f16eb4baf430b6c8e21e3c939..5171b03f4611739868635ecb19891a86acf2f1ce 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png and b/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png differ

diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/closed.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/closed.png
deleted file mode 100644 (file)
index 79d0dba..0000000
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/closed.png and /dev/null differ

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

diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/locked.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/locked.png
new file mode 100644 (file)
index 0000000..40b036a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/suit_storage.rsi/locked.png differ

diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json b/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json
index aa1c1f09ec74b3b984bc5b4f19fc56298edb0263..c4d4dc3468dffe89168ff1ee096fd13780ac3ffb 100644 (file)
--- a/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json
@@ -11,7 +11,16 @@
       "name": "base"
     },
     {
-      "name": "closed"
+      "name": "door"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "panel"
     },
     {
       "name": "welded"

diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png
new file mode 100644 (file)
index 0000000..7c4ef0d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png differ

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

diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png
index 6e9fbacb2ea77316680e1107faf1d7c262f4f1a9..d8e0281ebb1b6a1bd510a22c6958adbd83df9eb3 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png and b/Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png differ