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.

Sign up for GitHub

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

Jump to bottom

Adds marine law charges for unlawful usage of listening devices. #6974

Merged
merged 2 commits into from
Aug 22, 2024
Merged

Adds marine law charges for unlawful usage of listening devices. #6974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18144d4
LD laws
realforest2001 Aug 18, 2024
115b195
Update code/modules/law/laws/major_crime.dm
realforest2001 Aug 18, 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
8 changes: 7 additions & 1 deletion code/modules/law/laws/major_crime.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@
desc = "Failure to perform one’s role to an acceptable standard. For example, a Commanding Officer failing to properly organize and ensure their personnel are given orders, failing to follow proper procedure in detriment of one’s duties, or ship crew leaving the ship without authorization from the Commanding Officer or their Department Head. Any officer who commits a crime may be charged with Neglect of Duty in addition to the appropriate crimes."
brig_time = 15

/datum/law/major_law/listening_bugs
name = "Unauthorized use of a Listening Device"
desc = "Using a listening device against SOP in a secure area such as the CIC. Use of listening devices tied to foreign governments or terror organisations is also considered subterfuge."
special_punishment = "Listening Device Confiscation"
brig_time = 15

/datum/law/major_law/subterfuge
name = "Subterfuge"
desc = "Carrying out objectives or being tied to material that describe planned actions that go against the USCM. Strong proof is required that the individual is working against USCM."
desc = "Carrying out objectives or being tied to material that describe planned actions that go against the USCM. Strong proof is required that the individual is working against USCM. Use of listening devices tied to foreign governments or terror organisations in secure areas is also considered subterfuge."
special_punishment = "Termination of ID/Discharge to planet"
brig_time = 15

Expand Down
6 changes: 6 additions & 0 deletions code/modules/law/laws/minor_crime.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
special_punishment = "Escort Out"
brig_time = 7.5

/datum/law/minor_law/listening_bugs
name = "Unauthorized use of a Listening Device"
desc = "Using a listening device against SOP in a public area such as the gym."
special_punishment = "Listening Device Confiscation"
brig_time = 7.5

/datum/law/minor_law/disrespect
name = "Disrespecting a Superior Officer"
desc = "Using offensive names or being directly disrespectful to someone of a Commissioned Officer of higher rank or position."
Expand Down
Loading