diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index dfc70d5635f..827a783e851 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -1030,14 +1030,14 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/effect/landmark/spawner/late,
+/obj/effect/landmark/spawner/late/crew,
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/arrival/station)
 "aim" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/effect/landmark/spawner/late,
+/obj/effect/landmark/spawner/late/crew,
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/arrival/station)
 "aio" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 59e6ed1a422..f94ebfab1e5 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -28214,11 +28214,11 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/effect/landmark/spawner/late,
+/obj/effect/landmark/spawner/late/crew,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/arrival/station)
 "blT" = (
-/obj/effect/landmark/spawner/late,
+/obj/effect/landmark/spawner/late/crew,
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/arrival/station)
 "blU" = (
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 30e736027fd..8a7cdb3ecea 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -20963,11 +20963,6 @@
 /area/hallway/secondary/entry)
 "aXr" = (
 /obj/structure/closet/walllocker/emerglocker/north,
-/obj/effect/landmark{
-	icon = 'icons/effects/spawner_icons.dmi';
-	icon_state = "HONK";
-	name = "HONKsquad"
-	},
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/arrival/station)
 "aXs" = (
@@ -21003,14 +20998,6 @@
 	},
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/arrival/station)
-"aXz" = (
-/obj/effect/landmark{
-	icon = 'icons/effects/spawner_icons.dmi';
-	icon_state = "HONK";
-	name = "HONKsquad"
-	},
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/arrival/station)
 "aXA" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -21753,7 +21740,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/effect/landmark/spawner/late,
+/obj/effect/landmark/spawner/late/crew,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/arrival/station)
 "aZa" = (
@@ -79569,14 +79556,6 @@
 /obj/effect/decal/warning_stripes/north,
 /turf/simulated/floor/engine,
 /area/engine/engineering)
-"fvP" = (
-/obj/effect/landmark{
-	icon = 'icons/effects/spawner_icons.dmi';
-	icon_state = "HONK";
-	name = "HONKsquad"
-	},
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/arrival/station)
 "fAw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow,
 /obj/machinery/tcomms/core/station,
@@ -91336,10 +91315,10 @@ aSd
 aSd
 aVV
 aXr
-fvP
-fvP
-fvP
-aXz
+jyO
+jyO
+jyO
+aXs
 aVV
 aSd
 aSd
@@ -93391,11 +93370,11 @@ aRU
 aOQ
 aRU
 aVX
-aXz
-fvP
-fvP
-fvP
-aXz
+aXs
+jyO
+jyO
+jyO
+aXs
 aVX
 bgy
 aOQ
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index e514f10532a..6d9c8ee2a6c 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -105,7 +105,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
 
 /obj/effect/landmark/spawner/late/cryo/Initialize(mapload)
 	spawner_list = GLOB.latejoin_cryo
-	..()
+	return ..()
 
 /obj/effect/landmark/spawner/late/cyborg
 	name = "Late Join Cyborg"
@@ -113,14 +113,14 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/awaystart) //Without this away mission
 
 /obj/effect/landmark/spawner/late/cyborg/Initialize(mapload)
 	spawner_list = GLOB.latejoin_cyborg
-	..()
+	return ..()
 
 /obj/effect/landmark/spawner/late/gateway
 	name = "Late Join Gateway"
 
 /obj/effect/landmark/spawner/late/gateway/Initialize(mapload)
 	spawner_list = GLOB.latejoin_gateway
-	..()
+	return ..()
 
 /obj/effect/landmark/spawner/carp
 	name = "carpspawn"