cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-17 02:47:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates security processing console (#10582)

Browse Source
This commit is contained in:
Aboshedab
2020-11-19 17:44:46 +04:00
committed by GitHub
parent 3f4e28cd6f
commit 337a39a88e
4 changed files with 95 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/law/laws/high_severity.dm
+11 -3
View File
@@ -61,15 +61,15 @@
min_brig_time = 90
max_brig_time = 90
/datum/law/high_severity/terrorist_collab
name = "i308 - Terrorist Collaboration"
/datum/law/high_severity/corporate_espionage
name = "i308 - Corporate Espionage"
desc = "To act as an agent of a terrorist or anti-Corporation group."
id = "i308"
min_brig_time = 90
max_brig_time = 90
/datum/law/high_severity/sexy_assault
/datum/law/high_severity/sexual_assault
name = "i309 - Sexual Assault"
desc = "To assault, or attempt to assault, someone else sexually, including rape."
id = "i309"
@@ -84,3 +84,11 @@
min_brig_time = 20
max_brig_time = 90
/datum/law/high_severity/fytocide
name = "i311 - Fytocide"
desc = "To willfully, unlawfully and permanently terminate 2/3 or more nymphs contained within a gestalt."
id = "i311"
min_brig_time = 20
max_brig_time = 90
code/modules/law/laws/low_severity.dm
+39 -39
View File
@@ -9,8 +9,8 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 50
max_fine = 250
min_fine = 200
max_fine = 300
/datum/law/low_severity/petty_theft
name = "i102 - Petty Theft"
@@ -20,19 +20,19 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 50
max_fine = 200
min_fine = 150
max_fine = 225
/datum/law/low_severity/minor_assault
name = "i103 - Minor Assault"
desc = "To use, or threaten, physical force against someone, without intent to kill or seriously injure."
desc = "To use, or threaten, physical force against someone, without intent to kill or seriously injure. To cause easily repairable damage to a free IPC chassis, up to and including the removal of limbs."
id = "i103"
min_brig_time = 4
max_brig_time = 10
min_fine = 50
max_fine = 450
min_fine = 400
max_fine = 800
/datum/law/low_severity/battery
name = "i104 - Battery"
@@ -42,8 +42,8 @@
min_brig_time = 2
max_brig_time = 8
min_fine = 50
max_fine = 250
min_fine = 200
max_fine = 400
/datum/law/low_severity/hooliganism
name = "i105 - Hooliganism"
@@ -53,8 +53,8 @@
min_brig_time = 5
max_brig_time = 8
min_fine = 50
max_fine = 300
min_fine = 250
max_fine = 375
/datum/law/low_severity/radio_misuse
name = "i107 - Misuse of Public Radio Channels"
@@ -62,10 +62,10 @@
id = "i107"
min_brig_time = 3
max_brig_time = 10
max_brig_time = 3
min_fine = 50
max_fine = 300
min_fine = 150
max_fine = 225
/datum/law/low_severity/violating_injunction
name = "i108 - Violation of Injunction"
@@ -75,8 +75,8 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 0
max_fine = 200
min_fine = 500
max_fine = 750
/datum/law/low_severity/slander_hos
name = "i109 - Slandering a Head of Staff"
@@ -86,19 +86,19 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 50
max_fine = 300
min_fine = 250
max_fine = 375
/datum/law/low_severity/slander
name = "i110 - Slander"
desc = "To spread false rumors in order to damage someone's reputation."
name = "i110 - Slander or Verbal Abuse"
desc = "To spread false rumors in order to damage someone's reputation, or to use racially offensive language."
id = "i110"
min_brig_time = 3
max_brig_time = 5
min_fine = 50
max_fine = 300
min_fine = 150
max_fine = 250
/datum/law/low_severity/failure_execute
name = "i111 - Failure to Execute an Order"
@@ -108,8 +108,8 @@
min_brig_time = 5
max_brig_time = 15
min_fine = 50
max_fine = 550
min_fine = 500
max_fine = 750
/datum/law/low_severity/sexual_harassment
name = "i112 - Sexual Harassment"
@@ -120,7 +120,7 @@
max_brig_time = 15
min_fine = 0
max_fine = 200
max_fine = 0
/datum/law/low_severity/animal_cruelty
name = "i113 - Animal Cruelty"
@@ -131,18 +131,18 @@
max_brig_time = 10
min_fine = 0
max_fine = 200
max_fine = 0
/datum/law/low_severity/vandalism
name = "i114 - Vandalism"
desc = " To deliberately damage or deface the station without malicious intent."
desc = "To deliberately damage or deface the station without malicious intent. To cause easily repairable damage to an owned IPC, up to and including disabling the chassis."
id = "i114"
min_brig_time = 3
max_brig_time = 10
min_fine = 50
max_fine = 500
min_fine = 450
max_fine = 675
/datum/law/low_severity/threat_murder
name = "i115 - Threat of Murder or Serious Injury"
@@ -152,8 +152,8 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 50
max_fine = 550
min_fine = 500
max_fine = 750
/datum/law/low_severity/necrophilia
name = "i116 - Disrespect to the Dead"
@@ -163,8 +163,8 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 50
max_fine = 450
min_fine = 400
max_fine = 600
/datum/law/low_severity/excessive_detainment
name = "i117 - Excessive Use of Force in Detainment"
@@ -174,8 +174,8 @@
min_brig_time = 5
max_brig_time = 10
min_fine = 50
max_fine = 400
min_fine = 350
max_fine = 700
/datum/law/low_severity/violation_privacy
name = "i118 - Violation of Privacy Laws"
@@ -185,8 +185,8 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 50
max_fine = 550
min_fine = 500
max_fine = 750
/datum/law/low_severity/illegal_search
name = "i119 - Illegal Search"
@@ -196,5 +196,5 @@
min_brig_time = 3
max_brig_time = 10
min_fine = 50
max_fine = 550
min_fine = 500
max_fine = 750
code/modules/law/laws/med_severity.dm
+3 -3
View File
@@ -63,7 +63,7 @@
/datum/law/med_severity/assault
name = "i208 - Assault"
desc = "To cause severe injury to another employee. "
desc = "To cause severe injury to another employee. To cause irreparable damage to the chassis of a free IPC."
id = "i208"
min_brig_time = 15
@@ -103,7 +103,7 @@
/datum/law/med_severity/sabotage
name = "i213 - Sabotage"
desc = "To hinder the efforts of the crew or station with malicious intent."
desc = "To hinder the efforts of the crew or station with malicious intent. To cause irreparable damage to the chassis or positronic brain of an owned IPC."
id = "i213"
min_brig_time = 15
@@ -119,7 +119,7 @@
/datum/law/med_severity/grand_theft
name = "i215 - Grand Theft"
desc = "To steal items that are dangerous, of a high value, or a sensitive nature."
desc = "To steal items that are dangerous, of a high value, or a sensitive nature. Applicable to the theft of an owned IPC."
id = "i215"
min_brig_time = 15
html/changelogs/Aboshehab - regulationChanges.yml
+42
View File
@@ -0,0 +1,42 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Aboshehab
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "Added missing regulations from the wiki to processing console."
- tweak: "Update and adjust descriptions, names, credit fines and time to match the wiki for the processing console."