Skip to content

Commit

Permalink
Finished actual
Browse files Browse the repository at this point in the history
  • Loading branch information
Bonktrauma committed Jan 23, 2024
1 parent 0567cf7 commit 52322ce
Show file tree
Hide file tree
Showing 16 changed files with 112 additions and 3 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/headset/headset-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
19 changes: 19 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions Resources/Prototypes/DeltaV/radio_channels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: radioChannel
id: Prison
name: chat-radio-prison
keycode: 'p'
frequency: 1601
color: "#FFA500"
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
- EncryptionKeySecurity
- EncryptionKeyCommand
- EncryptionKeyCommon
- EncryptionKeyPrison
- type: Sprite
sprite: Clothing/Ears/Headsets/security.rsi
- type: Clothing
Expand Down
33 changes: 33 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Ears/headsets_prison.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
- Security
- Service
- Supply
- Prison #DeltaV
defaultChannel: Command
- type: Sprite
layers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
eyes: ClothingEyesGlassesSecurity
head: ClothingHeadPrisonGuard
id: PrisonGuardPDA
ears: ClothingHeadsetSecurity
ears: ClothingHeadsetPrisonGuard #DeltaV
belt: ClothingBeltSecurityFilled
innerClothingSkirt: ClothingUniformJumpsuitPrisonGuard
satchel: ClothingBackpackSatchelSecurityFilled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
jumpsuit: ClothingUniformJumpsuitPrisoner
shoes: ClothingShoesColorBlack
id: PrisonerPDA
ears: ClothingHeadsetGrey
ears: ClothingHeadsetPrison #deltaV
innerClothingSkirt: ClothingUniformJumpsuitPrisoner
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 52322ce

Please sign in to comment.