From 0f344dad3e8ecf1861d4185e0caea17573dfe4db Mon Sep 17 00:00:00 2001 From: killer653 Date: Sun, 6 Aug 2017 19:10:50 -0400 Subject: [PATCH] Does some things --- code/modules/admin/admin.dm | 5 +++++ code/modules/mob/living/silicon/say.dm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 54865c72e4..8ac7f728b2 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -685,6 +685,11 @@ var/datum/announcement/minor/admin_min_announcer = new sender = sanitize(sender, 75, extra = 0) var/message = input("Message content (max 500):", "Contents", "This is a test of the announcement system.") as null|message + if(message) //They put a message + message = sanitize(message, 500, extra = 0) + a.autosay("[message]", "[sender]", "[channel == "Common" ? null : channel]") //Common is a weird case, as it's not a "channel", it's just talking into a radio without a channel set. + log_admin("Intercom: [key_name(usr)] : [sender]:[message]") + qdel(a) feedback_add_details("admin_verb","IN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/admins/proc/toggleooc() diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 5b359ff6bf..3545009c95 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -124,7 +124,7 @@ var/obj/effect/overlay/aiholo/hologram = T.masters[src] //VOREStation Add for people in the hologram to hear the messages if(hologram.bellied) hologram.bellied.show_message(rendered, 2) //VOREStation Add so holobellied people can hear - var/obj/effect/overlay/hologram = T.masters[src] + //var/obj/effect/overlay/hologram = T.masters[src] //VOREStation edit. Done above. var/list/in_range = get_mobs_and_objs_in_view_fast(get_turf(hologram), world.view, 2) //Emotes are displayed from the hologram, not the pad var/list/m_viewers = in_range["mobs"] var/list/o_viewers = in_range["objs"]