From 8ae93e261674097ed4253d65897975f6840a5198 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Thu, 27 Nov 2014 17:10:26 +0100 Subject: [PATCH] Radio fixes Intercoms no longer have to check wiring, they can simply use the listening/receiving flags. Can no longer enable reception/broadcasting if the relevant cables have been cut. --- code/game/objects/items/devices/radio/intercom.dm | 2 -- code/game/objects/items/devices/radio/radio.dm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 22976e9cb5..b28fe2cac1 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -32,8 +32,6 @@ /obj/item/device/radio/intercom/receive_range(freq, level) if (!on) return -1 - if (!(src.wires & WIRE_RECEIVE)) - return -1 if(!(0 in level)) var/turf/position = get_turf(src) if(isnull(position) || !(position.z in level)) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index f818f59ddc..dad292fd47 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -135,11 +135,11 @@ return else if (href_list["talk"]) - broadcasting = text2num(href_list["talk"]) + broadcasting = !(wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL)) && text2num(href_list["talk"]) else if (href_list["listen"]) var/chan_name = href_list["ch_name"] if (!chan_name) - listening = text2num(href_list["listen"]) + listening = !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL)) && text2num(href_list["listen"]) else if (channels[chan_name] & FREQ_LISTENING) channels[chan_name] &= ~FREQ_LISTENING