From f5238fee8de8981f89f7ae405a7254db2acd7914 Mon Sep 17 00:00:00 2001 From: eswordthecat Date: Fri, 3 Apr 2015 14:23:05 +0800 Subject: [PATCH] remove remove --- code/game/say.dm | 2 +- code/modules/mob/dead/observer/say.dm | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/game/say.dm b/code/game/say.dm index d5cfa2f3d47..ece5f21d916 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -157,7 +157,7 @@ var/list/freqtoname = list( return /atom/movable/proc/GetSource() - return + return src /atom/movable/proc/GetRadio() diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 231e79ac2aa..18db5761c28 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -30,19 +30,19 @@ if (isnull(client)) return - if (isnull(radio_freq)) - if (!(client.prefs.toggles & CHAT_GHOSTEARS)) - return + var/source = speaker.GetSource() + + var/source_turf = get_turf(source) + + if (get_dist(source_turf, src) <= world.view) // If this isn't true, we can't be in view, so no need for costlier proc. + if (source_turf in view(src)) + message = "[message]" else - if (!(client.prefs.toggles & CHAT_GHOSTRADIO)) - return + if (isnull(radio_freq)) + if (!(client.prefs.toggles & CHAT_GHOSTEARS)) + return else - speaker = speaker.GetSource() + if (!(client.prefs.toggles & CHAT_GHOSTRADIO)) + return - var/turf/T = get_turf(speaker) - - if (get_dist(T, src) <= world.view) // If this isn't true, we can't be in view, so no need for costlier proc. - if (T in view(src)) - message = "[message]" - - src << "(Follow) [message]" + src << "(Follow) [message]"