From 9ae4bbfdf8256449be4159b02c1da23037eb6dfe Mon Sep 17 00:00:00 2001 From: cib Date: Fri, 12 Oct 2012 15:56:41 -0700 Subject: [PATCH] Fixes the say_quote runtime. --- code/game/machinery/telecomms/broadcaster.dm | 1 + code/modules/mob/new_player/new_player.dm | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index ee411b7e785..3833e3f8048 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -366,6 +366,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- Filter the message; place it in quotes apply a verb --- + if(!M) return var/quotedmsg = M.say_quote(message) // --- This following recording is intended for research and feedback in the use of department radio channels --- diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 7233cc2d813..6c43e58b0b0 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -363,9 +363,13 @@ proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank) if (ticker.current_state == GAME_STATE_PLAYING) + var/mob/living/silicon/ai/announcer = new (null) var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI. - a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer") + announcer.name = "Arrivals Announcement Computer" + announcer.real_name = "Arrivals Announcement Computer" + a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", announcer) del(a) + del(announcer) proc/LateChoices() var/mills = world.time // 1/10 of a second, not real milliseconds but whatever