Syndicate Wall Lockers and Secure Storage (#33251)

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 18c0d00712f9a74522aeef49dd37988e6ab3243d..95b0dab390f0ef8673cdcf1047a1f555a60da401 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -1,8 +1,31 @@
 - type: entity
   id: LockerSyndicatePersonalFilled
-  suffix: Filled
+  suffix: Nukie, Filled
   parent: LockerSyndicatePersonal
+  description: It's a personal storage unit for operative gear.
+  components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: ClothingBeltMilitaryWebbing
+        - id: ClothingHandsGlovesCombat
+        - id: JetpackBlackFilled
+        - id: ClothingUniformJumpsuitOperative
+        - id: ClothingUniformJumpskirtOperative
+        - id: ClothingHeadsetAltSyndicate
+        - id: ClothingEyesHudSyndicate
+
+- type: entity
+  id: LockerSyndicateWallFilled
+  suffix: Nukie, Filled
+  parent: LockerWallSyndicate
+  description: It's a personal storage unit for operative gear.
   components:
+  - type: AccessReader
+    access: [["NuclearOperative"]]
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:AllSelector

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 0fd9f1fab5b902f22d6f1a4e7793d66b80949cb6..8f22f8d68c3bcccf19b982bfa625964f4467790e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -533,15 +533,18 @@
 # Syndicate
 - type: entity
   id: LockerSyndicatePersonal
-  name: armory closet
+  name: blood-red locker
   parent: LockerBaseSecure
-  description: It's a personal storage unit for operative gear.
+  description: It's a personal storage unit with a blood-red design.
+  suffix: "Locked"
   components:
   - type: Appearance
   - type: EntityStorageVisuals
     stateBaseClosed: syndicate
     stateDoorOpen: syndicate_open
     stateDoorClosed: syndicate_door
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
 
 # Bluespace
 - type: entity

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
index e00a8627e120981102e24898b5adf4ad39743597..052ff93e5361a79fff1eedd594c76fcedf7dfe45 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
@@ -1,4 +1,4 @@
-# Tool closet
+# Tool closet
 - type: entity
   id: ClosetTool
   name: tool closet
@@ -164,9 +164,9 @@
 # Syndicate
 - type: entity
   id: LockerSyndicate
-  name: armory closet
+  name: blood-red closet
   parent: ClosetSteelBase
-  description: It's a storage unit.
+  description: It's a storage unit with a blood-red design.
   components:
   - type: Appearance
   - type: EntityStorageVisuals

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
index 7943e74e949391fb848e9e42f1856efca0235bad..1e90d332d1edb50463e4d290d045ef67e4e5a644 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
@@ -237,3 +237,18 @@
   components:
   - type: EntityStorageVisuals
     stateDoorClosed: genpop_door_8
+
+- type: entity
+  id: LockerWallSyndicate
+  parent: BaseWallLocker
+  name: blood-red wall locker
+  description: It's a wall storage unit with a blood-red design.
+  suffix: "Locked"
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: generic
+    stateDoorOpen: syndicate_open
+    stateDoorClosed: syndicate_closed
+  - type: AccessReader
+    access: [["SyndicateAgent"]]

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 55a0c72e7cded2ec6b517d6a3b9a6a4776d3f109..c622ad8961d8b8a20a3dff09d522d0a73597a67f 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -332,6 +332,19 @@
   - type: AccessReader
     access: [["Command"]]
 
+- type: entity
+  parent: CrateBaseSecure
+  id: CrateSyndicateSecure
+  name: secure syndicate crate
+  description: A dark steel crate with red bands and a letter S embossed on the front.
+  components:
+  - type: Icon
+    sprite: Structures/Storage/Crates/syndicate_secure.rsi
+  - type: Sprite
+    sprite: Structures/Storage/Crates/syndicate_secure.rsi
+  - type: AccessReader
+    access: [["SyndicateAgent", "NuclearOperative"]]
+
 - type: entity
   parent: CrateGeneric
   id: CrateLivestock
@@ -822,7 +835,7 @@
 - type: entity
   parent: CrateGenericSteel
   id: CrateSyndicate
-  name: Syndicate crate
+  name: syndicate crate
   description: A dark steel crate with red bands and a letter S embossed on the front.
   components:
   - type: Icon

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png
new file mode 100644 (file)
index 0000000..393e370
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/base.png differ

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png
new file mode 100644 (file)
index 0000000..6259140
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/closed.png differ

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png
new file mode 100644 (file)
index 0000000..c6c6bff
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/icon.png differ

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

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json
new file mode 100644 (file)
index 0000000..4ea4f66
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/meta.json
@@ -0,0 +1,45 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by Hyenh#6078 (313846233099927552), edited by Unkn0wnGh0st333 on github",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "closed"
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "welded"
+        },
+        {
+            "name": "sparking",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "locked"
+        },
+        {
+            "name": "unlocked"
+        }
+    ]
+}

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png
new file mode 100644 (file)
index 0000000..faef025
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/open.png differ

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png
new file mode 100644 (file)
index 0000000..87b78b9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/sparking.png differ

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

diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png
new file mode 100644 (file)
index 0000000..311739a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/syndicate_secure.rsi/welded.png differ

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png
index 3011253d03629719007205a1c697d1e4662f766b..0136eefe65acdf554dc259544c74f1b6b0c01ffb 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png differ

diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png
index a879eb63c1b684b93f2b5a6898fcc19e216cdc14..d44f89f7eeca482b563a30a1c377a0f08b2d9856 100644 (file)
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_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 f5b67de849b448715ce867fe1aae9c347a1211f0..bab87904fb7faf93dcc8602ff1a6fb939cf3836a 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, Evac lockers by EmoGarbage404 (GitHub), genpop* derived from Wizards Den SS14 by K-Dynamic (github)",
+    "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh, N2 lockers edited by Lamrr, syndicate lockers by Unkn0wnGh0st333 (GitHub) based on N2 lockers, Evac lockers by EmoGarbage404 (GitHub), genpop* derived from Wizards Den SS14 by K-Dynamic (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -135,6 +135,12 @@
         },
         {
             "name": "genpop_door_8"
+        },
+        {
+            "name": "syndicate_closed"
+        },
+        {
+            "name": "syndicate_open"
         }
     ]
 }

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

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