From 29dd4c6384898e75e05e7a778aedfb7fdbfc223c Mon Sep 17 00:00:00 2001 From: uomo <51800976+uomo91@users.noreply.github.com> Date: Sat, 30 Jan 2021 23:41:31 -0600 Subject: [PATCH] The roundend screen will now not show ckeys. (#2952) * yeehaw * Formatting I guess. --- code/__HELPERS/roundend.dm | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index e14acff154d..fd17823a5d1 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -458,7 +458,10 @@ 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:" + //SKYRAT EDIT CHANGE BEGIN - ROUNDEND + //parts += "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:" - SKYRAT EDIT - ORIGINAL + parts += "[aiPlayer.name]'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:" + //SKYRAT EDIT CHANGE END parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE) parts += "Total law changes: [aiPlayer.law_change_counter]" @@ -469,13 +472,19 @@ for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) borg_num-- if(robo.mind) - parts += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]" + //SKYRAT EDIT CHANGE BEGIN - ROUNDEND + //parts += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]" - SKYRAT EDIT - ORIGINAL + parts += "[robo.name] [robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]" + //SKYRAT EDIT CHANGE END if(!borg_spacer) borg_spacer = TRUE for (var/mob/living/silicon/robot/robo in GLOB.silicon_mobs) if (!robo.connected_ai && robo.mind) - 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:" + //SKYRAT EDIT CHANGE BEGIN - ROUNDEND + //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:" - SKYRAT EDIT - ORIGINAL + parts += "[borg_spacer?"
":""][robo.name] [(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:" + //SKYRAT EDIT CHANGE END 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) @@ -656,7 +665,10 @@ var/jobtext = "" if(ply.assigned_role) jobtext = " the [ply.assigned_role]" - var/text = "[ply.key] was [ply.name][jobtext] and" + //SKYRAT EDIT CHANGE BEGIN - ROUNDEND + //var/text = "[ply.key] was [ply.name][jobtext] and" - SKYRAT EDIT - ORIGINAL + var/text = "[ply.name][jobtext]" + //SKYRAT EDIT CHANGE END if(ply.current) if(ply.current.stat == DEAD) text += " died"