-
Notifications
You must be signed in to change notification settings - Fork 192
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Port Justice Department From DeltaV (#675)
# Description This ports DeltaV-Station/Delta-v#660 > ## About the PR > Adds the Justice Department, a department enveloping the lawyer and 3 new roles that manage the court system and charges against the accused. Includes: • New department, Justice! • 3 new roles: ◦ Chief Justice: The main, impartial judge for the station responsible for adjudicating criminal and civil trials, as well as other small matters like paroles and pardons. ◦ Clerk: The court clerk, who organizes trials, notarizes court documents (warrants, sentences, etc), and ensures correct sentencing and due process for the accused in sec custody. ◦ Prosecutor: A special lawyer role that legally advises sec and handles all of its court prep and prosecution, freeing up sec's time to go stun baton the clown instead of waiting for trial. • Antag objective to steal the Clerk's notary stamp, an object imbued with the authority to officialize court decisions. • Made the Lawyer role easier to understand and added them to the department. Renamed to Attorney, they now exclusively defend the accused or can sue on their behalf. Can also curse at the prosecutor in the bar. • Changed SoP to match. Notable changes include ◦ Felony charges and above must be reviewed and approved by the Clerk or Chief Justice if those roles are active. ◦ Parole, criminal trials, and civil trials are now all adjudicated by the Chief Justice, or the clerk in their absence. ◦ To ensure fair judgement, a Captain can only remove the Chief Justice with a majority vote from command. ◦ Warrants and court decisions must be written down and stamped with the notary stamp. Warrants must be approved by the Chief Justice. ◦ Full list of SoP changes can be found here: https://docs.google.com/document/d/12ZKTtzvVWBuC7PuiREL9v7mhVZve11p0-T6MBPpVeGs/edit?usp=sharing • Classy wooden desk timer to help keep trials timely and within limits. > > **TO DO:** Chief Justice > > * [x] Role > * [x] Inventory > * [x] Job Description > * [x] Icon > * [x] Access (CMD/CJ/Sec/Justice*) > * [x] Airlocks > * [x] Spawnpoint > * [x] Closet(just reuse legal w/ a lock) > * [x] Gavel** (proto/sprite/sound) > * [x] Stamp (proto/sprite) > * [x] Drip > > Court Clerk > > * [x] Role > * [x] Inventory > * [x] Job Description > * [x] Icon > * [x] Access (Sec/Justice*) > * [x] Spawnpoint > * [x] Closet(just reuse legal w/ a lock) > * [x] Stamp** (proto/sprite) > * [x] Warrant document > * [x] Drip > > Prosecutor > > * [x] Role > * [x] Inventory > * [x] Job Description > * [x] Icon > * [x] Access (Sec/Justice*) > * [x] Spawnpoint > * [x] Closet(just reuse legal w/ a lock) > * [x] Drip(Can be same as lawyer but should have a unique badge) > > SoP/Guidlines > > * [x] Civil and criminal law-penalties > * [x] Legal mutiny? > * [x] Assigning judges when no judge is present > * [x] Judge is representative of CC. Not necessarily _above_ captain but outside. > * [x] When to appeal to a jury? How to pick a jury? (random would be good) > * [x] Rules for gaining warrants > * [x] Procedure for arresting officer filing criminal charges > * [x] Rules for summoning witnesses > * [ ] Guide/book > > Other > > * [ ] Station Beacons > > ## Notes: > * We might want to consider bringing back brig access for cells to give legal dept sec access and not control over prisoners. > * Mapping would need to provide offices for CJ, CC, and Prosecuter. > * Chief Justice is a rep of CC not necessarily above captain but outside > > ## Why / Balance > The current legal system in-game is built around LRP gameplay, with security handling everything relating to arrests, sentencing, trials, and execution. Additionally, it is near-impossible to find an impartial judge for any court case with the current system. New legal department would guarantee an impartial and available judge (whether it be the Chief Justice or Clerk) for any court case, take pressure off of security to handle things like sentencing and trials. Additionally, there will be more roleplay opportunities for things like civil cases, inter-department disputes, internal affairs, or whatever else you may need legal help with. > > ## Technical details > n/a > > ## Media > ![image](https://private-user-images.githubusercontent.com/136020119/295444469-8569ec5a-8a44-41a5-83c8-165c940e9a9a.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjI4MjY5MTEsIm5iZiI6MTcyMjgyNjYxMSwicGF0aCI6Ii8xMzYwMjAxMTkvMjk1NDQ0NDY5LTg1NjllYzVhLThhNDQtNDFhNS04M2M4LTE2NWM5NDBlOWE5YS5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwODA1JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDgwNVQwMjU2NTFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT03ZjE2M2UxNmE2OWE3YmNkM2MwMzY3YmQ5MWU5MGEwNzFjZTg5NDAyMGZkNzkyZTJjZDRhYWJlYzk1MTNmZDg3JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.kv3SVoSKceqwlIctnBa4u6E3NHMJ3rPrg3VxoTl-jZQ) ![image](https://private-user-images.githubusercontent.com/136020119/295444610-9ab40e2b-149b-4d9d-af13-47c8fec40be3.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjI4MjY5MTEsIm5iZiI6MTcyMjgyNjYxMSwicGF0aCI6Ii8xMzYwMjAxMTkvMjk1NDQ0NjEwLTlhYjQwZTJiLTE0OWItNGQ5ZC1hZjEzLTQ3YzhmZWM0MGJlMy5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQwODA1JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MDgwNVQwMjU2NTFaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT01ZDUyZWQ4NWVkZTM5NDlhNDcxNTNiZGIxZDljMjJkZTBmZThmN2IxNWEwMzk5MWQwMDdjNmQ4MWY1NTcxNWFlJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZhY3Rvcl9pZD0wJmtleV9pZD0wJnJlcG9faWQ9MCJ9.jZUnQ8Xj6uor4NAU-IHU7MoD1e3F964XkmZ3aNjPj0U) > > * [x] I have added screenshots/videos to this PR showcasing its changes in-game, **or** this PR does not require an in-game showcase > > ## Breaking changes > none that I know of 😓 > **Changelog** 🆑 Leo, Velcroboy, and Timemaster - add: Added The Justice Department >:)
- Loading branch information
Showing
220 changed files
with
2,278 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
device-frequency-prototype-name-surveillance-camera-justice = Justice Cameras | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,3 @@ | ||
chat-radio-justice = Justice | ||
chat-radio-prison = Prison | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
department-Justice-description = Uphold justice on the station. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,4 @@ | ||
department-Epistemics = Epistemics | ||
department-Logistics = Logistics | ||
department-Justice = Justice | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
job-supervisors-cj = the chief justice | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,3 +47,6 @@ | |
- Musician | ||
- Reporter | ||
- Zookeeper | ||
- Justice | ||
- Prosecutor | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/chiefjustice.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
14
Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/clerk.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
Resources/Prototypes/DeltaV/Entities/Clothing/Neck/misc.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.