Fixes emergency shuttle endgame state

2017-06-28 08:31:55 -05:00
parent d2ff4f2374
commit 1e7c986ab5
3 changed files with 39 additions and 6 deletions
@@ -347,9 +347,7 @@
 				//move each escape pod (or applicable spaceship) to its corresponding transit dock
 				for(var/A in SSshuttle.mobile)
 					var/obj/docking_port/mobile/M = A
-					if(M.launch_status == UNLAUNCHED) //Pods will not launch from the mine/planet, and other ships won't launch unless we tell them to.
-						M.launch_status = ENDGAME_LAUNCHED
-						M.enterTransit()
+					M.on_emergency_launch()

 				//now move the actual emergency shuttle to its transit dock
 				var/list/areas = list()
@@ -551,9 +549,6 @@
 	SSshuttle.emergency = current_emergency
 	SSshuttle.backup_shuttle = src

-#undef UNLAUNCHED
-#undef LAUNCHED
-#undef EARLY_LAUNCHED
 #undef TIMELEFT
 #undef ENGINES_START_TIME
 #undef ENGINES_STARTED