VS: Collapse tether_ships into tether_misc

maps/tether/submaps/_tether_submaps.dm

@@ -8,23 +8,12 @@
 	desc = "Misc areas, like some transit areas, holodecks, merc area."
 	mappath = 'tether_misc.dmm'
 
-	associated_map_datum = /datum/map_z_level/tether_lateload/ships
+	associated_map_datum = /datum/map_z_level/tether_lateload/misc
 
 /datum/map_z_level/tether_lateload/misc
 	name = "Misc"
 	flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT
 
-/datum/map_template/tether_lateload/tether_ships
-	name = "Tether - Ships"
-	desc = "Ship transit map and whatnot."
-	mappath = 'tether_ships.dmm'
-
-	associated_map_datum = /datum/map_z_level/tether_lateload/ships
-
-/datum/map_z_level/tether_lateload/ships
-	name = "Ships"
-	flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED
-
 #include "underdark_pois/_templates.dm"
 #include "underdark_pois/underdark_things.dm"
 /datum/map_template/tether_lateload/tether_underdark
@@ -205,7 +194,6 @@
 
 /datum/map_z_level/tether_lateload/away_alienship
 	name = "Away Mission - Alien Ship"
-	z = Z_LEVEL_ALIENSHIP
 
 
 #include "aerostat/_aerostat.dm"
@@ -356,11 +344,6 @@
 		z = mapZ
 	return ..(map)
 
-/turf/unsimulated/wall/seperator //to block vision between transit zones
-	name = ""
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "1"
-
 /obj/effect/step_trigger/zlevel_fall //Don't ever use this, only use subtypes.Define a new var/static/target_z on each
 	affect_ghosts = 1
 

maps/tether/tether_defines.dm

@@ -9,20 +9,18 @@
 #define Z_LEVEL_SURFACE_MINE				8
 #define Z_LEVEL_SOLARS						9
 #define Z_LEVEL_MISC						10
-#define Z_LEVEL_SHIPS						11
-#define Z_LEVEL_UNDERDARK					12
-#define Z_LEVEL_PLAINS						13
-#define Z_LEVEL_ROGUEMINE_1					14
-#define Z_LEVEL_ROGUEMINE_2					15
-#define Z_LEVEL_ROGUEMINE_3					16
-#define Z_LEVEL_ROGUEMINE_4					17
-#define Z_LEVEL_ALIENSHIP					18
-#define Z_LEVEL_BEACH						19
-#define Z_LEVEL_BEACH_CAVE					20
-#define Z_LEVEL_AEROSTAT					21
-#define Z_LEVEL_AEROSTAT_SURFACE			22
-#define Z_LEVEL_DEBRISFIELD					23
-#define Z_LEVEL_GATEWAY						24
+#define Z_LEVEL_UNDERDARK					11
+#define Z_LEVEL_PLAINS						12
+#define Z_LEVEL_ROGUEMINE_1					13
+#define Z_LEVEL_ROGUEMINE_2					14
+#define Z_LEVEL_ROGUEMINE_3					15
+#define Z_LEVEL_ROGUEMINE_4					16
+#define Z_LEVEL_BEACH						17
+#define Z_LEVEL_BEACH_CAVE					18
+#define Z_LEVEL_AEROSTAT					19
+#define Z_LEVEL_AEROSTAT_SURFACE			20
+#define Z_LEVEL_DEBRISFIELD					21
+#define Z_LEVEL_GATEWAY						22
 
 //Camera networks
 #define NETWORK_TETHER "Tether"
@@ -123,8 +121,8 @@
 		/area/crew_quarters/sleep/Dorm_3/holo,
 		/area/crew_quarters/sleep/Dorm_5/holo,
 		/area/crew_quarters/sleep/Dorm_7/holo,
-		/area/rnd/miscellaneous_lab)	//TFF 31/8/19 - exempt new construction site from unit tests
-	//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
+		/area/rnd/miscellaneous_lab)
+
 	unit_test_exempt_from_atmos = list(
 		/area/engineering/atmos_intake, // Outside,
 		/area/rnd/external, //  Outside,
@@ -134,9 +132,8 @@
 		/area/tether/surfacebase/emergency_storage/atrium)
 
 	lateload_z_levels = list(
-		list("Tether - Misc","Tether - Ships","Tether - Underdark","Tether - Plains"), //Stock Tether lateload maps
+		list("Tether - Misc","Tether - Underdark","Tether - Plains"), //Stock Tether lateload maps
 		list("Asteroid Belt 1","Asteroid Belt 2","Asteroid Belt 3","Asteroid Belt 4"),
-		list("Alien Ship - Z1 Ship"),
 		list("Desert Planet - Z1 Beach","Desert Planet - Z2 Cave"),
 		list("Remmi Aerostat - Z1 Aerostat","Remmi Aerostat - Z2 Surface"),
 		list("Debris Field - Z1 Space")
@@ -144,7 +141,6 @@
 
 	lateload_single_pick = list(
 		list("Snow Outpost"),
-		//list("Zoo"),				// Too big. way, way too big
 		list("Carp Farm"),
 		list("Snow Field"),
 		list("Listening Post")
@@ -162,12 +158,11 @@
 		Z_LEVEL_SURFACE_MINE,
 		Z_LEVEL_SOLARS,
 		Z_LEVEL_MISC,
-		Z_LEVEL_SHIPS,
 		Z_LEVEL_BEACH
 		)
 
 	belter_docked_z = 		list(Z_LEVEL_SPACE_HIGH)
-	belter_transit_z =	 	list(Z_LEVEL_SHIPS)
+	belter_transit_z =	 	list(Z_LEVEL_MISC)
 	belter_belt_z = 		list(Z_LEVEL_ROGUEMINE_1,
 						 		 Z_LEVEL_ROGUEMINE_2,
 						 	 	 Z_LEVEL_ROGUEMINE_3,
@@ -205,7 +200,7 @@
 /datum/map/tether/get_map_levels(var/srcz, var/long_range = TRUE)
 	if (long_range && (srcz in map_levels))
 		return map_levels
-	else if (srcz == Z_LEVEL_MISC || srcz == Z_LEVEL_SHIPS) //technical levels
+	else if (srcz == Z_LEVEL_MISC) //technical levels
 		return list() // Nothing on these z-levels- sensors won't show, and GPSes won't see each other.
 	else if (srcz >= Z_LEVEL_SURFACE_LOW && srcz <= Z_LEVEL_SOLARS) //Zs 1-3, 5-9, Z4 will return same list, but is not included into it
 		return list(
@@ -216,12 +211,13 @@
 			Z_LEVEL_SPACE_MID,
 			Z_LEVEL_SPACE_HIGH,
 			Z_LEVEL_SURFACE_MINE,
-			Z_LEVEL_SOLARS)
-	else if(srcz >= Z_LEVEL_BEACH && srcz <= Z_LEVEL_BEACH_CAVE) //Zs 16-17
+			Z_LEVEL_SOLARS,
+			Z_LEVEL_PLAINS)
+	else if(srcz >= Z_LEVEL_BEACH && srcz <= Z_LEVEL_BEACH_CAVE)
 		return list(
 			Z_LEVEL_BEACH,
 			Z_LEVEL_BEACH_CAVE)
-	else if(srcz >= Z_LEVEL_AEROSTAT && srcz <= Z_LEVEL_AEROSTAT_SURFACE) //Zs 18-19
+	else if(srcz >= Z_LEVEL_AEROSTAT && srcz <= Z_LEVEL_AEROSTAT_SURFACE)
 		return list(
 			Z_LEVEL_AEROSTAT,
 			Z_LEVEL_AEROSTAT_SURFACE)
@@ -260,12 +256,15 @@
 
 /obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM)
 	. = ..()
-	announce_atc(AM,going = FALSE)	
+	announce_atc(AM,going = FALSE)
 
 /obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(var/atom/movable/AM)
 	. = ..()
 	announce_atc(AM,going = TRUE)
 
+/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels()
+	return list(Z_LEVEL_SPACE_LOW, Z_LEVEL_SPACE_MID, Z_LEVEL_SPACE_HIGH)
+
 /obj/effect/overmap/visitable/sector/virgo3b/proc/announce_atc(var/atom/movable/AM, var/going = FALSE)
 	var/message = "Sensor contact for vessel '[AM.name]' has [going ? "left" : "entered"] ATC control area."
 	//For landables, we need to see if their shuttle is cloaked