Merge pull request #21320 from Mervill/master

Late joining won't runtime if the emergency shuttle does not exist (dev QoL)
This commit is contained in:
oranges
2016-11-03 10:00:17 +13:00
committed by GitHub
2 changed files with 19 additions and 11 deletions
+6
View File
@@ -66,6 +66,9 @@ var/datum/subsystem/shuttle/SSshuttle
#endif
/datum/subsystem/shuttle/proc/setup_transit_zone()
if(transit_markers.len == 0)
WARNING("No /obj/effect/landmark/transit placed on the map!")
return
// transit zone
var/turf/A = get_turf(transit_markers[1])
var/turf/B = get_turf(transit_markers[2])
@@ -77,6 +80,9 @@ var/datum/subsystem/shuttle/SSshuttle
#ifdef HIGHLIGHT_DYNAMIC_TRANSIT
/datum/subsystem/shuttle/proc/color_space()
if(transit_markers.len == 0)
WARNING("No /obj/effect/landmark/transit placed on the map!")
return
var/turf/A = get_turf(transit_markers[1])
var/turf/B = get_turf(transit_markers[2])
for(var/i in block(A, B))