diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index ca45ac1ab8..f16745979c 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -285,6 +285,7 @@
var/list/ded = SSblackbox.first_death
if(ded.len)
parts += "[GLOB.TAB]First Death: [ded["name"]], [ded["role"]], at [ded["area"]]. Damage taken: [ded["damage"]].[ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""]"
+ //ignore this comment, it fixes the broken sytax parsing caused by the " above
else
parts += "[GLOB.TAB]Nobody died this shift!"
return parts.Join("
")
@@ -342,31 +343,37 @@
/datum/controller/subsystem/ticker/proc/law_report()
var/list/parts = list()
+ var/borg_spacer = FALSE //inserts an extra linebreak to seperate AIs from independent borgs, and then multiple independent borgs.
//Silicon laws report
for (var/i in GLOB.ai_list)
var/mob/living/silicon/ai/aiPlayer = i
if(aiPlayer.mind)
- parts += "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:"
+ parts += "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:"
parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE)
parts += "Total law changes: [aiPlayer.law_change_counter]"
if (aiPlayer.connected_robots.len)
- var/robolist = "[aiPlayer.real_name]'s minions were: "
+ var/borg_num = aiPlayer.connected_robots.len
+ var/robolist = "
[aiPlayer.real_name]'s minions were: "
for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
+ borg_num--
if(robo.mind)
- robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.mind.key]), ":" (Played by: [robo.mind.key]), "]"
+ robolist += "[robo.name] (Played by: [robo.mind.key])[robo.stat ? " (Deactivated)" : ""][borg_num ?", ":""]
"
parts += "[robolist]"
+ if(!borg_spacer)
+ borg_spacer = TRUE
for (var/mob/living/silicon/robot/robo in GLOB.silicon_mobs)
if (!robo.connected_ai && robo.mind)
- if (robo.stat != DEAD)
- parts += "[robo.name] (Played by: [robo.mind.key]) survived as an AI-less borg! Its laws were:"
- else
- parts += "[robo.name] (Played by: [robo.mind.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:"
+ parts += "[borg_spacer?"
":""][robo.name] (Played by: [robo.mind.key]) [(robo.stat != DEAD)? "survived as an AI-less borg!" : "was unable to survive the rigors of being a cyborg without an AI."] Its laws were:"
if(robo) //How the hell do we lose robo between here and the world messages directly above this?
parts += robo.laws.get_law_list(include_zeroth=TRUE)
+
+ if(!borg_spacer)
+ borg_spacer = TRUE
+
if(parts.len)
return "