From d5b618adace1e9ab699c2a3488dccbee100aee82 Mon Sep 17 00:00:00 2001 From: Daranz Date: Fri, 28 Aug 2015 17:33:52 +0200 Subject: [PATCH] Fix Say ":i" working with intercoms, re-add restraint check for Say ":i" See also commits: e9d9ff57ba74386cfc0560997ca7d3e8416c2b6e bbc8ad6383f7c37959a163e9aa0e81f9c7905a5d b9dbeeb3562e46dc2914bf039ad47035bc8b1112 --- code/modules/mob/living/carbon/human/say.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index bbf1844c45b..1fd82ed230f 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -165,10 +165,11 @@ /mob/living/carbon/human/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name) switch(message_mode) if("intercom") - for(var/obj/item/device/radio/intercom/I in view(1)) - I.talk_into(src, message, verb, speaking) - I.add_fingerprint(src) - used_radios += I + if(!src.restrained()) + for(var/obj/item/device/radio/intercom/I in view(1)) + I.talk_into(src, message, null, verb, speaking) + I.add_fingerprint(src) + used_radios += I if("headset") if(l_ear && istype(l_ear,/obj/item/device/radio)) var/obj/item/device/radio/R = l_ear