Merge branch 'master' into upstream-merge-5432

code/controllers/emergency_shuttle_controller.dm

@@ -98,10 +98,10 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 	autopilot = 1
 	set_launch_countdown(get_shuttle_prep_time())
 	auto_recall_time = rand(world.time + 300, launch_time - 300)
-	var/estimated_time = round(estimate_arrival_time()/60,1)
 
 	//reset the shuttle transit time if we need to
 	shuttle.move_time = SHUTTLE_TRANSIT_DURATION
+	var/estimated_time = round(estimate_arrival_time()/60,1)
 
 	priority_announcement.Announce(replacetext(replacetext(using_map.shuttle_called_message, "%dock_name%", "[using_map.dock_name]"),  "%ETA%", "[estimated_time] minute\s"))
 	atc.shift_ending()
@@ -274,4 +274,4 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 		var/obj/effect/bgstar/S = new/obj/effect/bgstar(locate(x,y,z))
 		S.direction = spawndir
 		spawn()
-			S.startmove()
+			S.startmove()

code/controllers/subsystems/planets.dm

@@ -56,13 +56,14 @@ SUBSYSTEM_DEF(planets)
 			P.planet_floors -= T
 		else
 			P.planet_walls -= T
+		T.vis_contents -= P.weather_holder.visuals
 
 /datum/controller/subsystem/planets/proc/allocateTurfs(var/initial = FALSE)
 	var/list/currentlist = new_outdoor_turfs
 	while(currentlist.len)
 		var/turf/simulated/OT = currentlist[currentlist.len]
 		currentlist.len--
-		if(istype(OT) && z_to_planet.len >= OT.z && z_to_planet[OT.z])
+		if(istype(OT) && OT.outdoors && z_to_planet.len >= OT.z && z_to_planet[OT.z])
 			var/datum/planet/P = z_to_planet[OT.z]
 			P.planet_floors |= OT
 			OT.vis_contents |= P.weather_holder.visuals
@@ -113,9 +114,9 @@ SUBSYSTEM_DEF(planets)
 	while(currentrun.len)
 		var/datum/planet/P = currentrun[currentrun.len]
 		currentrun.len--
-		
+
 		P.process(last_fire)
-		
+
 		//Sun light needs changing
 		if(P.needs_work & PLANET_PROCESS_SUN)
 			P.needs_work &= ~PLANET_PROCESS_SUN