diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm
index 0ede26b84348a..76595dccb8fff 100644
--- a/maps/sierra/z1-z5_sierra.dmm
+++ b/maps/sierra/z1-z5_sierra.dmm
@@ -93229,7 +93229,6 @@
 	},
 /obj/floor_decal/techfloor,
 /obj/floor_decal/industrial/hatch/yellow,
-/obj/shuttle_landmark/reaper/dock,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/crew_quarters/docking)
 "nMh" = (
@@ -94523,6 +94522,7 @@
 /area/engineering/engine_room)
 "nYR" = (
 /obj/shuttle_landmark/merc/dock,
+/obj/shuttle_landmark/reaper/dock,
 /turf/space,
 /area/space)
 "nYS" = (
@@ -163647,6 +163647,10 @@
 	},
 /turf/simulated/floor/grass/cut,
 /area/crew_quarters/garden_room)
+"yfe" = (
+/obj/shuttle_landmark/snz/dock,
+/turf/space,
+/area/space)
 "yfi" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -180105,7 +180109,7 @@ wJN
 wJN
 wJN
 wJN
-wJN
+yfe
 wJN
 wJN
 wJN
diff --git a/mods/_maps/farfleet/code/farfleet_shuttle.dm b/mods/_maps/farfleet/code/farfleet_shuttle.dm
index d91f64bd1350e..faa710686bd40 100644
--- a/mods/_maps/farfleet/code/farfleet_shuttle.dm
+++ b/mods/_maps/farfleet/code/farfleet_shuttle.dm
@@ -39,7 +39,6 @@
 	landmark_tag = "nav_hangar_snz"
 	base_area = /area/ship/farfleet/command/snz_hangar
 	base_turf = /turf/simulated/floor/plating
-	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
 /obj/shuttle_landmark/snz/altdock
 	name = "Docking Port"
diff --git a/mods/_maps/farfleet/maps/farfleet-2.dmm b/mods/_maps/farfleet/maps/farfleet-2.dmm
index 3dd44783fbc74..d006e55e5dec5 100644
--- a/mods/_maps/farfleet/maps/farfleet-2.dmm
+++ b/mods/_maps/farfleet/maps/farfleet-2.dmm
@@ -3950,10 +3950,6 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/ship/farfleet/crew/hydroponics)
-"Ms" = (
-/obj/shuttle_landmark/snz/start,
-/turf/simulated/floor/tiled/monotile,
-/area/ship/farfleet/command/snz_hangar)
 "Mt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
@@ -4352,6 +4348,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/shuttle_landmark/snz/start,
 /turf/simulated/floor/tiled/steel_grid,
 /area/ship/snz)
 "Rs" = (
@@ -14660,7 +14657,7 @@ Uu
 Uu
 wJ
 ME
-Ms
+ns
 aW
 Iu
 eB
diff --git a/mods/_maps/sentinel/code/sentinel_shuttle.dm b/mods/_maps/sentinel/code/sentinel_shuttle.dm
index e3274c43d2026..1927e84cde8b4 100644
--- a/mods/_maps/sentinel/code/sentinel_shuttle.dm
+++ b/mods/_maps/sentinel/code/sentinel_shuttle.dm
@@ -37,7 +37,6 @@
 	landmark_tag = "nav_hangar_reaper"
 	base_area = /area/ship/patrol/command/hangar
 	base_turf = /turf/simulated/floor/plating
-	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
 /obj/shuttle_landmark/reaper/altdock
 	name = "Docking Port"
diff --git a/mods/_maps/sentinel/maps/sentinel-1.dmm b/mods/_maps/sentinel/maps/sentinel-1.dmm
index de76cf42a128b..14f495dc04812 100644
--- a/mods/_maps/sentinel/maps/sentinel-1.dmm
+++ b/mods/_maps/sentinel/maps/sentinel-1.dmm
@@ -4767,6 +4767,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/red{
 	dir = 4
 	},
+/obj/shuttle_landmark/reaper/start,
 /turf/simulated/floor/plating,
 /area/ship/reaper)
 "jc" = (
@@ -4886,7 +4887,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/catwalk,
-/obj/shuttle_landmark/reaper/start,
 /turf/simulated/floor/plating,
 /area/ship/patrol/command/hangar)
 "jj" = (
diff --git a/mods/utility_items/code/advanced_landing.dm b/mods/utility_items/code/advanced_landing.dm
index 02d6cbd972a8c..eba9529002976 100644
--- a/mods/utility_items/code/advanced_landing.dm
+++ b/mods/utility_items/code/advanced_landing.dm
@@ -80,6 +80,9 @@
 
 /mob/living/carbon/human/update_dead_sight()
 	. = ..()
+	if(!eyeobj)
+		cancel_landeye_view()
+		return
 	if(eyeobj.type == /mob/observer/eye/landeye)
 		set_see_in_dark(8)
 		set_see_invisible(SEE_INVISIBLE_MINIMUM)
@@ -232,7 +235,7 @@
 		var/zone_good = FALSE
 		I.loc = T
 		shadow_images += I
-		if(!(T.density))
+		if(T && !(T.density))
 			for(var/type in accesible_areas)
 				if(A.type in typesof(type))
 					zone_good = TRUE
@@ -323,10 +326,3 @@
 		var/turf/T = locate(I.loc.x, I.loc.y, I.loc.z)
 		I = image('mods/utility_items/icons/alphacolors.dmi', T, "dither50")
 		T.AddOverlays(I)
-
-/datum/shuttle/autodock/process_arrived()
-	.=..()
-	for(var/i in 1 to LAZYLEN(next_location.image_shadow))
-		var/image/I = next_location.image_shadow[i]
-		var/turf/T = locate(I.loc.x, I.loc.y, I.loc.z)
-		T.ClearOverlays(I)