diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm
index 620b4d9ae4b..d4b5c82180d 100644
--- a/code/modules/overmap/ships/landable.dm
+++ b/code/modules/overmap/ships/landable.dm
@@ -7,7 +7,6 @@
 	var/obj/effect/shuttle_landmark/ship/landmark       // Record our open space landmark for easy reference.
 	var/multiz = 0										// Index of multi-z levels, starts at 0
 	var/status = SHIP_STATUS_LANDED
-	var/subshuttle = FALSE								// TRUE/FALSE: Is this a ship that starts docked to another ship?
 	icon_state = "shuttle"
 	moving_state = "shuttle_moving"
 
@@ -35,12 +34,8 @@
 
 // We autobuild our z levels.
 /obj/effect/overmap/visitable/ship/landable/find_z_levels()
-	if(isStationLevel(z) || multiz || subshuttle)
-		// If we're not on station and not multi-z or inside an existing ship, then we already had a z-level generated for us; let's use that
-		for(var/i = 0 to multiz)
-			world.maxz++
-			map_z += world.maxz
-	else
+	for(var/i = 0 to multiz)
+		world.maxz++
 		map_z += world.maxz
 
 	var/turf/center_loc = locate(round(world.maxx/2), round(world.maxy/2), world.maxz)
@@ -173,4 +168,4 @@
 		if(SHIP_STATUS_TRANSIT)
 			return "Maneuvering under secondary thrust."
 		if(SHIP_STATUS_OVERMAP)
-			return "In open space."
+			return "In open space."
\ No newline at end of file
diff --git a/maps/away/ships/biesel.dm b/maps/away/ships/biesel.dm
index afec3303e1d..b7225ae76d9 100644
--- a/maps/away/ships/biesel.dm
+++ b/maps/away/ships/biesel.dm
@@ -7,7 +7,6 @@
 	spawn_cost = 1
 	id = "tcfl_peacekeeper_ship"
 	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/tcfl_peacekeeper_ship, /datum/shuttle/autodock/overmap/tcfl_shuttle)
-	template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED
 
 /obj/effect/overmap/visitable/sector/tcfl_peacekeeper_ship
 	name = "faint ship activity"
@@ -93,7 +92,6 @@
 	vessel_mass = 3000 //very inefficient pod
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_TINY
-	subshuttle = TRUE
 
 /obj/machinery/computer/shuttle_control/explore/tcfl_shuttle
 	name = "shuttle control console"
diff --git a/maps/away/ships/corporate.dm b/maps/away/ships/corporate.dm
index fb4a6bf7570..c76f7015f90 100644
--- a/maps/away/ships/corporate.dm
+++ b/maps/away/ships/corporate.dm
@@ -92,7 +92,6 @@
 	vessel_mass = 3000 //very inefficient pod
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_TINY
-	subshuttle = TRUE
 
 /obj/machinery/computer/shuttle_control/explore/orion_express_shuttle
 	name = "shuttle control console"
@@ -220,7 +219,6 @@
 	vessel_mass = 3000 //very inefficient pod
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_TINY
-	subshuttle = TRUE
 
 /obj/machinery/computer/shuttle_control/explore/ee_shuttle
 	name = "shuttle control console"
diff --git a/maps/away/ships/sol.dm b/maps/away/ships/sol.dm
index d8e1b555d8b..f6526745013 100644
--- a/maps/away/ships/sol.dm
+++ b/maps/away/ships/sol.dm
@@ -92,7 +92,6 @@
 	vessel_mass = 3000 //very inefficient pod
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_TINY
-	subshuttle = TRUE
 
 /obj/machinery/computer/shuttle_control/explore/sfa_shuttle
 	name = "shuttle control console"
diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm
index 795cdc250b7..8b0f901b17c 100644
--- a/maps/sccv_horizon/code/sccv_horizon.dm
+++ b/maps/sccv_horizon/code/sccv_horizon.dm
@@ -126,3 +126,7 @@
 	allow_borgs_to_leave = TRUE
 
 	warehouse_basearea = /area/operations/storage
+
+/datum/map/sccv_horizon/finalize_load()
+	// generate an empty space Z
+	world.maxz++