From 6ff1e429fabdd766c0f44f9cdb567e02ea9c6f79 Mon Sep 17 00:00:00 2001 From: Miauw Date: Sat, 13 Sep 2014 13:50:20 +0200 Subject: [PATCH] Fixes ghosts not being able to hear binary. --- code/modules/mob/living/say.dm | 2 +- code/modules/mob/living/silicon/say.dm | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 2cc11095602..0c7c99f3fdb 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -71,7 +71,7 @@ var/list/department_radio_keys = list( ":ï" = "changeling", "#ï" = "changeling", ".ï" = "changeling" ) -/mob/living/proc/binarycheck() +/mob/proc/binarycheck() return 0 /mob/living/say(message, bubble_type) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 574a739793d..662c92dabd1 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -9,14 +9,13 @@ desig = trim_left(S.designation + " " + S.job) var/message_a = say_quote(message) var/rendered = "Robotic Talk, [name] [message_a]" - - for (var/mob/living/S in living_mob_list) - if(S.binarycheck() || S.stat == DEAD) - if(istype(S , /mob/living/silicon/ai)) - var/renderedAI = "Robotic Talk, [name] ([desig]) [message_a]" - S << renderedAI + for(var/mob/M in player_list) + if(M.binarycheck() || (M.stat == DEAD && (M.client.prefs.toggles & CHAT_GHOSTEARS) && !istype(M, /mob/new_player))) + if(istype(M, /mob/living/silicon/ai)) + var/renderedAI = "Robotic Talk, [name] ([desig]) [message_a]" + M << renderedAI else - S << rendered + M << rendered /mob/living/silicon/binarycheck() return 1