From f1c0c1d20dea0119e454d360bc1866bfcab29833 Mon Sep 17 00:00:00 2001
From: Erki <skull132@users.noreply.github.com>
Date: Mon, 27 Apr 2020 23:38:58 +0300
Subject: [PATCH] Removes fines for medium crimes (#8732)

* no more money for life

* log da change
---
 code/game/machinery/computer/sentencing.dm | 71 ++--------------------
 code/modules/law/laws/high_severity.dm     |  4 +-
 code/modules/law/laws/med_severity.dm      |  6 +-
 html/changelogs/skull132_crimes.yml        |  5 ++
 4 files changed, 16 insertions(+), 70 deletions(-)
 create mode 100644 html/changelogs/skull132_crimes.yml

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 @@
 	. += "<hr>"
 	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")
 
 	. += "<br><hr>"
 	. += "<center><a href='?src=\ref[src];button=change_menu;choice=incident_report'>Return</a></center>"
@@ -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
 	. += "<table class='border'>"
 	. += "<tr>"
-	. += "<th colspan='5'>Misdemeanors</th>"
+	. += "<th colspan='5'>[header]</th>"
 	. += "</tr>"
 
 	. += "<tr>"
@@ -363,7 +362,7 @@
 	. += "<th>Button</th>"
 	. += "</tr>"
 
-	for( var/datum/law/L in SSlaw.low_severity )
+	for(var/datum/law/L in laws)
 		. += "<tr>"
 		. += "<td><b>[L.name]</b></td>"
 		. += "<td><i>[L.desc]</i></td>"
@@ -376,64 +375,6 @@
 
 	return .
 
-/obj/machinery/computer/sentencing/proc/med_severity()
-	. = ""
-
-	// Med severity
-	. += "<table class='border'>"
-	. += "<tr>"
-	. += "<th colspan='5'>Indictable Offences</th>"
-	. += "</tr>"
-
-	. += "<tr>"
-	. += "<th>Name</th>"
-	. += "<th>Description</th>"
-	. += "<th>Brig Sentence</th>"
-	. += "<th>Fine</th>"
-	. += "<th>Button</th>"
-	. += "</tr>"
-
-	for( var/datum/law/L in SSlaw.med_severity )
-		. += "<tr>"
-		. += "<td><b>[L.name]</b></td>"
-		. += "<td><i>[L.desc]</i></td>"
-		. += "<td>[L.get_brig_time_string()]</td>"
-		. += "<td>[L.get_fine_string()]</td>"
-		. += "<td><a href='?src=\ref[src];button=add_charge;law=\ref[L]'>Charge</a></td>"
-		. += "</tr>"
-
-	. += "</table>"
-
-	return .
-
-/obj/machinery/computer/sentencing/proc/high_severity()
-	. = ""
-
-	// High severity
-	. += "<table class='border'>"
-	. += "<tr>"
-	. += "<th colspan='5'>Capital Offences</th>"
-	. += "</tr>"
-
-	. += "<tr>"
-	. += "<th>Name</th>"
-	. += "<th>Description</th>"
-	. += "<th>Brig Sentence</th>"
-	. += "<th>Button</th>"
-	. += "</tr>"
-
-	for( var/datum/law/L in SSlaw.high_severity )
-		. += "<tr>"
-		. += "<td><b>[L.name]</b></td>"
-		. += "<td><i>[L.desc]</i></td>"
-		. += "<td>[L.get_brig_time_string()]</td>"
-		. += "<td><a href='?src=\ref[src];button=add_charge;law=\ref[L]'>Charge</a></td>"
-		. += "</tr>"
-
-	. += "</table>"
-
-	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."