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

Port Justice Department From DeltaV #675

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Content.Shared/Access/Components/IdCardConsoleComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
"Mail", // Nyanotrasen - Mail, see Resources/Prototypes/Nyanotrasen/Access/cargo.yml
"Mantis", // DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
"Zookeeper", // DeltaV - Add Zookeeper access
"ChiefJustice", // DeltaV - Add Chief Justice access
"Justice", // DeltaV - Add Justice access
"Prosecutor", // Delta V - Add Prosecutor access
};

[Serializable, NetSerializable]
Expand Down
Binary file added Resources/Audio/DeltaV/Items/gavel.ogg
Binary file not shown.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/devices/device-network.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
device-frequency-prototype-name-surveillance-camera-justice = Justice Cameras

2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/headset/headset-component.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
chat-radio-justice = Justice
chat-radio-prison = Prison

2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/job/department-desc.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
department-Justice-description = Uphold justice on the station.

2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/job/department.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
department-Epistemics = Epistemics
department-Logistics = Logistics
department-Justice = Justice

4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department.
job-description-chief-justice = Manage the justice department, act as a judge, and ensure everyone recieves fair and just treatment.
job-description-clerk = Organize trials, notarize documents, review charges, and act as a judge if needed.
job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes.
job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/deltav/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
job-name-medical-borg = Medical Cyborg
job-name-chief-justice = Chief Justice
job-name-clerk = Clerk
job-name-prosecutor = Prosecutor
job-name-lawyer = Attorney
job-name-courier = Courier
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/job/job-supervisors.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
job-supervisors-cj = the chief justice

4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/misc/pda.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-HoSPDA = head of security pda
.desc = Smells like donuts and gunpowder residue.
ent-LawyerPDA = attorney pda
.desc = For attornies to poach dubious clients.
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ station-beacon-boxing-ring = Boxing
station-beacon-park = Park

station-beacon-corpsman = Corpsman

station-beacon-justice = Justice
station-beacon-chiefjustice = Chief Justice
station-beacon-prosecutor = Prosecutor
5 changes: 4 additions & 1 deletion Resources/Locale/en-US/deltav/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
stamp-component-stamped-name-lawyer = Lawyer
stamp-component-stamped-name-psychologist = Psychologist
stamp-component-stamped-name-psychologist = Psychologist
stamp-component-stamped-name-notary = NOTARY
stamp-component-stamped-name-chiefjustice = Chief Justice

5 changes: 4 additions & 1 deletion Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
id-card-access-level-orders = Orders
id-card-access-level-orders = Orders
id-card-access-level-mantis = Psionic Mantis
id-card-access-level-chief-justice = Chief Justice
id-card-access-level-prosecutor = Prosecutor
id-card-access-level-justice = Justice
id-card-access-level-corpsman = Corpsman
3 changes: 2 additions & 1 deletion Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ job-name-centcomoff = CentCom Official
job-name-reporter = Reporter
job-name-musician = Musician
job-name-librarian = Librarian
job-name-lawyer = Lawyer
# DeltaV - Changed Lawyer to Attorney
# job-name-lawyer = Lawyer
job-name-mime = Mime
job-name-ce = Chief Engineer
job-name-janitor = Janitor
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,7 @@
- Musician # DeltaV - Add Musician access
- Reporter # DeltaV - Add Reporter access
- Zookeeper # DeltaV - Add Zookeeper access
- Justice # DeltaV - Add Justice dept access
- ChiefJustice # DeltaV - Add Chief Justice access
- Prosecutor # DeltaV - Add Prosecutor access
- Corpsman # DeltaV - Add Corpsman access
20 changes: 20 additions & 0 deletions Resources/Prototypes/DeltaV/Access/justice.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: accessLevel
id: ChiefJustice
name: id-card-access-level-cj

- type: accessLevel
id: Justice
name: id-card-access-level-justice

- type: accessLevel
id: Prosecutor
name: id-card-access-level-prosecutor

- type: accessGroup
id: Justice
tags:
- Justice
- Prosecutor
- ChiefJustice
- Lawyer

3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,6 @@
- Musician
- Reporter
- Zookeeper
- Justice
- Prosecutor

26 changes: 26 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,29 @@
whitelist:
components:
- EncryptionKey

- type: entity
name: justice encryption key box
parent: BoxEncryptionKeyPassenger
id: BoxEncryptionKeyJustice
description: A box of spare encryption keys.
components:
- type: StorageFill
contents:
- id: EncryptionKeyJustice
amount: 4

#- type: entity
# name: syndicate radio implanter box
# parent: BoxCardboard
# id: BoxSyndicateRadioImplanter
# description: Contains cranial radio implants favored by Syndicate agents.
# components:
# - type: Sprite
# layers:
# - state: box_of_doom
# - state: implant
# - type: StorageFill
# contents:
# - id: SyndicateRadioImplanter
# amount: 2
13 changes: 13 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,16 @@
amount: 1
- id: MailCarrierPDA
amount: 1

- type: entity
name: justice PDA box
parent: BoxPDA
id: BoxPDAJustice
description: A box of spare PDA microcomputers for the justice department.
components:
- type: StorageFill
contents:
- id: LawyerPDA
amount: 2
- id: ProsecutorPDA
- id: ClerkPDA
21 changes: 21 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- type: entity
parent: LockerChiefJustice
id: LockerChiefJusticeFilled
suffix: Filled
components:
- type: StorageFill
contents:
- id: ClothingHeadsetAltJustice
- id: ClothingNeckCloakCJ
- id: ClothingUniformJumpsuitChiefJusticeFormal
- id: ClothingUniformJumpsuitChiefJusticeWhite
- id: PaperStationWarrant
amount: 10
- id: BoxPDAJustice
- id: BoxEncryptionKeyJustice
- id: ChiefJusticeIDCard
- id: DoorRemoteJustice
- id: Gavel
- id: RubberStampChiefJustice
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
14 changes: 14 additions & 0 deletions Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: LockerClerk
id: LockerClerkFilled
suffix: Filled
components:
- type: StorageFill
contents:
- id: ClothingOuterClerkVest
- id: PaperStationWarrant
amount: 10
- id: BoxEncryptionKeyJustice
- id: ClerkIDCard
- id: RubberStampNotary

5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/Device/devicenet_frequencies.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: deviceFrequency
id: SurveillanceCameraJustice
name: device-frequency-prototype-name-surveillance-camera-justice
frequency: 1420

40 changes: 40 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,45 @@
sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
- type: Clothing
sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi

- type: entity
parent: ClothingHeadset
id: ClothingHeadsetJustice
name: justice headset
description: This is used by the justice department.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyJustice
- EncryptionKeyPrison
- EncryptionKeySecurity
- EncryptionKeyCommon
- type: Sprite
sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
state: icon
- type: Clothing
sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi

- type: entity
parent: ClothingHeadset
id: ClothingHeadsetAltJustice
name: chief justice's headset
description: The headset used by the chief justice.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyJustice
- EncryptionKeyPrison
- EncryptionKeySecurity
- EncryptionKeyCommon
- EncryptionKeyCommand
- type: Sprite
sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi
state: icon_alt
- type: Clothing
sprite: DeltaV/Clothing/Ears/Headsets/justice.rsi

- type: entity
parent: ClothingHeadset
Expand Down Expand Up @@ -75,3 +114,4 @@
sprite: Clothing/Ears/Headsets/security.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/security.rsi

12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,15 @@
sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCJToque
name: chief justice's toque
description: A standard-issue judicial hat. Wigs are old-fashioned anyway.
components:
- type: Sprite
sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi
- type: Clothing
sprite: DeltaV/Clothing/Head/Hats/cj_toque.rsi

12 changes: 12 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,15 @@
sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakCJ
name: chief justice's cloak
description: A hefty cloak adorned with a modest insignia and grand fur trim.
components:
- type: Sprite
sprite: DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi
- type: StealTarget
stealGroup: HeadCloak

13 changes: 13 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckProsecutorbadge
name: prosecutor badge
description: A badge to show that the owner is a 'legitimate' prosecutor who passed the NT bar exam required to practice law.
components:
- type: Sprite
sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi
- type: TypingIndicatorClothing
proto: lawyer

Original file line number Diff line number Diff line change
Expand Up @@ -123,3 +123,17 @@
sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi
- type: TemperatureProtection
coefficient: 0.1

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterChiefJustice
name: chief justice's robes
description: Heavy black robes with magenta and gold trim. It smells old.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi
- type: TemperatureProtection
coefficient: 0.1

Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,15 @@
Heat: 0.9
- type: ExplosionResistance
damageCoefficient: 0.9

- type: entity
parent: ClothingOuterBase
id: ClothingOuterClerkVest
name: clerk's vest
description: a silken magenta vest with a pocket to put your notary stamp.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi

Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,37 @@
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtChiefJustice
name: chief justice's jumpskirt
description: A fancy black jumpskirt with a lace cravat to make it even more fancy. Proper judicial attire.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniform/Jumpskirt/cj.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtClerk
name: clerk's dress skirt
description: A modest dress skirt for the person with the power to notarize anything.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpskirtProsecutor
name: prosecutor's dress skirt
description: A red suit and skirt with a fancy cravat. Perfect for a prosecutor.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi

Loading
Loading