cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 02:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3345 from Neerti/4/20/2017_radio_fix

Browse Source 
Radios now work again in-hand or in pocket
This commit is contained in:
Anewbe
2017-04-22 09:35:09 -05:00
committed by GitHub
parent cc3092859a 80a3865acf
commit 1b2b63baf0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/items/devices/radio/radio.dm
View File

@@ -65,10 +65,12 @@ var/global/list/default_medbay_channels = list(
..() ..()
wires = new(src) wires = new(src)
internal_channels = default_internal_channels.Copy() internal_channels = default_internal_channels.Copy()
listening_objects += src
/obj/item/device/radio/Destroy() /obj/item/device/radio/Destroy()
qdel(wires) qdel(wires)
wires = null wires = null
listening_objects -= src
if(radio_controller) if(radio_controller)
radio_controller.remove_object(src, frequency) radio_controller.remove_object(src, frequency)
for (var/ch_name in channels) for (var/ch_name in channels)
@@ -474,7 +476,6 @@ var/global/list/default_medbay_channels = list(
/obj/item/device/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null) /obj/item/device/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null)
if (broadcasting) if (broadcasting)
if(get_dist(src, M) <= canhear_range) if(get_dist(src, M) <= canhear_range)
talk_into(M, msg,null,verb,speaking) talk_into(M, msg,null,verb,speaking)