Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070

[MIRROR] Beacons are no longer radios
This commit is contained in:
deathride58
2018-03-09 18:41:05 +00:00
committed by GitHub
24 changed files with 132 additions and 133 deletions
@@ -31,7 +31,7 @@
/obj/effect/nettingportal/Initialize()
. = ..()
var/obj/item/device/radio/beacon/teletarget = null
var/obj/item/device/beacon/teletarget = null
for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
if(com.target)
if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)