From e60bef91bde0dce619c9a1de523b08778f54462c Mon Sep 17 00:00:00 2001 From: Chinsky Date: Mon, 11 Mar 2013 00:27:18 +0400 Subject: [PATCH] Added indication for when someone speaks into radio. --- code/modules/mob/living/say.dm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 425c730ba8..bbd1476415 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -179,12 +179,14 @@ var/list/department_radio_keys = list( var/is_speaking_skrell = 0 var/is_speaking_soghun = 0 var/is_speaking_taj = 0 + var/is_speaking_radio = 0 switch (message_mode) if ("headset") if (src:ears) src:ears.talk_into(src, message) used_radios += src:ears + is_speaking_radio = 1 message_range = 1 italics = 1 @@ -194,6 +196,7 @@ var/list/department_radio_keys = list( if (src:ears) src:ears.talk_into(src, message, 1) used_radios += src:ears + is_speaking_radio = 1 message_range = 1 italics = 1 @@ -202,6 +205,7 @@ var/list/department_radio_keys = list( if (r_hand) r_hand.talk_into(src, message) used_radios += src:r_hand + is_speaking_radio = 1 message_range = 1 italics = 1 @@ -210,6 +214,7 @@ var/list/department_radio_keys = list( if (l_hand) l_hand.talk_into(src, message) used_radios += src:l_hand + is_speaking_radio = 1 message_range = 1 italics = 1 @@ -218,6 +223,7 @@ var/list/department_radio_keys = list( for (var/obj/item/device/radio/intercom/I in view(1, null)) I.talk_into(src, message) used_radios += I + is_speaking_radio = 1 message_range = 1 italics = 1 @@ -244,6 +250,7 @@ var/list/department_radio_keys = list( if (src:ears) src:ears.talk_into(src, message, message_mode) used_radios += src:ears + is_speaking_radio = 1 else if(istype(src, /mob/living/silicon/robot)) if (src:radio) src:radio.talk_into(src, message, message_mode) @@ -375,6 +382,10 @@ var/list/department_radio_keys = list( var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]") spawn(30) del(speech_bubble) + for(var/mob/M in hearers(5, src)) + if(M != src && is_speaking_radio) + M:show_message("[src] talks into [used_radios.len ? used_radios[1] : "radio"]") + var/rendered = null if (length(heard_a)) var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj) @@ -383,7 +394,6 @@ var/list/department_radio_keys = list( message_a = "[message_a]" rendered = "[GetVoice()][alt_name] [message_a]" - for (var/M in heard_a) if(hascall(M,"show_message")) var/deaf_message = ""