Encryption key boxes to the heads lockers. (#14110)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 4727bf3b776b1f129085daa06664ac3f1cf1d127..a1c30d9d2e195ef248b2d89072da353624eaf0b3 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -276,3 +276,103 @@
   - type: Tag
     tags:
       - DroneUsable
+
+- type: entity
+  name: passenger encryption key box
+  parent: BoxCardboard
+  id: BoxEncryptionKeyPassenger
+  description: A box of spare encryption keys.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyCommon
+        amount: 6
+  - type: Sprite
+    layers:
+      - state: box
+      - state: encryptokey
+  - type: Storage
+    capacity: 30
+    whitelist:
+      components:
+      - EncryptionKey
+
+- type: entity
+  name: cargo encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyCargo
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyCargo
+        amount: 6
+
+- type: entity
+  name: engineering encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyEngineering
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyEngineering
+        amount: 6
+
+- type: entity
+  name: med-sci encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyMedicalScience
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyMedicalScience
+        amount: 6
+
+- type: entity
+  name: medical encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyMedical
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyMedical
+        amount: 6
+
+- type: entity
+  name: robotech encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyRobo
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyRobo
+        amount: 6
+
+- type: entity
+  name: science encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyScience
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyScience
+        amount: 6
+
+- type: entity
+  name: security encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeySecurity
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeySecurity
+        amount: 6
+
+- type: entity
+  name: service encryption key box
+  parent: BoxEncryptionKeyPassenger
+  id: BoxEncryptionKeyService
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyService
+        amount: 6

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index c34a986f9cf74a891090fa0b798cfa721c76e85b..8803a5b21ba69657cf96f9f6f7f7e60877ec8d5c 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -24,6 +24,7 @@
       - id: DoorRemoteCargo
       - id: RubberStampQm
       - id: ClothingHeadsetAltCargo
+      - id: BoxEncryptionKeyCargo
 
 - type: entity
   id: LockerCaptainFilled
@@ -87,6 +88,8 @@
       - id: DoorRemoteService
       - id: ClothingNeckGoldmedal
       - id: RubberStampHop
+      - id: BoxEncryptionKeyPassenger
+      - id: BoxEncryptionKeyService
 
 - type: entity
   id: LockerChiefEngineerFilled
@@ -111,6 +114,7 @@
       - id: RubberStampCE
       - id: JetpackVoidFilled
       - id: ClothingHeadsetAltEngineering
+      - id: BoxEncryptionKeyEngineering
 
 - type: entity
   id: LockerChiefMedicalOfficerFilled
@@ -139,6 +143,7 @@
       - id: MedicalTechFabCircuitboard
       - id: MaterialBiomass
         amount: 3
+      - id: BoxEncryptionKeyMedical
 
 - type: entity
   id: LockerResearchDirectorFilled
@@ -159,6 +164,8 @@
       - id: DoorRemoteResearch
       - id: RubberStampRd
       - id: ClothingHeadsetAltScience
+      - id: BoxEncryptionKeyScience
+      - id: BoxEncryptionKeyRobo
 
 - type: entity
   id: LockerHeadOfSecurityFilled
@@ -202,3 +209,4 @@
       - id: RubberStampHos
       - id: SecurityTechFabCircuitboard
       - id: JetpackSecurityFilled
+      - id: BoxEncryptionKeySecurity

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png b/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
new file mode 100644 (file)
index 0000000..f65b517
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png differ

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 52f62af55e6d13282e7ca4a904a668c19793130b..9f2187d57d3f06330cbdd30610e2c68aaff30e63 100644 (file)
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison",
   "size": {
     "x": 32,
     "y": 32
@@ -121,6 +121,9 @@
         {
                        "name": "headset"
                },
+        {
+                       "name": "encryptokey"
+               },
                {
             "name": "inhand-left",
             "directions": 4