From 3d9d05afce25920e09303b45798c90066b2cb40b Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Thu, 19 Mar 2015 21:33:58 +0100 Subject: [PATCH] Fixes #8107. The announcer again has its given name, rather than a randomly selected one. The announcer now states its business, rather than talks about it. The announcer now uses the proper frequency. --- code/game/gamemodes/malfunction/malfunction.dm | 2 +- code/game/objects/items/devices/radio/radio.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 2ea49b24e4..fe76f5752b 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -198,7 +198,7 @@ var/obj/item/device/radio/R = new (src) var/AN = "Self-Destruct System" - R.autosay("Caution. Self-Destruct sequence has been actived. Self-destructing in Ten..", AN) + R.autosay("Caution. Self-Destruct sequence has been activated. Self-destructing in Ten..", AN) for (var/i=9 to 1 step -1) sleep(10) var/msg = "" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 93ce1d9eab..d6b254cad1 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -167,10 +167,11 @@ return var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1) + A.SetName(from) Broadcast_Message(connection, A, 0, "*garbled automated announcement*", src, message, from, "Automated Announcement", from, "synthesized voice", - 4, 0, list(1), PUB_FREQ) + 4, 0, list(0), connection.frequency, "states") del(A) return