Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI

code/modules/shuttle/assault_pod.dm

@@ -6,6 +6,7 @@
 	height = 7
 
 /obj/docking_port/mobile/assault_pod/request()
+	// TODO: Tie into space manager
 	if(z == initial(src.z)) //No launching pods that have already launched
 		return ..()
 

code/modules/shuttle/emergency.dm

@@ -209,6 +209,7 @@
 			if(time_left <= 0 && !shuttle_master.emergencyNoEscape)
 				//move each escape pod to its corresponding transit dock
 				for(var/obj/docking_port/mobile/pod/M in shuttle_master.mobile)
+					// TODO: Tie into space manager
 					if(M.z == ZLEVEL_STATION) //Will not launch from the mine/planet
 						M.enterTransit()
 				//now move the actual emergency shuttle to its transit dock