From 285a1dd89e92cf50de3dba37e225fa9ddc73f3d5 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Sun, 24 Mar 2013 02:20:57 +0400 Subject: [PATCH] Arrivals announcement computer strikes back! phew, took me long to get rid of it --- code/game/objects/items/devices/radio/radio.dm | 7 +++++-- code/modules/mob/new_player/new_player.dm | 9 ++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 3b5da8c3a1d..edd134e5095 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -210,10 +210,13 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use if (!connection) return - Broadcast_Message(connection, new /mob/living/silicon/ai(src,null,null,1), + var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1) + //world << "src: [src], message: [message], from: [from], AI: [A] \icon[A]" //DEBUG + Broadcast_Message(connection, A, 0, "*garbled automated announcement*", src, message, from, "Automated Announcement", from, "synthesized voice", - 4, 0, 1) + 4, 0, list(1), 1459) + del(A) return /obj/item/device/radio/talk_into(mob/living/M as mob, message, channel) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d5b5dfeae87..5b07dbf7bee 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -291,13 +291,8 @@ proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank) if (ticker.current_state == GAME_STATE_PLAYING) var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)// BS12 EDIT Arrivals Announcement Computer, rather than the AI. - - //unlikely for this to be an issue, but just in case - if(istype(character.wear_id, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/I = character.wear_id - a.autosay("\"[character.real_name],[I.assignment ? " [I.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer") - else - a.autosay("\"[character.real_name], visitor, has arrived on the station.\"", "Arrivals Announcement Computer") + world << "autosay parameters: name:[character.real_name], rank: [rank]" + a.autosay("[character.real_name],[rank ? " [rank]," : " visitor," ] has arrived on the station.", "Arrivals Announcement Computer") del(a) proc/LateChoices()