Quick sync (#2587)

* sync since the mirror was down

* fucking byond

* can't forget these

code/controllers/subsystem/shuttle.dm

@@ -341,7 +341,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
 
@@ -356,7 +356,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