Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prison communications #715

Merged
merged 56 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
4ab2d61
Finished
Bonktrauma Jan 23, 2024
0567cf7
Revert "Finished"
Bonktrauma Jan 23, 2024
52322ce
Finished actual
Bonktrauma Jan 23, 2024
66d54c9
Merge branch 'master' into prison-headset
Bonktrauma Jan 23, 2024
6927a10
Update general.yml
Bonktrauma Jan 23, 2024
9b74120
Merge branch 'prison-headset' of https://github.com/Shadowwailker/Del…
Bonktrauma Jan 23, 2024
3111c3b
Update general.yml
Bonktrauma Jan 23, 2024
458bb89
Merge branch 'master' into prison-headset
Bonktrauma Jan 28, 2024
e73f7a5
Merge branch 'master' into prison-headset
Bonktrauma Jan 29, 2024
42ed38a
Merge branch 'master' into prison-headset
Bonktrauma Jan 30, 2024
5f0e2de
Merge branch 'master' into prison-headset
Bonktrauma Jan 31, 2024
9a8d087
Merge branch 'master' into prison-headset
Bonktrauma Jan 31, 2024
9ad6e4c
Merge branch 'master' into prison-headset
Bonktrauma Feb 1, 2024
bc7ebbc
Merge branch 'master' into prison-headset
Bonktrauma Feb 1, 2024
bb703a3
Merge branch 'master' into prison-headset
Bonktrauma Feb 2, 2024
f4c87ae
Merge branch 'master' into prison-headset
Bonktrauma Feb 3, 2024
40ed580
Merge branch 'master' into prison-headset
Bonktrauma Feb 3, 2024
dac3e1b
Merge branch 'master' into prison-headset
Bonktrauma Feb 4, 2024
ecefb91
Merge branch 'master' into prison-headset
Bonktrauma Feb 4, 2024
a2ce47b
Merge branch 'master' into prison-headset
Bonktrauma Feb 5, 2024
54f03b8
Merge branch 'master' into prison-headset
Bonktrauma Feb 6, 2024
1b20d61
Merge branch 'master' into prison-headset
Bonktrauma Feb 8, 2024
e4b089e
Merge branch 'master' into prison-headset
Bonktrauma Feb 10, 2024
a71182b
making changes
Bonktrauma Feb 12, 2024
d8fe8fb
Merge branch 'master' into prison-headset
Bonktrauma Feb 12, 2024
36f0be3
Merge branch 'master' into prison-headset
Bonktrauma Feb 12, 2024
3beaa92
Merge branch 'master' into prison-headset
Bonktrauma Feb 13, 2024
8f4e361
Merge branch 'master' into prison-headset
Bonktrauma Feb 13, 2024
26d8fdc
Merge branch 'master' into prison-headset
Bonktrauma Feb 13, 2024
937afd6
Merge branch 'master' into prison-headset
Bonktrauma Feb 13, 2024
933a6fa
Merge branch 'master' into prison-headset
Bonktrauma Feb 14, 2024
2e3df61
Merge branch 'master' into prison-headset
Bonktrauma Feb 15, 2024
cfc7e13
Merge branch 'master' into prison-headset
Bonktrauma Feb 17, 2024
224d22e
I think this is correct
Bonktrauma Feb 19, 2024
3fd9a75
Merge branch 'master' into prison-headset
Bonktrauma Feb 19, 2024
9215d94
Merge branch 'prison-headset' of https://github.com/Shadowwailker/Del…
Bonktrauma Feb 19, 2024
33840b4
Move localisations into Delta-V directory
stellar-novas Feb 20, 2024
2175cdd
file fix
Bonktrauma Feb 20, 2024
502b34f
file location change
Bonktrauma Feb 20, 2024
adf2e11
Merge branch 'master' into prison-headset
Bonktrauma Feb 20, 2024
2b15345
Merge pull request #1 from stellar-novas/prison-headset
Bonktrauma Feb 20, 2024
089a643
Merge branch 'master' into prison-headset
Bonktrauma Feb 20, 2024
4ca4577
Merge branch 'master' into prison-headset
Bonktrauma Feb 21, 2024
fc5c004
Merge branch 'master' into prison-headset
Bonktrauma Feb 22, 2024
b8600be
Merge branch 'master' into prison-headset
Bonktrauma Feb 22, 2024
c65d565
Merge branch 'master' into prison-headset
Bonktrauma Feb 23, 2024
f00997a
Merge branch 'master' into prison-headset
Bonktrauma Feb 24, 2024
42108a1
Merge branch 'master' into prison-headset
Bonktrauma Feb 24, 2024
3f90e53
Merge branch 'master' into prison-headset
Bonktrauma Feb 25, 2024
b82c623
Merge branch 'master' into prison-headset
Bonktrauma Feb 28, 2024
e341382
Merge branch 'master' into prison-headset
Bonktrauma Mar 2, 2024
b8557fb
Merge branch 'master' into prison-headset
Bonktrauma Mar 3, 2024
130df1e
Merge branch 'master' into prison-headset
Bonktrauma Mar 5, 2024
34c0be4
Merge branch 'master' into prison-headset
Bonktrauma Mar 7, 2024
1398882
Merge branch 'master' into prison-headset
Bonktrauma Mar 7, 2024
d2a2b19
Merge branch 'master' into prison-headset
Bonktrauma Mar 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chat-radio-prison = Prison
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 @@ -23,7 +23,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 @@ -48,6 +49,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
18 changes: 18 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- 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: 4
- type: Sprite
layers:
- state: box
- state: encryptokey
- type: Storage
whitelist:
components:
- EncryptionKey
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,37 @@
- type: Sprite
sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
- type: Clothing
sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi

- 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
@@ -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 @@ -72,6 +72,7 @@
- Security
- Service
- Supply
- Prison #DeltaV
defaultChannel: Command
- type: Sprite
layers:
Expand Down Expand Up @@ -178,6 +179,7 @@
- type: EncryptionKey
channels:
- Security
- Prison #deltaV
defaultChannel: Security
- 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.
Loading