Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -05:00
parent c2a41c9b51 c9aa7653bc
commit a960b63b0a
545 changed files with 23622 additions and 13702 deletions
@@ -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