diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 8e0853d5014..138e15d72a1 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -162,14 +162,14 @@ var/obj/item/device/radio/R = null if(isradio(l_ear)) R = l_ear + used_radios += R if(R.talk_into(src, message, null, verb, speaking)) - used_radios += R return if(isradio(r_ear)) R = r_ear + used_radios += R if(R.talk_into(src, message, null, verb, speaking)) - used_radios += R return if("right ear") @@ -179,8 +179,8 @@ else if(isradio(r_hand)) R = r_hand if(R) - if(R.talk_into(src,message,null,verb,speaking)) - used_radios += R + used_radios += R + R.talk_into(src, message, null, verb, speaking) if("left ear") var/obj/item/device/radio/R @@ -189,8 +189,8 @@ else if(isradio(l_hand)) R = l_hand if(R) - if(R.talk_into(src, message, null, verb, speaking)) - used_radios += R + used_radios += R + R.talk_into(src, message, null, verb, speaking) if("whisper") whisper_say(message, speaking, alt_name) @@ -198,13 +198,13 @@ else if(message_mode) if(isradio(l_ear)) + used_radios += l_ear if(l_ear.talk_into(src, message, message_mode, verb, speaking)) - used_radios += l_ear return if(isradio(r_ear)) + used_radios += r_ear if(r_ear.talk_into(src, message, message_mode, verb, speaking)) - used_radios += r_ear return /mob/living/carbon/human/handle_speech_sound() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 0fa68d33cd0..dbcefec7365 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -169,7 +169,7 @@ proc/get_radio_key_from_channel(var/channel) if(!message || message == "") return 0 - var/list/used_radios = new + var/list/used_radios = list() if(handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)) return 1