Secure Security Headset

new-frontiers-14 · Oct 22, 2023 · 3acb6d1 · 3acb6d1
1 parent 68712a1
commit 3acb6d1
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 25 deletions.
diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml
@@ -8419,13 +8419,6 @@ entities:
     - pos: 30.5,24.5
       parent: 588
       type: Transform
-- proto: EncryptionKeySecurity
-  entities:
-  - uid: 376
-    components:
-    - pos: 3.5739155,0.63120204
-      parent: 588
-      type: Transform
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 867

diff --git a/Resources/Maps/Shuttles/dart.yml b/Resources/Maps/Shuttles/dart.yml
@@ -1190,13 +1190,6 @@ entities:
     - pos: -4.4936705,5.6566277
       parent: 1
       type: Transform
-- proto: BoxEncryptionKeySecurity
-  entities:
-  - uid: 981
-    components:
-    - pos: -4.3061705,5.4847527
-      parent: 1
-      type: Transform
 - proto: BoxTrashbag
   entities:
   - uid: 853

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -314,8 +314,7 @@
       - id: ClothingOuterHardsuitSecurityRed
       - id: ClothingMaskGasSwat
       - id: ClothingBeltSecurityFilled
-#      - id: ClothingHeadsetAltSecurity
-      - id: ClothingHeadsetAltCommand
+      - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSecurity
       - id: ClothingShoesBootsJack
       - id: CigarGoldCase
@@ -345,8 +344,7 @@
       - id: ClothingUniformJumpskirtHoSAlt
       - id: ClothingUniformJumpsuitHoSAlt
       - id: ClothingBeltSecurityFilled
-#      - id: ClothingHeadsetAltSecurity
-      - id: ClothingHeadsetAltCommand
+      - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSecurity
       - id: ClothingShoesBootsJack
       - id: CigarGoldCase

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -62,7 +62,7 @@
       - id: ClothingBeltSecurityFilled
       - id: Flash
       - id: ClothingEyesGlassesSecurity
-      - id: ClothingHeadsetSecurity
+      - id: ClothingHeadsetSecuritySafe # Ask SR or Sheriff for keys
       - id: ClothingHandsGlovesColorBlack
       - id: ClothingShoesBootsJack
       - id: WeaponMeleeNeedle

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -13,4 +13,4 @@
     ClothingHeadHatFedoraGrey: 2
     ClothingHandsGlovesColorBlack: 2
     ClothingHandsGlovesLatex: 2
-    ClothingHeadsetSecurity: 2
+    ClothingHeadsetSecuritySafe: 2 # Ask SR or Sheriff for keys
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -15,7 +15,7 @@
     ClothingUniformJumpsuitSecGrey: 3
     ClothingUniformJumpskirtSecGrey: 3
     ClothingUniformJumpsuitSecBlue: 3
-    ClothingHeadsetSecurity: 3
+    ClothingHeadsetSecuritySafe: 3 # Ask SR or Sheriff for keys
     ClothingOuterWinterSec: 2
     ClothingOuterArmorBasic: 2
     ClothingOuterArmorBasicSlim: 2 

diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
@@ -105,9 +105,10 @@
   - type: ContainerFill
     containers:
       key_slots:
-      - EncryptionKeySecurity
-      - EncryptionKeyCommand
-      - EncryptionKeyCommon
+#      - EncryptionKeySecurity
+#      - EncryptionKeyCommand
+#      - EncryptionKeyCommon
+      - EncryptionKeyStationMaster
   - type: Sprite
     sprite: Clothing/Ears/Headsets/security.rsi
   - type: Clothing

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -54,7 +54,7 @@
     head: ClothingHeadHatBeretHoS
     id: HoSPDA
     gloves: ClothingHandsGlovesCombat
-    ears: ClothingHeadsetAltCommand
+    ears: ClothingHeadsetAltSecurity
     belt: ClothingBeltSecurityFilled
     pocket1: WeaponPistolMk58Nonlethal
   innerClothingSkirt: ClothingUniformJumpskirtHoS

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: ClothingHeadsetSecurity
+  id: ClothingHeadsetSecuritySafe # Ask SR or Sheriff for keys
+  suffix: Safe
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommon