cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-16 17:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7156 from PsiOmegaDelta/RadioFix

Browse Source 
Radio fixes
This commit is contained in:
Chinsky
2014-11-30 00:56:53 +03:00
parent 079b35c158 8ae93e2616
commit 8cdd094e1b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/intercom.dm
-2
View File
@@ -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))
code/game/objects/items/devices/radio/radio.dm
+2 -2
View File
@@ -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