diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
index 1200599e002..03b508cc1d6 100644
--- a/code/__DEFINES/shuttles.dm
+++ b/code/__DEFINES/shuttles.dm
@@ -55,10 +55,9 @@
 
 //Docking error flags
 #define DOCKING_SUCCESS 0
-#define DOCKING_COMPLETE 1
-#define DOCKING_BLOCKED 2
-#define DOCKING_IMMOBILIZED 4
-#define DOCKING_AREA_EMPTY 8
+#define DOCKING_BLOCKED 1
+#define DOCKING_IMMOBILIZED 2
+#define DOCKING_AREA_EMPTY 4
 
 //Docking turf movements
 #define MOVE_TURF 1
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 7338f0280d3..3e395db4cfd 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -339,7 +339,7 @@ SUBSYSTEM_DEF(shuttle)
 		if(M.request(getDock(destination)))
 			return 2
 	else
-		if(M.dock(getDock(destination)))
+		if(M.dock(getDock(destination)) != DOCKING_SUCCESS)
 			return 2
 	return 0	//dock successful
 
@@ -354,7 +354,7 @@ SUBSYSTEM_DEF(shuttle)
 		if(M.request(D))
 			return 2
 	else
-		if(M.dock(D))
+		if(M.dock(D) != DOCKING_SUCCESS)
 			return 2
 	return 0	//dock successful
 
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index a30598b7a86..a2278fbbc40 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -290,7 +290,7 @@
 		if(SHUTTLE_CALL)
 			if(time_left <= 0)
 				//move emergency shuttle to station
-				if(dock(SSshuttle.getDock("emergency_home")))
+				if(dock(SSshuttle.getDock("emergency_home")) != DOCKING_SUCCESS)
 					setTimer(20)
 					return
 				mode = SHUTTLE_DOCKED
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 6ae0d98dfe2..f035777df57 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -418,7 +418,7 @@
 	var/obj/docking_port/stationary/S0 = get_docked()
 	var/obj/docking_port/stationary/S1 = assigned_transit
 	if(S1)
-		if(dock(S1))
+		if(dock(S1) != DOCKING_SUCCESS)
 			WARNING("shuttle \"[id]\" could not enter transit space. Docked at [S0 ? S0.id : "null"]. Transit dock [S1 ? S1.id : "null"].")
 		else
 			previous = S0
@@ -498,7 +498,7 @@
 
 	if(new_dock.get_docked() == src)
 		remove_ripples()
-		return DOCKING_COMPLETE
+		return DOCKING_SUCCESS
 
 	if(!force)
 		if(!check_dock(new_dock))
@@ -650,11 +650,11 @@
 	// then try again
 	switch(mode)
 		if(SHUTTLE_CALL)
-			if(dock(destination, preferred_direction))
+			if(dock(destination, preferred_direction) != DOCKING_SUCCESS)
 				setTimer(20)
 				return
 		if(SHUTTLE_RECALL)
-			if(dock(previous))
+			if(dock(previous) != DOCKING_SUCCESS)
 				setTimer(20)
 				return
 		if(SHUTTLE_IGNITING)