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

Adds the Justice Department #660

Merged
merged 132 commits into from
Jun 7, 2024

Conversation

leonardo-dabepis
Copy link
Contributor

@leonardo-dabepis leonardo-dabepis commented Jan 10, 2024

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

  • Role
  • Inventory
  • Job Description
  • Icon
  • Access (CMD/CJ/Sec/Justice*)
  • Airlocks
  • Spawnpoint
  • Closet(just reuse legal w/ a lock)
  • Gavel** (proto/sprite/sound)
  • Stamp (proto/sprite)
  • Drip

Court Clerk

  • Role
  • Inventory
  • Job Description
  • Icon
  • Access (Sec/Justice*)
  • Spawnpoint
  • Closet(just reuse legal w/ a lock)
  • Stamp** (proto/sprite)
  • Warrant document
  • Drip

Prosecutor

  • Role
  • Inventory
  • Job Description
  • Icon
  • Access (Sec/Justice*)
  • Spawnpoint
  • Closet(just reuse legal w/ a lock)
  • Drip(Can be same as lawyer but should have a unique badge)

SoP/Guidlines

  • Civil and criminal law-penalties
  • Legal mutiny?
  • Assigning judges when no judge is present
  • Judge is representative of CC. Not necessarily above captain but outside.
  • When to appeal to a jury? How to pick a jury? (random would be good)
  • Rules for gaining warrants
  • Procedure for arresting officer filing criminal charges
  • 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 image

  • 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 >:)

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Jan 10, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT changed the title Legal Department (draft) Legal Department Jan 10, 2024
@IamVelcroboy
Copy link
Member

These .rsi need to be fixed. Check the meta data file for spelling/casing/etc.

Screenshots_2024-01-09-22-14-29

@leonardo-dabepis
Copy link
Contributor Author

These .rsi need to be fixed. Check the meta data file for spelling/casing/etc.

Screenshots_2024-01-09-22-14-29

Ok I believe I fixed those. Still can't get the test environment to open on my end, but I'm not getting errors from those rsi files anymore.

@IamVelcroboy
Copy link
Member

Errors in the console?

@leonardo-dabepis
Copy link
Contributor Author

Errors in the console?

Entire console is errors 😭
image
image
image

@DangerRevolution
Copy link
Contributor

Errors in the console?

Entire console is errors 😭
image
image
image

CrimeAssist, The Crusher and the ConveyorBelt are all throwing these issues

@DangerRevolution
Copy link
Contributor

It won't save my comment but the other test error is about Lawyer.png, I think the file name needs to be capitalised? Hope this helps a little

@Adrian16199
Copy link
Contributor

Adrian16199 commented Jan 10, 2024

At first look, every single file looks fine, however I think lack of files could be the issue due to a new radio channel being mentioned in the headset for lawyers, I would put them for now in # as a note, on another though, if it were to be a full department then it probably should have a camera system on it aswell which would require you to add in:

devicenet_frequency.yml for cameras

encryption_keys.yml to even register a possibility of a key to have the radio channel

(Not sure if there is more but those 2 seem very important from what im seein, one regardin the radio channel and the other with cameras if there are any plans on that aswell, could be a separate PR just so this isnt 10k code)
I would work slowly so first I would make the thing with lawyer channel not exist by being a note so there is less worries.

@leonardo-dabepis
Copy link
Contributor Author

At first look, every single file looks fine, however I think lack of files could be the issue due to a new radio channel being mentioned in the headset for lawyers, I would put them for now in # as a note, on another though, if it were to be a full department then it probably should have a camera system on it aswell which would require you to add in:

devicenet_frequency.yml for cameras

encryption_keys.yml to even register a possibility of a key to have the radio channel

(Not sure if there is more but those 2 seem very important from what im seein, one regardin the radio channel and the other with cameras if there are any plans on that aswell, could be a separate PR just so this isnt 10k code) I would work slowly so first I would make the thing with lawyer channel not exist by being a note so there is less worries.

oh shit i forgot to add the radio channel

@leonardo-dabepis
Copy link
Contributor Author

I do not have the spoons to really dive into this at the moment, but I'm getting a slew of fatal errors (such as this one) when I try to run the server on my end. I am thinking it might be because my branch is out of date with master, but I'm not experienced enough to be certain and I don't want to accidentally break anything while trying to fix it.

image

@Timemaster99
Copy link
Contributor

I do not have the spoons to really dive into this at the moment, but I'm getting a slew of fatal errors (such as this one) when I try to run the server on my end. I am thinking it might be because my branch is out of date with master, but I'm not experienced enough to be certain and I don't want to accidentally break anything while trying to fix it.

image

Try running the RUN_THIS.py using cmd or powershell and then restarting visual studio.

@leonardo-dabepis
Copy link
Contributor Author

I do not have the spoons to really dive into this at the moment, but I'm getting a slew of fatal errors (such as this one) when I try to run the server on my end. I am thinking it might be because my branch is out of date with master, but I'm not experienced enough to be certain and I don't want to accidentally break anything while trying to fix it.
image

Try running the RUN_THIS.py using cmd or powershell and then restarting visual studio.

That didn't work

@Adrian16199
Copy link
Contributor

if you think its not up to date, just make this branch:

be ready for review

Update branch

Convert to draft

Pull the update into your github desktop.

Profit

@DebugOk
Copy link
Contributor

DebugOk commented Jan 12, 2024

if you think its not up to date, just make this branch:

be ready for review

Update branch

Convert to draft

Pull the update into your github desktop.

Profit

Or instead of spamming notifications into my inbox just go to your fork and use the update button after selecting your branch

@DebugOk DebugOk closed this Jan 12, 2024
@DebugOk DebugOk reopened this Jan 12, 2024
@DebugOk
Copy link
Contributor

DebugOk commented Jan 12, 2024

Me when the misinput

@leonardo-dabepis
Copy link
Contributor Author

if you think its not up to date, just make this branch:

be ready for review

Update branch

Convert to draft

Pull the update into your github desktop.

Profit

Or instead of spamming notifications into my inbox just go to your fork and use the update button after selecting your branch

Is it wrong of me to seek technical help on Github? Because I find I get more help here than on Discord. Especially since the question was directly related to Git.

@DebugOk
Copy link
Contributor

DebugOk commented Jan 12, 2024

if you think its not up to date, just make this branch:

be ready for review

Update branch

Convert to draft

Pull the update into your github desktop.

Profit

Or instead of spamming notifications into my inbox just go to your fork and use the update button after selecting your branch

Is it wrong of me to seek technical help on Github? Because I find I get more help here than on Discord. Especially since the question was directly related to Git.

No I'm talking about changing pull request status. Pull requests are here for this sorta stuff, but marking something as ready for review and back to draft every time you want to update stuff just sends me notifications

Copy link
Contributor

github-actions bot commented Jun 1, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Jun 1, 2024
@Timemaster99
Copy link
Contributor

Oh and there's a merge conflict that needs to be resolved

Resolved now. I appreciate you taking the time to check 200 files of changes 👍

NullWanderer
NullWanderer previously approved these changes Jun 5, 2024
Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

90% of admins who voted have voted in favor of the justice department. This PR will be merged when there are open PRs to add this to all of our maps

Any other lingering issues will likely be found through playtesting

@NullWanderer NullWanderer added Priority: 2-High Needs to be resolved as soon as possible Status: Requires This requires something else to be done before resolved and removed Status: Needs Discussion Must be discussed labels Jun 5, 2024
@NullWanderer
Copy link
Contributor

Oh I totally forgot in my review! Does this add any new access types?

@NullWanderer
Copy link
Contributor

Oh I totally forgot in my review! Does this add any new access types?

Ah right, it already adds everything in the places it needs to be. False alarm

@IamVelcroboy
Copy link
Member

file comments might be locked but
image

Signed-off-by: Timemaster99 <[email protected]>
@Timemaster99
Copy link
Contributor

file comments might be locked but image

Fixed

Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What could go wrong

@NullWanderer NullWanderer merged commit c82affb into DeltaV-Station:master Jun 7, 2024
13 checks passed
OldDanceJacket pushed a commit to Simple-Station/Einstein-Engines that referenced this pull request Aug 6, 2024
# 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 >:)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Priority: 2-High Needs to be resolved as soon as possible Status: Do Not Merge Don't merge this yet Status: Requires This requires something else to be done before resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.