From eb7ee7fb585a1c2e9a783a49e02d49107ee5e813 Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Thu, 2 Nov 2017 09:51:45 +1300
Subject: [PATCH 1/2] Merge pull request #32269 from
 ninjanomnom/cargo-shuttle-moblock

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 0f5567fd90..ddceb28e60 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)