From dc359635ca0225b055faa1ccf0a546bb3e5697bb Mon Sep 17 00:00:00 2001 From: ninjanomnom Date: Mon, 30 Oct 2017 17:54:08 -0400 Subject: [PATCH] Makes enterTransit check canMove and sets mode to idle --- code/modules/shuttle/shuttle.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 889b2e8b70c..83db4668746 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -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)