diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated/_unsimulated.dm
similarity index 88%
rename from code/game/turfs/unsimulated.dm
rename to code/game/turfs/unsimulated/_unsimulated.dm
index 67200a23bf8..95648e49340 100644
--- a/code/game/turfs/unsimulated.dm
+++ b/code/game/turfs/unsimulated/_unsimulated.dm
@@ -25,3 +25,9 @@
 
 /turf/unsimulated/get_lumcount(var/minlum = 0, var/maxlum = 1)
 	return 0.8
+
+// For the purposes of spacemove/spacedrift.
+/turf/unsimulated/is_floor()
+	return !density
+/turf/unsimulated/is_wall()
+	return !is_floor()
diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm
index 449745e5e12..359348d828b 100644
--- a/code/game/turfs/unsimulated/floor.dm
+++ b/code/game/turfs/unsimulated/floor.dm
@@ -16,9 +16,6 @@
 /turf/unsimulated/floor/rescue_base
 	icon_state = "asteroidfloor"
 
-/turf/unsimulated/floor/shuttle_ceiling
-	icon_state = "reinforced"
-
 /turf/unsimulated/floor/snow
 	name = "snow"
 	icon = 'icons/turf/flooring/snow.dmi'
diff --git a/code/modules/mechs/mech_movement.dm b/code/modules/mechs/mech_movement.dm
index 1e7c25f9423..ca8276e476d 100644
--- a/code/modules/mechs/mech_movement.dm
+++ b/code/modules/mechs/mech_movement.dm
@@ -169,7 +169,7 @@
 	for(var/atom/movable/AM in contents)
 		if(!AM.overmap_can_discard())
 			return FALSE
-	return !pilots.len
+	return LAZYLEN(pilots) <= 0
 
 /mob/living/exosuit/fall_damage()
 	return 175 //Exosuits are big and heavy
diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index 794f0736f12..a12a0dd796b 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -15,7 +15,7 @@
 	var/category = /datum/shuttle
 	var/multiz = 0	//how many multiz levels, starts at 0
 
-	var/ceiling_type = /turf/unsimulated/floor/shuttle_ceiling
+	var/ceiling_type = /turf/floor/shuttle_ceiling
 	var/force_ceiling_on_init = TRUE // Whether or not to force ceilings turfs to be created above on initialization.
 
 	var/sound_takeoff = 'sound/effects/shuttle_takeoff.ogg'
diff --git a/maps/planets/test_planet/neutralia-3.dmm b/maps/planets/test_planet/neutralia-3.dmm
index f7d1ff768ee..fb4f5b6268e 100644
--- a/maps/planets/test_planet/neutralia-3.dmm
+++ b/maps/planets/test_planet/neutralia-3.dmm
@@ -13,7 +13,7 @@
 /turf/unsimulated/floor/rescue_base,
 /area/exoplanet/neutralia)
 "e" = (
-/turf/unsimulated/floor/shuttle_ceiling,
+/turf/floor/shuttle_ceiling,
 /area/exoplanet/neutralia)
 "j" = (
 /obj/abstract/landmark/exoplanet_spawn/large_plant,
diff --git a/maps/random_ruins/space_ruins/multi_zas_test.dmm b/maps/random_ruins/space_ruins/multi_zas_test.dmm
index a8f32fc94f6..e90fb1fbc7a 100644
--- a/maps/random_ruins/space_ruins/multi_zas_test.dmm
+++ b/maps/random_ruins/space_ruins/multi_zas_test.dmm
@@ -13,13 +13,13 @@
 /turf/open,
 /area/template_noop)
 "e" = (
-/turf/unsimulated/floor/shuttle_ceiling,
+/turf/floor/shuttle_ceiling,
 /area/template_noop)
 "f" = (
 /obj/abstract/map_data{
 	height = 3
 	},
-/turf/unsimulated/floor/shuttle_ceiling,
+/turf/floor/shuttle_ceiling,
 /area/template_noop)
 
 (1,1,1) = {"
diff --git a/nebula.dme b/nebula.dme
index 03330a9790f..d508511319b 100644
--- a/nebula.dme
+++ b/nebula.dme
@@ -1569,7 +1569,6 @@
 #include "code\game\turfs\turf_height.dm"
 #include "code\game\turfs\turf_material.dm"
 #include "code\game\turfs\turf_ramps.dm"
-#include "code\game\turfs\unsimulated.dm"
 #include "code\game\turfs\flooring\_flooring.dm"
 #include "code\game\turfs\flooring\_flooring_decals.dm"
 #include "code\game\turfs\flooring\flooring_carpet.dm"
@@ -1616,6 +1615,7 @@
 #include "code\game\turfs\open\open_sky.dm"
 #include "code\game\turfs\space\space.dm"
 #include "code\game\turfs\space\transit.dm"
+#include "code\game\turfs\unsimulated\_unsimulated.dm"
 #include "code\game\turfs\unsimulated\floor.dm"
 #include "code\game\turfs\unsimulated\mask.dm"
 #include "code\game\turfs\unsimulated\walls.dm"