diff --git a/code/game/machinery/computer/sentencing.dm b/code/game/machinery/computer/sentencing.dm
index 4827260df48..3be87ad6423 100644
--- a/code/game/machinery/computer/sentencing.dm
+++ b/code/game/machinery/computer/sentencing.dm
@@ -310,11 +310,11 @@
. += "
"
switch( menu_screen )
if( "low_severity" )
- . += low_severity()
+ . += get_law_table(SSlaw.low_severity, header="Misdemeanors")
if( "med_severity" )
- . += med_severity()
+ . += get_law_table(SSlaw.med_severity, header="Indictable Offences")
if( "high_severity" )
- . += high_severity()
+ . += get_law_table(SSlaw.high_severity, header="Capital Offences")
. += "
"
. += "Return"
@@ -346,13 +346,12 @@
return .
-/obj/machinery/computer/sentencing/proc/low_severity()
+/obj/machinery/computer/sentencing/proc/get_law_table(list/laws, header = "Misdemeanors")
. = ""
- // Low severity
. += ""
. += ""
- . += "| Misdemeanors | "
+ . += "[header] | "
. += "
"
. += ""
@@ -363,7 +362,7 @@
. += "| Button | "
. += "
"
- for( var/datum/law/L in SSlaw.low_severity )
+ for(var/datum/law/L in laws)
. += ""
. += "| [L.name] | "
. += "[L.desc] | "
@@ -376,64 +375,6 @@
return .
-/obj/machinery/computer/sentencing/proc/med_severity()
- . = ""
-
- // Med severity
- . += ""
- . += ""
- . += "| Indictable Offences | "
- . += "
"
-
- . += ""
- . += "| Name | "
- . += "Description | "
- . += "Brig Sentence | "
- . += "Fine | "
- . += "Button | "
- . += "
"
-
- for( var/datum/law/L in SSlaw.med_severity )
- . += ""
- . += "| [L.name] | "
- . += "[L.desc] | "
- . += "[L.get_brig_time_string()] | "
- . += "[L.get_fine_string()] | "
- . += "Charge | "
- . += "
"
-
- . += "
"
-
- return .
-
-/obj/machinery/computer/sentencing/proc/high_severity()
- . = ""
-
- // High severity
- . += ""
- . += ""
- . += "| Capital Offences | "
- . += "
"
-
- . += ""
- . += "| Name | "
- . += "Description | "
- . += "Brig Sentence | "
- . += "Button | "
- . += "
"
-
- for( var/datum/law/L in SSlaw.high_severity )
- . += ""
- . += "| [L.name] | "
- . += "[L.desc] | "
- . += "[L.get_brig_time_string()] | "
- . += "Charge | "
- . += "
"
-
- . += "
"
-
- return .
-
/obj/machinery/computer/sentencing/proc/render_innocent( var/mob/user )
var/obj/item/card/id/card = incident.card.resolve()
ping( "\The [src] pings, \"[card] has been found innocent of the accused crimes!\"" )
diff --git a/code/modules/law/laws/high_severity.dm b/code/modules/law/laws/high_severity.dm
index 8599e46c98d..dc5422728d2 100644
--- a/code/modules/law/laws/high_severity.dm
+++ b/code/modules/law/laws/high_severity.dm
@@ -2,8 +2,8 @@
severity = 3
felony = 1
- min_fine = 1000
- max_fine = 3000
+ min_fine = 0
+ max_fine = 0
/datum/law/high_severity/murder
name = "i301 - Murder"
diff --git a/code/modules/law/laws/med_severity.dm b/code/modules/law/laws/med_severity.dm
index d1c27cae0cb..a534685f51d 100644
--- a/code/modules/law/laws/med_severity.dm
+++ b/code/modules/law/laws/med_severity.dm
@@ -2,8 +2,8 @@
severity = 2
felony = 1
- min_fine = 100
- max_fine = 1000
+ min_fine = 0
+ max_fine = 0
/datum/law/med_severity/srs_failure_execute
name = "i201 - Failure to Execute an Order with Serious Consequences"
@@ -187,4 +187,4 @@
id = "i223"
min_brig_time = 15
- max_brig_time = 25
\ No newline at end of file
+ max_brig_time = 25
diff --git a/html/changelogs/skull132_crimes.yml b/html/changelogs/skull132_crimes.yml
new file mode 100644
index 00000000000..8d676dce40a
--- /dev/null
+++ b/html/changelogs/skull132_crimes.yml
@@ -0,0 +1,5 @@
+author: Skull132
+delete-after: True
+
+changes:
+ - tweak: "Medium severity crimes can no longer be fined for."