From ab3860bf4b99a427ee5a574a44cc1eba9ca7bd32 Mon Sep 17 00:00:00 2001 From: Slava0135 <40753025+Slava0135@users.noreply.github.com> Date: Tue, 7 Mar 2023 00:05:42 +0300 Subject: [PATCH] remove heads encryption keys (#14435) --- .../Entities/Clothing/Ears/headsets.yml | 24 +++- .../Entities/Clothing/Ears/headsets_alt.yml | 25 +++-- .../Objects/Devices/encryption_keys.yml | 104 ++---------------- 3 files changed, 49 insertions(+), 104 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 402de92138..44dd9a7477 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -14,6 +14,7 @@ - EncryptionKeyCommon - type: Headset - type: EncryptionKeyHolder + keySlots: 3 - type: Sprite state: icon - type: Clothing @@ -39,6 +40,7 @@ containers: key_slots: - EncryptionKeyCargo + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/cargo.rsi - type: Clothing @@ -64,7 +66,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyQM + - EncryptionKeyCargo + - EncryptionKeyCommand + - EncryptionKeyCommon - type: entity parent: ClothingHeadset @@ -76,6 +80,7 @@ containers: key_slots: - EncryptionKeyCentCom + - EncryptionKeyStationMaster - type: Sprite sprite: Clothing/Ears/Headsets/centcom.rsi - type: Clothing @@ -90,7 +95,7 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyCommand + - EncryptionKeyStationMaster - type: Sprite sprite: Clothing/Ears/Headsets/command.rsi - type: Clothing @@ -106,6 +111,7 @@ containers: key_slots: - EncryptionKeyEngineering + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/engineering.rsi - type: Clothing @@ -120,7 +126,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyCE + - EncryptionKeyEngineering + - EncryptionKeyCommand + - EncryptionKeyCommon - type: entity parent: ClothingHeadset @@ -132,6 +140,7 @@ containers: key_slots: - EncryptionKeyMedical + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/medical.rsi - type: Clothing @@ -147,6 +156,7 @@ containers: key_slots: - EncryptionKeyScience + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/science.rsi - type: Clothing @@ -162,6 +172,7 @@ containers: key_slots: - EncryptionKeyMedicalScience + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/medicalscience.rsi - type: Clothing @@ -177,6 +188,7 @@ containers: key_slots: - EncryptionKeyRobo + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/robotics.rsi - type: Clothing @@ -191,7 +203,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyRD + - EncryptionKeyScience + - EncryptionKeyCommand + - EncryptionKeyCommon - type: entity parent: ClothingHeadset @@ -203,6 +217,7 @@ containers: key_slots: - EncryptionKeySecurity + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi - type: Clothing @@ -218,6 +233,7 @@ containers: key_slots: - EncryptionKeyService + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/service.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index be5327b0a4..aba8073bdb 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -18,7 +18,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyQM + - EncryptionKeyCargo + - EncryptionKeyCommand + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/cargo.rsi - type: Clothing @@ -33,6 +35,7 @@ containers: key_slots: - EncryptionKeyCentCom + - EncryptionKeyStationMaster - type: Sprite sprite: Clothing/Ears/Headsets/centcom.rsi - type: Clothing @@ -46,7 +49,7 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyCommand + - EncryptionKeyStationMaster - type: Sprite sprite: Clothing/Ears/Headsets/command.rsi - type: Clothing @@ -60,7 +63,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyCE + - EncryptionKeyEngineering + - EncryptionKeyCommand + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/engineering.rsi - type: Clothing @@ -74,7 +79,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyCMO + - EncryptionKeyMedical + - EncryptionKeyCommand + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/medical.rsi - type: Clothing @@ -88,7 +95,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyHOS + - EncryptionKeySecurity + - EncryptionKeyCommand + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi - type: Clothing @@ -102,7 +111,9 @@ - type: ContainerFill containers: key_slots: - - EncryptionKeyRD + - EncryptionKeyScience + - EncryptionKeyCommand + - EncryptionKeyCommon - type: Sprite sprite: Clothing/Ears/Headsets/science.rsi - type: Clothing @@ -116,7 +127,7 @@ components: - type: Headset - type: EncryptionKeyHolder - keySlots: 4 + keySlots: 5 - type: ContainerFill containers: key_slots: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 8468ca5611..216fc94037 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -35,7 +35,6 @@ components: - type: EncryptionKey channels: - - Common - Supply defaultChannel: Supply - type: Sprite @@ -44,41 +43,38 @@ - type: entity parent: EncryptionKey - id: EncryptionKeyQM - name: quartermaster's encryption key - description: An encryption key used by the boss of cargo. + id: EncryptionKeyCentCom + name: central command encryption key + description: An encryption key used by captain's bosses. components: - type: EncryptionKey channels: - - Common - - Command - - Supply - defaultChannel: Supply + - CentCom + defaultChannel: CentCom - type: Sprite sprite: Objects/Devices/encryption_keys.rsi - state: qm_cypherkey + state: bin_cypherkey - type: entity parent: EncryptionKey - id: EncryptionKeyCentCom - name: central command encryption key - description: An encryption key used by captain's bosses. + id: EncryptionKeyStationMaster + name: station master encryption key + description: An encryption key used by station's bosses. components: - type: EncryptionKey channels: - Common - Command - - CentCom - Engineering - Medical - Science - Security - Service - Supply - defaultChannel: CentCom + defaultChannel: Command - type: Sprite sprite: Objects/Devices/encryption_keys.rsi - state: bin_cypherkey + state: cap_cypherkey - type: entity parent: EncryptionKey @@ -88,14 +84,7 @@ components: - type: EncryptionKey channels: - - Common - Command - - Engineering - - Medical - - Science - - Security - - Service - - Supply defaultChannel: Command - type: Sprite sprite: Objects/Devices/encryption_keys.rsi @@ -109,29 +98,12 @@ components: - type: EncryptionKey channels: - - Common - Engineering defaultChannel: Engineering - type: Sprite sprite: Objects/Devices/encryption_keys.rsi state: eng_cypherkey -- type: entity - parent: EncryptionKey - id: EncryptionKeyCE - name: chief engineer's encryption key - description: An encryption key used by the boss of the real men. - components: - - type: EncryptionKey - channels: - - Common - - Command - - Engineering - defaultChannel: Engineering - - type: Sprite - sprite: Objects/Devices/encryption_keys.rsi - state: ce_cypherkey - - type: entity parent: EncryptionKey id: EncryptionKeyMedical @@ -140,29 +112,12 @@ components: - type: EncryptionKey channels: - - Common - Medical defaultChannel: Medical - type: Sprite sprite: Objects/Devices/encryption_keys.rsi state: med_cypherkey -- type: entity - parent: EncryptionKey - id: EncryptionKeyCMO - name: chief medical officer encryption key - description: An encryption key used by the head of the medical department. - components: - - type: EncryptionKey - channels: - - Common - - Command - - Medical - defaultChannel: Medical - - type: Sprite - sprite: Objects/Devices/encryption_keys.rsi - state: cmo_cypherkey - - type: entity parent: EncryptionKey id: EncryptionKeyMedicalScience @@ -171,7 +126,6 @@ components: - type: EncryptionKey channels: - - Common - Medical - Science defaultChannel: Science @@ -187,7 +141,6 @@ components: - type: EncryptionKey channels: - - Common - Science defaultChannel: Science - type: Sprite @@ -202,29 +155,12 @@ components: - type: EncryptionKey channels: - - Common - Science defaultChannel: Science - type: Sprite sprite: Objects/Devices/encryption_keys.rsi state: rob_cypherkey -- type: entity - parent: EncryptionKey - id: EncryptionKeyRD - name: research director's encryption key - description: An encryption key used by the head of the science department. Looks like it's been chewed on. - components: - - type: EncryptionKey - channels: - - Common - - Command - - Science - defaultChannel: Science - - type: Sprite - sprite: Objects/Devices/encryption_keys.rsi - state: rd_cypherkey - - type: entity parent: EncryptionKey id: EncryptionKeySecurity @@ -233,29 +169,12 @@ components: - type: EncryptionKey channels: - - Common - Security defaultChannel: Security - type: Sprite sprite: Objects/Devices/encryption_keys.rsi state: sec_cypherkey -- type: entity - parent: EncryptionKey - id: EncryptionKeyHOS - name: head of security encryption key - description: An encryption key used by the boss of security. - components: - - type: EncryptionKey - channels: - - Common - - Command - - Security - defaultChannel: Security - - type: Sprite - sprite: Objects/Devices/encryption_keys.rsi - state: hos_cypherkey - - type: entity parent: EncryptionKey id: EncryptionKeyService @@ -264,7 +183,6 @@ components: - type: EncryptionKey channels: - - Common - Service defaultChannel: Service - type: Sprite -- 2.52.0