Merge pull request #3745 from Citadel-Station-13/upstream-merge-32269

[MIRROR] Makes enterTransit check canMove and sets mode to idle
This commit is contained in:
LetterJay
2017-11-04 22:31:17 -05:00
committed by GitHub
+2 -1
View File
@@ -416,7 +416,8 @@
mode = SHUTTLE_RECALL
/obj/docking_port/mobile/proc/enterTransit()
if(SSshuttle.lockdown && (z in GLOB.station_z_levels)) //emp went off, no escape
if((SSshuttle.lockdown && (z in GLOB.station_z_levels)) || !canMove()) //emp went off, no escape
mode = SHUTTLE_IDLE
return
previous = null
// if(!destination)