From 9d659ec0ed580f7b3eec6b1192c751d23dacf487 Mon Sep 17 00:00:00 2001 From: Little-119 Date: Wed, 31 Mar 2021 23:17:01 -0400 Subject: [PATCH 1/4] Don't tell the whole world who was playing synthetics --- code/controllers/subsystems/ticker.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index d499f03d4d6..54680b6506a 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -488,9 +488,9 @@ var/global/datum/controller/subsystem/ticker/ticker if (!robo.connected_ai) if (robo.stat != 2) - to_world("[robo.name] (Played by: [robo.key]) survived as an AI-less stationbound synthetic! Its laws were:") + to_world("[robo.name] survived as an AI-less stationbound synthetic! Its laws were:") else - to_world("[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") + to_world("[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") if(robo) //How the hell do we lose robo between here and the world messages directly above this? robo.laws.show_laws(world) From d575770f476075455a415c95b87ddf1954574011 Mon Sep 17 00:00:00 2001 From: Little-119 Date: Wed, 31 Mar 2021 23:19:35 -0400 Subject: [PATCH 2/4] Wait, forgot to add the vorestation edit tags --- code/controllers/subsystems/ticker.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 54680b6506a..c158b376bc5 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -488,9 +488,9 @@ var/global/datum/controller/subsystem/ticker/ticker if (!robo.connected_ai) if (robo.stat != 2) - to_world("[robo.name] survived as an AI-less stationbound synthetic! Its laws were:") + to_world("[robo.name] survived as an AI-less stationbound synthetic! Its laws were:") // VOREStation edit else - to_world("[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") + to_world("[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:") // VOREStation edit if(robo) //How the hell do we lose robo between here and the world messages directly above this? robo.laws.show_laws(world) From 1de6ada23a917e59ccd4742f8df97b5731d5e486 Mon Sep 17 00:00:00 2001 From: Little-119 Date: Thu, 1 Apr 2021 01:13:19 -0400 Subject: [PATCH 3/4] heck --- code/controllers/subsystems/ticker.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index c158b376bc5..6f7485003a8 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -462,15 +462,15 @@ var/global/datum/controller/subsystem/ticker/ticker for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) - to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:") + to_world("[aiPlayer.name]'s laws at the end of the round were:") // VOREStation edit else - to_world("[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:") + to_world("[aiPlayer.name]'s laws when it was deactivated were:") // VOREStation edit aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) var/robolist = "The AI's loyal minions were: " for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) - robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" + robolist += "[robo.name][robo.stat?" (Deactivated), ":", "]" to_world("[robolist]") var/dronecount = 0 From 256b1e62e4936244812e1cf79bf249be2764cf80 Mon Sep 17 00:00:00 2001 From: Little-119 Date: Thu, 1 Apr 2021 22:37:32 -0400 Subject: [PATCH 4/4] Heck, add missed edit tag --- code/controllers/subsystems/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 6f7485003a8..47f35a27a82 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -470,7 +470,7 @@ var/global/datum/controller/subsystem/ticker/ticker if (aiPlayer.connected_robots.len) var/robolist = "The AI's loyal minions were: " for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) - robolist += "[robo.name][robo.stat?" (Deactivated), ":", "]" + robolist += "[robo.name][robo.stat?" (Deactivated), ":", "]" // VOREStation edit to_world("[robolist]") var/dronecount = 0