Fixes comma issues in Magistrate Simulator (#32195)

* Adds securitysim.dm, haven't yet changed anything from the default recruiter.dm * Adds the relevant circuit board. * Stage 1 of rewriting the code * Renames securitysim.dmm to lawyersim.dmm to match the typepath * Updates the DME with the new machine * Reverting a change for testing purposes * Adds the arcade machine to boxstation with a placeholder sprite for prototype testing * Finished changing variable names preventing execution * Adds a UI for the arcade game * TGUI stuff * Just a test * Undoing testing * Annother test * Reverting test again * Removes emagging and changes some wording * Adds sprites * Changes the sprite in the .dm to the new sprite. * Adds random crime generation. * Fixes the screwed-up RNG stuff * Adds math and logic for sentencing calculation * Fixes temporary sentences * Adds in the "Manner of Arrest" text blurbs. * Missed a comma. * Minor grammar fixes * Corrects a couple issues in the tgui menu. * Updating branch to match main * Reverts boxstation, preparing for official mapping * Maps the arcade into every map * Adds missing stolls and spawns in arcade remodels * Making requested changes, part 1 * Prevents duplicate crimes * Cleans up leftover placeholders * Fixes apostrophe issues in TGUI * Adds prevention for same-code crimes * prettier maybe * prettier maybe now * bundle, fuck you tgui * SPACES SUCK * DIE, SPACES, DIE! * Fixes DIRT! DIRT OF ALL THINGS! WHY IS THAT A PROBLEM! * DIRT! AGAIN! * Adds variable documentation * Fixes comma issues in Magistrate Simulator * Formatting 1 Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com> Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> * Formatting 2 Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com> Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> * Formatting 3 Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com> Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> * Formatting 4 Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com> Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> * Formatting 5 Co-authored-by: Zephyr <116982774+Burzah@users.noreply.github.com> Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> --------- Signed-off-by: AurouraPlays <150855752+AurouraPlays@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2026-08-24 04:27:35 +01:00 · 2026-07-07 23:46:26 +00:00
parent 99310edc81
commit eee30d7046
1 changed files with 10 additions and 2 deletions
@@ -174,13 +174,13 @@
 		/// Collects the crimes being applied for this record
 		var/list/list_crimes = list()
 		for(i=1, i<=crime_count, i++)
-			if(i!=1)
-				crimes_committed = addtext(crimes_committed, ", ")
 			RandNum = rand(1, 10)
 			switch(RandNum)
 				if(1, 2, 3)
 					new_crime = pick(minor_crimes)
 					if(!(minor_crimes[new_crime] in list_crimes))
+						if(i != 1)
+							crimes_committed = addtext(crimes_committed, ", ")
 						crimes_committed = addtext(crimes_committed, new_crime)
 						list_crimes.Add(minor_crimes[new_crime])
 						if((running_total != "Execution") && (running_total != "Permanent Imprisonment"))
@@ -188,6 +188,8 @@
 				if(4, 5)
 					new_crime = pick(medium_crimes)
 					if(!(medium_crimes[new_crime] in list_crimes))
+						if(i != 1)
+							crimes_committed = addtext(crimes_committed, ", ")
 						crimes_committed = addtext(crimes_committed, new_crime)
 						list_crimes.Add(medium_crimes[new_crime])
 						if((running_total != "Execution") && (running_total != "Permanent Imprisonment"))
@@ -195,6 +197,8 @@
 				if(6, 7)
 					new_crime = pick(major_crimes)
 					if(!(major_crimes[new_crime] in list_crimes))
+						if(i != 1)
+							crimes_committed = addtext(crimes_committed, ", ")
 						crimes_committed = addtext(crimes_committed, new_crime)
 						list_crimes.Add(major_crimes[new_crime])
 						if((running_total != "Execution") && (running_total != "Permanent Imprisonment"))
@@ -202,6 +206,8 @@
 				if(8, 9)
 					new_crime = pick(exceptional_crimes)
 					if(!(exceptional_crimes[new_crime] in list_crimes))
+						if(i != 1)
+							crimes_committed = addtext(crimes_committed, ", ")
 						crimes_committed = addtext(crimes_committed, new_crime)
 						list_crimes.Add(exceptional_crimes[new_crime])
 						if(running_total != "Execution")
@@ -209,6 +215,8 @@
 				if(10)
 					new_crime = pick(capital_crimes)
 					if(!(capital_crimes[new_crime] in list_crimes))
+						if(i != 1)
+							crimes_committed = addtext(crimes_committed, ", ")
 						crimes_committed = addtext(crimes_committed, new_crime)
 						list_crimes.Add(capital_crimes[new_crime])
 						running_total = "Execution"