From 52322ce6d0d3bcedd44ad76824540a8828e79b2a Mon Sep 17 00:00:00 2001 From: Shadowwailker <123421227+Shadowwailker@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:43:14 -0500 Subject: [PATCH] Finished actual --- .../en-US/headset/headset-component.ftl | 1 + .../Catalog/Fills/Lockers/security.yml | 4 ++- .../DeltaV/Catalog/Fills/Boxes/general.yml | 19 ++++++++++ .../Objects/Devices/encryption_keys.yml | 15 ++++++++ .../Prototypes/DeltaV/radio_channels.yml | 6 ++++ .../Entities/Clothing/Ears/headsets_alt.yml | 1 + .../Clothing/Ears/headsets_prison.yml | 33 ++++++++++++++++++ .../Objects/Devices/encryption_keys.yml | 1 + .../Roles/Jobs/Security/prisonguard.yml | 2 +- .../Roles/Jobs/Wildcards/prisoner.yml | 2 +- .../Headsets/prisoner.rsi/equipped-EARS.png | Bin 0 -> 227 bytes .../Ears/Headsets/prisoner.rsi/icon.png | Bin 0 -> 390 bytes .../Ears/Headsets/prisoner.rsi/meta.json | 18 ++++++++++ .../encryption_keys.rsi/crypt_orange.png | Bin 0 -> 507 bytes .../Devices/encryption_keys.rsi/meta.json | 13 +++++++ .../encryption_keys.rsi/prisoner_label.png | Bin 0 -> 222 bytes 16 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml create mode 100644 Resources/Prototypes/DeltaV/radio_channels.yml create mode 100644 Resources/Prototypes/Entities/Clothing/Ears/headsets_prison.yml create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/crypt_orange.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/prisoner_label.png 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 0000000000000000000000000000000000000000..3e01bcb8bacdb5923d9674ce7f87a5ab495b52c2 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!8lJB$B>G+x3@M5HaKvwI9M%X>E57seA2xm z=Y3~17Md&VQEp{u$UpZw?){CR%6+9SuUV%&dmUG&eRk%|wbL)y$^*>+0)v3>@r^~n z=boz8#nu&fvxCGEW_7TiPM43JHU0ZGAeS#S!ZXd+mq822<^ah9!KL8IAj;F#&t;uc GLK6VE@J7A> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..354b1eee71dbb1607d5667604e7fc502e768f105 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!21ZX8$B+p3w^J7K9WoGT=2A*l+ z2NrCo5aBxAt>C$#WjaIife%cjB`OkW&)n9PERHt1v~KRA`9G_Dcl}sArjce|n4?!(rXRq(%B))w4cTxVI+t{8rlFaN2=UEndEF zDW|xEq(fMLzI4oj+y^yNxjk+3y0Y&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzhP|C{$Vkq^mq#977^FlM*CY7b_Y_F#(AXr-YU2hwGCJ&i-NE^yhn*#Gi_2%Nr9- z3RzAt>fidxku*WsF>B?!j-ucWW(N~Ho+1^Gd1`z=>hEy8*?o8Cs{b1kBQ!1^VN{UM zotx!9g?Yuh>Ise8k|t;{{1lq~-Z5!|0K-bvYl1+#8UFuYSd}afWaNQdk({6)bfe4g zPyNMp-|K-c_zyHJ!q9_n3EPrs9?6~IX0I5Y2r#gk>iJC9;LwcuBQL$oTS~(`^+&#R zNSkQ$lMFc~1#XVSSx=cF_WZZc`%?cp_e T;_+|YAUAlr`njxgN@xNA=(CAd literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d7acc057c8d696efd716e274f62169854dcd8bef GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5FyuV@QPi+e-&I8w_|_AHHDPTi)`X=RfB|ME)9)(;&F3>$8V%?$FgOnS4Uy6V2%%(S$i?7g4D*Ea4B)b?K{oe{G2 zwB&leABR4vvoItWP85!vq1c&dtr-urgfBJ1GtJkRK?}&{0Adih6g(M3dAj