diff --git a/code/controllers/subsystems/planets.dm b/code/controllers/subsystems/planets.dm
index 3b3675d5c3a..913658f1c69 100644
--- a/code/controllers/subsystems/planets.dm
+++ b/code/controllers/subsystems/planets.dm
@@ -56,6 +56,7 @@ 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
@@ -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
diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm
index 940e2df548d..10e12d79be0 100644
--- a/code/game/turfs/simulated/floor_attackby.dm
+++ b/code/game/turfs/simulated/floor_attackby.dm
@@ -47,8 +47,7 @@
 				var/turf/A = get_step(src, dir)
 				if(A && !A.outdoors)
 					if(expended_tile || R.use(1))
-						src.outdoors = FALSE
-						SSplanets.unallocateTurf(src)
+						make_indoors()
 						playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
 						user.visible_message("<span class='notice'>[user] roofs a tile, shielding it from the elements.</span>", "<span class='notice'>You roof this tile, shielding it from the elements.</span>")
 					break
diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm
index 4d87e2e87ea..1f1dfbf36ca 100644
--- a/code/game/turfs/simulated/wall_attacks.dm
+++ b/code/game/turfs/simulated/wall_attacks.dm
@@ -171,8 +171,7 @@
 		// Create a ceiling to shield from the weather
 		if(outdoors)
 			if(expended_tile || R.use(1)) // Don't need to check adjacent turfs for a wall, we're building on one
-				outdoors = FALSE
-				SSplanets.unallocateTurf(src)
+				make_indoors()
 				if(!expended_tile) // Would've already played a sound
 					playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
 				user.visible_message("<span class='notice'>[user] roofs \the [src], shielding it from the elements.</span>", "<span class='notice'>You roof \the [src] tile, shielding it from the elements.</span>")