Fixes whiteship escape (#28734)

This commit is contained in:
AnturK
2017-06-24 18:48:39 +02:00
committed by KorPhaeron
parent 63716b792d
commit 1d4820d9cc
3 changed files with 13 additions and 4 deletions

View File

@@ -27,6 +27,7 @@
#define UNLAUNCHED 0
#define ENDGAME_LAUNCHED 1
#define EARLY_LAUNCHED 2
#define ENDGAME_TRANSIT 3
// Ripples, effects that signal a shuttle's arrival
#define SHUTTLE_RIPPLE_TIME 100

View File

@@ -108,16 +108,23 @@
/atom/proc/onCentcom()
var/turf/T = get_turf(src)
if(!T)
return 0
return FALSE
if(T.z == ZLEVEL_TRANSIT)
for(var/A in SSshuttle.mobile)
var/obj/docking_port/mobile/M = A
if(M.launch_status == ENDGAME_TRANSIT && T in M.areaInstance)
return TRUE
if(T.z != ZLEVEL_CENTCOM)//if not, don't bother
return 0
return FALSE
//check for centcomm shuttles
for(var/A in SSshuttle.mobile)
var/obj/docking_port/mobile/M = A
if(M.launch_status == ENDGAME_LAUNCHED && T in M.areaInstance)
return 1
return TRUE
//finally check for centcom itself
return istype(T.loc,/area/centcom)

View File

@@ -387,7 +387,8 @@
if(istype(M, /obj/docking_port/mobile/pod))
M.dock(SSshuttle.getDock("[M.id]_away")) //Escape pods dock at centcomm
else
continue //Mapping a new docking point for each ship mappers could potentially want docking with centcomm would take up lots of space, just let them keep flying off into the sunset for their greentext
M.launch_status = ENDGAME_TRANSIT
//Mapping a new docking point for each ship mappers could potentially want docking with centcomm would take up lots of space, just let them keep flying off into the sunset for their greentext
// now move the actual emergency shuttle to centcomm
// unless the shuttle is "hijacked"