diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl index a220737f18a..c9ac9d063c5 100644 --- a/Resources/Locale/en-US/headset/headset-component.ftl +++ b/Resources/Locale/en-US/headset/headset-component.ftl @@ -15,6 +15,7 @@ chat-radio-service = Service chat-radio-supply = Logistics chat-radio-syndicate = Syndicate chat-radio-freelance = Freelance +chat-radio-prison = Prison # not headset but whatever chat-radio-handheld = Handheld diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 5847b2a05b2..41b4ad6dd59 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -25,7 +25,8 @@ - id: ClothingEyesHudSecurity - id: BoxPDAPrisoner # Delta-V - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots - + - id: BoxEncryptionKeyPrisoner #Delta-V + - type: entity id: LockerWardenFilled suffix: Filled @@ -52,6 +53,7 @@ - id: ClothingEyesHudSecurity - id: BoxPDAPrisoner # Delta-V - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots + - id: BoxEncryptionKeyPrisoner #Delta-V - type: entity id: LockerSecurityFilled diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml new file mode 100644 index 00000000000..708253f6ffd --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml @@ -0,0 +1,19 @@ +- type: entity + name: Prisoner encryption key box + parent: BoxCardboard + id: BoxEncryptionKeyPrisoner + description: A box of spare encryption keys. + components: + - type: StorageFill + contents: + - id: EncryptionKeyPrison + amount: 6 + - type: Sprite + layers: + - state: box + - state: encryptokey + - type: Storage + capacity: 30 + whitelist: + components: + - EncryptionKey diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml new file mode 100644 index 00000000000..c41c235c136 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml @@ -0,0 +1,15 @@ +- type: entity + parent: EncryptionKey + id: EncryptionKeyPrison + name: Prison encryption key + description: An encryption key used by anybody who needs to speak with the prisoners + components: + - type: EncryptionKey + channels: + - Prison + defaultChannel: Prison + - type: Sprite + sprite: DeltaV/Objects/Devices/encryption_keys.rsi + layers: + - state: crypt_orange + - state: prisoner_label diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml new file mode 100644 index 00000000000..639eea09b3a --- /dev/null +++ b/Resources/Prototypes/DeltaV/radio_channels.yml @@ -0,0 +1,6 @@ +- type: radioChannel + id: Prison + name: chat-radio-prison + keycode: 'p' + frequency: 1601 + color: "#FFA500" \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 3b2ffc9d24e..58ef017ac18 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -108,6 +108,7 @@ - EncryptionKeySecurity - EncryptionKeyCommand - EncryptionKeyCommon + - EncryptionKeyPrison - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_prison.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_prison.yml new file mode 100644 index 00000000000..0323a884ef1 --- /dev/null +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_prison.yml @@ -0,0 +1,33 @@ + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetPrison + name: prison headset + description: Headset used by anybody who needs direct contact with prisoners + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyPrison + - EncryptionKeyCommon + - type: Sprite + sprite: DeltaV/Clothing/Ears/Headsets/prisoner.rsi + - type: Clothing + sprite: DeltaV/Clothing/Ears/Headsets/prisoner.rsi + +- type: entity + parent: ClothingHeadset + id: ClothingHeadsetPrisonGuard + name: guard headset + description: Headset used by prison guards. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyPrison + - EncryptionKeyCommon + - EncryptionKeySecurity + - type: Sprite + sprite: Clothing/Ears/Headsets/security.rsi + - type: Clothing + sprite: Clothing/Ears/Headsets/security.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 1c8a14dc76b..f7e3b67429b 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -72,6 +72,7 @@ - Security - Service - Supply + - Prison #DeltaV defaultChannel: Command - type: Sprite layers: diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index 1c9fe29876f..55d86d343dc 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -34,7 +34,7 @@ eyes: ClothingEyesGlassesSecurity head: ClothingHeadPrisonGuard id: PrisonGuardPDA - ears: ClothingHeadsetSecurity + ears: ClothingHeadsetPrisonGuard #DeltaV belt: ClothingBeltSecurityFilled innerClothingSkirt: ClothingUniformJumpsuitPrisonGuard satchel: ClothingBackpackSatchelSecurityFilled diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index b89530fe5ef..4ee5a118710 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -20,5 +20,5 @@ jumpsuit: ClothingUniformJumpsuitPrisoner shoes: ClothingShoesColorBlack id: PrisonerPDA - ears: ClothingHeadsetGrey + ears: ClothingHeadsetPrison #deltaV innerClothingSkirt: ClothingUniformJumpsuitPrisoner diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png new file mode 100644 index 00000000000..3e01bcb8bac Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png new file mode 100644 index 00000000000..354b1eee71d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json new file mode 100644 index 00000000000..33e08c9522f --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Resprited by DangerRevolution from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EARS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/crypt_orange.png b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/crypt_orange.png new file mode 100644 index 00000000000..e0ddcfe7b7e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/crypt_orange.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json new file mode 100644 index 00000000000..440000d647b --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by DangerRevolution for Space Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + {"name": "prisoner_label"}, + {"name": "crypt_orange"} + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/prisoner_label.png b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/prisoner_label.png new file mode 100644 index 00000000000..d7acc057c8d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/prisoner_label.png differ