From 95b6959190a8197ca224164ed4e5edd2657f74ca Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 19 Jan 2018 09:49:59 -0500 Subject: [PATCH] Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship Removes teleport beacon from Free Golem Ship --- .../LavaRuins/lavaland_surface_golem_ship.dmm | 1 - code/modules/mining/equipment/wormhole_jaunter.dm | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index 3b4e4ce09e..bd1a996564 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -106,7 +106,6 @@ /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "s" = ( -/obj/machinery/bluespace_beacon, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "t" = ( diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 5915454ef8..3ff5a5f3e9 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -28,16 +28,6 @@ /obj/item/device/wormhole_jaunter/proc/get_destinations(mob/user) var/list/destinations = list() - if(isgolem(user)) - for(var/obj/item/device/radio/beacon/B in GLOB.teleportbeacons) - var/turf/T = get_turf(B) - if(istype(T.loc, /area/ruin/powered/golem_ship)) - destinations += B - - // In the event golem beacon is destroyed, send to station instead - if(destinations.len) - return destinations - for(var/obj/item/device/radio/beacon/B in GLOB.teleportbeacons) var/turf/T = get_turf(B) if(is_station_level(T.z))