From 1804e1865513dde8072d6f7c7b90e691b753820f Mon Sep 17 00:00:00 2001 From: Ron Date: Sat, 27 May 2017 05:43:22 -0400 Subject: [PATCH] Fixes hear_say (#2465) Prevents hear_say from runtiming if speaker is null. --- code/modules/mob/hear_say.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index c88aa5841f2..94ad549aeca 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -114,7 +114,11 @@ if(hard_to_hear) message = stars(message) - var/speaker_name = speaker.name + var/speaker_name + if(speaker != null) + speaker_name = speaker.name + else + speaker_name = "unknown" if(vname) speaker_name = vname @@ -178,8 +182,9 @@ track = "[speaker_name] ([jobname])" if(istype(src, /mob/dead/observer)) - if(speaker_name != speaker.real_name && !isAI(speaker)) //Announce computer and various stuff that broadcasts doesn't use it's real name but AI's can't pretend to be other mobs. - speaker_name = "[speaker.real_name] ([speaker_name])" + if(speaker != null) + if(speaker_name != speaker.real_name && !isAI(speaker)) //Announce computer and various stuff that broadcasts doesn't use it's real name but AI's can't pretend to be other mobs. + speaker_name = "[speaker.real_name] ([speaker_name])" track = "[speaker_name] ([ghost_follow_link(speaker, src)])" var/formatted