From d47a39a05af9176b649c14993393c2753bd39f2d Mon Sep 17 00:00:00 2001 From: SirBloodBuske Date: Sat, 2 May 2015 16:14:36 -0700 Subject: [PATCH] Fixing Intercom changes from VG Code to Paradise --- code/game/objects/items/devices/radio/intercom.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 1c12213010c..a76d8c1cdeb 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -5,6 +5,7 @@ anchored = 1 w_class = 4.0 canhear_range = 2 + flags = CONDUCT | NOBLOODY var/number = 0 var/anyai = 1 var/circuitry_installed=1 @@ -56,15 +57,15 @@ return -1 if (!src.listening) return -1 - if(freq == SYND_FREQ) + if(freq in ANTAG_FREQS) if(!(src.syndie)) return -1//Prevents broadcast of messages over devices lacking the encryption return canhear_range -/obj/item/device/radio/intercom/hear_talk(message, atom/movable/speaker, message_langs, raw_message, radio_freq) - if(!src.anyai && !(speaker in src.ai)) +/obj/item/device/radio/intercom/hear_talk(mob/M as mob, msg) + if(!src.anyai && !(M in src.ai)) return ..()