diff --git a/code/game/turfs/simulated/outdoors/outdoors_vr.dm b/code/game/turfs/simulated/outdoors/outdoors_vr.dm
index c7ea541204..48972b9f1e 100644
--- a/code/game/turfs/simulated/outdoors/outdoors_vr.dm
+++ b/code/game/turfs/simulated/outdoors/outdoors_vr.dm
@@ -56,10 +56,10 @@
 /turf/simulated/floor/outdoors/newdirt_nograss/Initialize(mapload)
 	var/possibledirts = list(
 		"dirt0" = 200,
-		"dirt3" = 20,
-		"dirt4" = 3,
-		"dirt5" = 3,
-		"dirt6" = 1
+		"dirt6" = 20,
+		"dirt7" = 3,
+		"dirt8" = 3,
+		"dirt9" = 1
 	)
 	flooring_override = pickweight(possibledirts)
 	return ..()	
diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm
index d067d146ae..4be8f92f4a 100644
--- a/maps/groundbase/gb-centcomm.dmm
+++ b/maps/groundbase/gb-centcomm.dmm
@@ -2,12 +2,6 @@
 "a" = (
 /turf/space,
 /area/space)
-"b" = (
-/obj/machinery/conveyor{
-	id = "cargoload"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
 "d" = (
 /obj/structure/bed/chair/shuttle{
 	dir = 1
@@ -20,9 +14,8 @@
 /obj/machinery/door/airlock/angled_bay/external/glass{
 	dir = 4;
 	door_color = "#822a1e";
-	frequency = 1380;
-	id_tag = "escape_shuttle_hatch";
-	name = "Docking Port Airlock"
+	frequency = null;
+	id_tag = null
 	},
 /obj/effect/shuttle_landmark{
 	base_area = /area/centcom;
@@ -31,16 +24,10 @@
 	landmark_tag = "escape_cc";
 	name = "Escape Shuttle"
 	},
-/turf/simulated/shuttle/plating/airless,
+/turf/simulated/shuttle/plating,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
-"g" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
 "l" = (
 /turf/simulated/floor/reinforced/virgo3c{
 	edge_blending_priority = -1
@@ -49,29 +36,6 @@
 "o" = (
 /turf/simulated/floor/outdoors/grass/forest/virgo3c,
 /area/centcom)
-"p" = (
-/obj/machinery/door/airlock/angled_bay/external/glass{
-	door_color = "#822a1e";
-	frequency = 1380;
-	id_tag = "supply_shuttle_hatch";
-	locked = 1;
-	name = "Shuttle Hatch"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
-"q" = (
-/obj/machinery/door/airlock/angled_bay/external/glass{
-	door_color = "#822a1e";
-	frequency = 1380;
-	id_tag = "supply_shuttle_hatch";
-	locked = 1;
-	name = "Shuttle Hatch"
-	},
-/obj/machinery/conveyor{
-	id = "cargoload"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
 "r" = (
 /turf/unsimulated/wall/planetary/virgo3c,
 /area/centcom)
@@ -85,10 +49,6 @@
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
-"v" = (
-/obj/machinery/light,
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
 "w" = (
 /obj/structure/bed/chair/shuttle,
 /obj/machinery/light{
@@ -98,28 +58,11 @@
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
-"x" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1380;
-	id_tag = "supply_shuttle";
-	pixel_y = 24;
-	req_one_access = list(13,31);
-	tag_door = "supply_shuttle_hatch"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
-"y" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 4;
-	icon_state = "burst_r"
-	},
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/supply)
 "z" = (
 /obj/structure/shuttle/engine/propulsion{
 	dir = 4
 	},
-/turf/simulated/shuttle/plating/airless,
+/turf/simulated/shuttle/plating,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
@@ -128,29 +71,6 @@
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
-"E" = (
-/obj/machinery/door/airlock/angled_bay/external/glass{
-	door_color = "#822a1e";
-	frequency = 1380;
-	id_tag = "supply_shuttle_hatch";
-	locked = 1;
-	name = "Shuttle Hatch"
-	},
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "cargounload"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
-"F" = (
-/obj/effect/shuttle_landmark{
-	base_area = /area/space;
-	base_turf = /turf/unsimulated/floor;
-	landmark_tag = "supply_cc";
-	name = "Centcom Supply Depot"
-	},
-/turf/simulated/shuttle/wall,
-/area/shuttle/supply)
 "G" = (
 /obj/structure/bed/chair/shuttle,
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
@@ -158,7 +78,7 @@
 	id_tag = "escape_shuttle";
 	pixel_y = 25;
 	req_one_access = list(13);
-	tag_door = "escape_shuttle_hatch"
+	tag_door = null
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape{
@@ -191,15 +111,6 @@
 	edge_blending_priority = -1
 	},
 /area/centcom)
-"M" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor,
-/area/shuttle/supply)
 "Q" = (
 /obj/structure/bed/chair/shuttle,
 /turf/simulated/shuttle/floor,
@@ -211,19 +122,6 @@
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
-"T" = (
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "cargounload"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
-"Y" = (
-/turf/simulated/shuttle/wall,
-/area/shuttle/supply)
-"Z" = (
-/turf/simulated/shuttle/floor,
-/area/shuttle/supply)
 
 (1,1,1) = {"
 a
@@ -10797,19 +10695,19 @@ o
 o
 o
 o
-l
-l
-l
-Y
-Y
-Y
-F
-Y
-Y
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -10939,19 +10837,19 @@ o
 o
 o
 o
-l
-l
-l
-Y
-g
-Z
-Z
-Z
-Z
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -11081,19 +10979,19 @@ o
 o
 o
 o
-l
-l
-l
-E
-T
-T
-T
-T
-Z
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -11223,19 +11121,19 @@ o
 o
 o
 o
-l
-l
-l
-p
-Z
-Z
-Z
-Z
-v
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -11365,19 +11263,19 @@ o
 o
 o
 o
-l
-l
-l
-Y
-Z
-Z
-Z
-Z
-Z
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -11507,19 +11405,19 @@ o
 o
 o
 o
-l
-l
-l
-Y
-x
-Z
-Z
-Z
-Z
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -11649,19 +11547,19 @@ o
 o
 o
 o
-l
-l
-l
-p
-Z
-Z
-Z
-Z
-v
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -11791,19 +11689,19 @@ o
 o
 o
 o
-l
-l
-l
-q
-b
-b
-b
-b
-Z
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -11933,19 +11831,19 @@ o
 o
 o
 o
-l
-l
-l
-Y
-g
-Z
-Z
-Z
-Z
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -12075,19 +11973,19 @@ o
 o
 o
 o
-l
-l
-l
-Y
-Y
-M
-M
-M
-Y
-Y
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -12217,19 +12115,19 @@ o
 o
 o
 o
-l
-l
-l
-l
-Y
-y
-y
-y
-Y
-l
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -12359,19 +12257,19 @@ o
 o
 o
 o
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -12501,19 +12399,19 @@ o
 o
 o
 o
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
 o
 o
 o
@@ -12632,39 +12530,39 @@ a
 a
 a
 r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-l
-o
-o
-o
-o
-o
-o
-o
-o
-o
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
+r
 r
 a
 a
@@ -12773,41 +12671,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -12915,41 +12813,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -13057,41 +12955,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -13199,41 +13097,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -13341,41 +13239,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -13483,41 +13381,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -13625,41 +13523,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -13767,41 +13665,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -13909,41 +13807,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -14051,41 +13949,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -14193,41 +14091,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -14335,41 +14233,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -14477,41 +14375,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -14619,41 +14517,41 @@ a
 a
 a
 a
-r
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-o
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
@@ -14761,41 +14659,41 @@ a
 a
 a
 a
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
-r
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
 a
 a
 a
diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm
index 71d4c3e723..b97863878a 100644
--- a/maps/groundbase/gb-misc.dmm
+++ b/maps/groundbase/gb-misc.dmm
@@ -2463,8 +2463,8 @@
 	teleport_z = 4;
 	teleport_z_offset = 4
 	},
-/turf/space/transit/east,
-/area/space)
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/centcom)
 "iO" = (
 /obj/effect/step_trigger/teleporter/random{
 	affect_ghosts = 1;
@@ -2498,6 +2498,12 @@
 /obj/effect/landmark/ai_multicam_room,
 /turf/unsimulated/ai_visible,
 /area/ai_multicam_room)
+"lp" = (
+/mob/living/simple_mob/vore/woof/hostile/aweful/ranged{
+	dir = 8
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/centcom)
 "lP" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -2518,6 +2524,15 @@
 	icon_state = "white"
 	},
 /area/holodeck/source_patient_ward)
+"mV" = (
+/obj/effect/shuttle_landmark{
+	base_area = /area/space;
+	base_turf = /turf/unsimulated/floor;
+	landmark_tag = "supply_cc";
+	name = "Centcom Supply Depot"
+	},
+/turf/simulated/shuttle/wall,
+/area/shuttle/supply)
 "mY" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 5
@@ -2563,6 +2578,15 @@
 	},
 /turf/simulated/floor/holofloor/carpet,
 /area/holodeck/source_game_room)
+"oK" = (
+/obj/effect/shuttle_landmark{
+	base_area = /area/space;
+	base_turf = /turf/simulated/floor/outdoors/grass/virgo3c;
+	landmark_tag = "escape_transit";
+	name = "Escape Transit"
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/space)
 "oR" = (
 /obj/effect/floor_decal/carpet,
 /obj/effect/floor_decal/carpet{
@@ -2664,6 +2688,9 @@
 	},
 /turf/space/transit/west,
 /area/space)
+"up" = (
+/turf/simulated/shuttle/floor,
+/area/shuttle/supply)
 "uM" = (
 /obj/item/toy/chess/knight_black,
 /turf/simulated/floor/holofloor/wmarble,
@@ -2695,6 +2722,12 @@
 /obj/machinery/fitness/punching_bag/clown,
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/holodeck/source_gym)
+"xe" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/supply)
 "xp" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -2723,6 +2756,9 @@
 /obj/effect/landmark/costume/elpresidente,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_game_room)
+"zw" = (
+/turf/simulated/shuttle/wall,
+/area/shuttle/supply)
 "zA" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
@@ -2807,6 +2843,10 @@
 /obj/effect/landmark/costume/cutewitch,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_game_room)
+"DE" = (
+/obj/effect/blocker,
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/centcom)
 "DL" = (
 /obj/effect/floor_decal/sign/small_b,
 /turf/simulated/floor/holofloor/wood,
@@ -2829,6 +2869,9 @@
 	icon_state = "white"
 	},
 /area/holodeck/source_patient_ward)
+"EA" = (
+/turf/unsimulated/map,
+/area/space)
 "ED" = (
 /obj/structure/fitness/weightlifter,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -2873,18 +2916,19 @@
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
 "IF" = (
-/obj/effect/shuttle_landmark{
-	base_area = /area/space;
-	base_turf = /turf/space;
-	landmark_tag = "escape_transit";
-	name = "Escape Transit"
-	},
-/turf/space/transit/east,
+/turf/simulated/floor/outdoors/grass/virgo3c,
 /area/space)
 "Jc" = (
 /obj/item/toy/chess/bishop_white,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"JH" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/simulated/floor,
+/area/shuttle/supply)
 "JI" = (
 /obj/item/toy/chess/rook_white,
 /turf/simulated/floor/holofloor/bmarble,
@@ -2924,6 +2968,12 @@
 	icon_state = "white"
 	},
 /area/holodeck/source_patient_ward)
+"Ma" = (
+/mob/living/simple_mob/vore/woof/hostile/aweful/ranged{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/centcom)
 "Me" = (
 /turf/simulated/floor/smole/desert,
 /area/holodeck/source_smoleworld)
@@ -2931,6 +2981,15 @@
 /obj/item/toy/chess/bishop_white,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
+"Ms" = (
+/turf/unsimulated/wall,
+/area/centcom)
+"Mx" = (
+/obj/structure/shuttle/engine/propulsion{
+	icon_state = "burst_r"
+	},
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/supply)
 "ML" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -2951,6 +3010,10 @@
 /obj/item/weapon/dice/d4,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_game_room)
+"NJ" = (
+/mob/living/simple_mob/vore/woof/hostile/aweful/ranged,
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/centcom)
 "NT" = (
 /obj/structure/table/holotable,
 /obj/effect/floor_decal/corner/paleblue{
@@ -2963,6 +3026,11 @@
 	icon_state = "white"
 	},
 /area/holodeck/source_patient_ward)
+"Ok" = (
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/centcom)
 "Or" = (
 /obj/item/toy/chess/knight_white,
 /turf/simulated/floor/holofloor/bmarble,
@@ -3016,6 +3084,12 @@
 	icon_state = "white"
 	},
 /area/holodeck/source_patient_ward)
+"Tt" = (
+/mob/living/simple_mob/vore/woof/hostile/aweful/ranged{
+	dir = 1
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/centcom)
 "TH" = (
 /obj/structure/table/holotable,
 /obj/effect/floor_decal/corner/paleblue{
@@ -3033,6 +3107,9 @@
 /obj/effect/landmark/costume/chicken,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_game_room)
+"TN" = (
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/centcom)
 "Ug" = (
 /obj/effect/floor_decal/carpet{
 	dir = 5
@@ -3072,6 +3149,17 @@
 	icon_state = "white"
 	},
 /area/holodeck/source_patient_ward)
+"WB" = (
+/obj/machinery/door/airlock/angled_bay/external/glass{
+	dir = 4;
+	door_color = "#822a1e";
+	frequency = 1380;
+	id_tag = "supply_shuttle_hatch";
+	locked = 1;
+	name = "Shuttle Hatch"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/supply)
 "Xh" = (
 /obj/effect/floor_decal/carpet{
 	dir = 5
@@ -3108,6 +3196,16 @@
 	},
 /turf/space/transit/east,
 /area/space)
+"XL" = (
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	frequency = 1380;
+	id_tag = "supply_shuttle";
+	pixel_y = 24;
+	req_one_access = list(13,31);
+	tag_door = "supply_shuttle_hatch"
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/supply)
 "Yn" = (
 /turf/simulated/floor/holofloor/tiled{
 	icon_state = "monotile"
@@ -3167,6 +3265,10 @@
 "ZF" = (
 /turf/space/transit/north,
 /area/space)
+"ZM" = (
+/obj/machinery/light,
+/turf/simulated/shuttle/floor,
+/area/shuttle/supply)
 "ZQ" = (
 /obj/effect/floor_decal/sign/small_c,
 /turf/simulated/floor/holofloor/wood,
@@ -3431,29 +3533,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (3,1,1) = {"
@@ -3573,29 +3675,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (4,1,1) = {"
@@ -3715,29 +3817,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (5,1,1) = {"
@@ -3857,29 +3959,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (6,1,1) = {"
@@ -3999,29 +4101,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (7,1,1) = {"
@@ -4141,29 +4243,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (8,1,1) = {"
@@ -4283,29 +4385,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (9,1,1) = {"
@@ -4425,29 +4527,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (10,1,1) = {"
@@ -4567,29 +4669,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (11,1,1) = {"
@@ -4709,29 +4811,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (12,1,1) = {"
@@ -4851,29 +4953,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (13,1,1) = {"
@@ -4993,29 +5095,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (14,1,1) = {"
@@ -5135,29 +5237,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (15,1,1) = {"
@@ -5277,29 +5379,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (16,1,1) = {"
@@ -5419,29 +5521,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (17,1,1) = {"
@@ -5561,29 +5663,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (18,1,1) = {"
@@ -5703,29 +5805,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (19,1,1) = {"
@@ -5845,29 +5947,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (20,1,1) = {"
@@ -5987,29 +6089,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (21,1,1) = {"
@@ -6129,29 +6231,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (22,1,1) = {"
@@ -6271,29 +6373,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (23,1,1) = {"
@@ -6413,29 +6515,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (24,1,1) = {"
@@ -6555,29 +6657,29 @@ ap
 ap
 ap
 jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
-jZ
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
+EA
 jZ
 "}
 (25,1,1) = {"
@@ -9598,41 +9700,41 @@ ap
 ap
 ap
 ap
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -9740,41 +9842,41 @@ ap
 ap
 ap
 ap
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -9882,41 +9984,41 @@ ap
 ap
 ap
 ap
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -10024,41 +10126,41 @@ ap
 ap
 ap
 ap
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -10166,11 +10268,11 @@ ap
 ap
 ap
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
 iv
 iv
@@ -10196,11 +10298,11 @@ iv
 iv
 iv
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -10308,41 +10410,41 @@ ap
 ap
 ap
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -10450,41 +10552,41 @@ aI
 aI
 ar
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -10592,41 +10694,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -10734,41 +10836,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -10876,41 +10978,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -11018,41 +11120,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+Ma
+Ma
+Ma
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -11160,41 +11262,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+DE
+DE
+DE
+DE
+DE
+DE
+DE
+DE
+DE
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -11302,41 +11404,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+DE
+IF
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -11444,41 +11546,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+DE
+IF
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -11586,41 +11688,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+NJ
+DE
+IF
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+Tt
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -11728,41 +11830,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+NJ
+DE
+IF
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+Tt
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -11870,41 +11972,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+DE
+IF
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -12012,41 +12114,41 @@ aL
 aL
 ar
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+NJ
+DE
+IF
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+Tt
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -12154,41 +12256,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+NJ
+DE
+IF
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+Tt
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -12296,41 +12398,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+DE
 IF
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -12438,41 +12540,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+DE
+IF
+IF
+IF
+IF
+IF
+IF
+IF
+DE
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -12580,41 +12682,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+DE
+IF
+IF
+IF
+oK
+IF
+IF
+IF
+DE
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -12722,41 +12824,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+DE
+DE
+DE
+DE
+DE
+DE
+DE
+DE
+DE
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -12864,41 +12966,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+lp
+lp
+lp
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -13006,41 +13108,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -13148,41 +13250,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -13290,41 +13392,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -13432,41 +13534,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
+TN
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -13574,11 +13676,11 @@ aL
 aL
 ar
 ap
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
 iv
 iv
 iv
@@ -13604,11 +13706,11 @@ iv
 iv
 iv
 iv
-fh
-fh
-fh
-fh
-fh
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -13716,41 +13818,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -13858,41 +13960,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -14000,41 +14102,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -14142,41 +14244,41 @@ fZ
 fZ
 xp
 ap
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
-fh
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 ap
 ap
 ap
@@ -21415,19 +21517,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
 ZC
 ZF
 ZF
@@ -21557,19 +21659,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -21699,19 +21801,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+zw
+zw
+zw
+WB
+WB
+zw
+zw
+zw
+zw
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -21841,19 +21943,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+zw
+xe
+up
+up
+up
+up
+up
+ZM
+zw
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -21983,19 +22085,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+zw
+up
+up
+up
+up
+up
+up
+zw
+zw
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -22125,19 +22227,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+mV
+XL
+up
+up
+up
+up
+up
+JH
+Mx
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -22267,19 +22369,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+zw
+up
+up
+up
+up
+up
+up
+zw
+zw
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -22409,19 +22511,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+zw
+xe
+up
+up
+up
+up
+up
+ZM
+zw
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -22551,19 +22653,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+zw
+zw
+zw
+zw
+zw
+zw
+zw
+zw
+zw
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -22693,19 +22795,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ok
+Ms
 ZC
 ZF
 ZF
@@ -22835,19 +22937,19 @@ El
 El
 El
 El
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
 ZC
 ZF
 ZF
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index 34aa8adb5a..b5c9e383c7 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -122,6 +122,12 @@
 /obj/structure/table/reinforced,
 /turf/simulated/floor,
 /area/groundbase/engineering/lobby)
+"ar" = (
+/obj/effect/landmark{
+	name = "droppod_landing"
+	},
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level1/southeastspur)
 "as" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/light{
@@ -3132,8 +3138,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/iaa1)
 "iL" = (
-/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
-/area/maintenance/groundbase/level1/nwtunnel)
+/obj/effect/landmark{
+	name = "droppod_landing"
+	},
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level1/northspur)
 "iM" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -6758,8 +6767,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
 "sF" = (
-/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
-/area/maintenance/groundbase/level1/netunnel)
+/turf/simulated/floor/outdoors/grass/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level1/eastspur)
 "sI" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -6816,6 +6827,11 @@
 	},
 /turf/simulated/floor/bmarble,
 /area/groundbase/cargo/mining)
+"sO" = (
+/turf/simulated/floor/outdoors/grass/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level1/westspur)
 "sP" = (
 /obj/structure/table/standard,
 /obj/random/tech_supply,
@@ -7125,6 +7141,12 @@
 /obj/machinery/oxygen_pump/anesthetic,
 /turf/simulated/wall,
 /area/groundbase/medical/or2)
+"tE" = (
+/obj/effect/landmark{
+	name = "droppod_landing"
+	},
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level1/westspur)
 "tF" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -7151,6 +7173,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
+"tI" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/sidewalk/side/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level1/westspur)
 "tJ" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -7263,14 +7293,10 @@
 /turf/simulated/wall,
 /area/groundbase/level1/se)
 "ub" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance_hatch{
-	name = "Power Substation";
-	req_access = list(11)
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/structure/grille,
 /turf/simulated/floor,
 /area/maintenance/groundbase/substation/medcargo)
 "uc" = (
@@ -7919,6 +7945,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/apparel)
+"vQ" = (
+/turf/simulated/floor/outdoors/grass/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/security/lobby)
 "vR" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/weapon/folder/red,
@@ -8734,8 +8765,13 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/ce)
 "xU" = (
-/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
-/area/maintenance/groundbase/level1/stunnel)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/outdoors/sidewalk/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level1/eastspur)
 "xV" = (
 /obj/structure/table/bench/steel,
 /obj/structure/cable/yellow{
@@ -13735,8 +13771,10 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos/monitoring)
 "LK" = (
-/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
-/area/maintenance/groundbase/level1/swtunnel)
+/turf/simulated/floor/outdoors/grass/forest/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level1/eastspur)
 "LL" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -14831,7 +14869,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/outdoors/newdirt/virgo3c,
-/area/groundbase/level1/ne)
+/area/groundbase/cargo/mining)
 "OG" = (
 /obj/machinery/alarm,
 /turf/simulated/floor/bluegrid,
@@ -16183,7 +16221,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/simulated/floor/outdoors/newdirt/virgo3c{
+/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
 	outdoors = 0
 	},
 /area/groundbase/security/halls)
@@ -18084,7 +18122,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
 "Yj" = (
-/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
+/turf/simulated/floor/outdoors/newdirt/virgo3c,
 /area/groundbase/level1/sw)
 "Yk" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -19333,7 +19371,7 @@ cB
 QD
 QD
 QD
-QD
+tE
 QD
 QD
 QD
@@ -19765,9 +19803,9 @@ QD
 cB
 cB
 cB
+Eg
+ca
 ca
-Eg
-Eg
 AZ
 AZ
 AZ
@@ -19879,7 +19917,7 @@ FF
 MO
 MO
 WB
-Rn
+WB
 WB
 MO
 MO
@@ -19907,11 +19945,11 @@ QD
 cB
 cB
 cB
+Eg
+ca
+ca
 ca
 ca
-Eg
-Eg
-Eg
 AZ
 AZ
 AZ
@@ -20050,11 +20088,11 @@ cB
 cB
 cB
 cB
+Eg
+ca
+ca
 ca
 ca
-Eg
-Eg
-LK
 AZ
 dM
 dM
@@ -20161,8 +20199,8 @@ MO
 FF
 FF
 FF
-WB
-WB
+FF
+FF
 MO
 MO
 MO
@@ -20193,10 +20231,10 @@ cB
 cB
 cB
 cB
+Eg
+ca
+ca
 ca
-Eg
-Eg
-LK
 dM
 dM
 dM
@@ -20478,10 +20516,10 @@ YM
 cB
 cB
 cB
-ca
 Eg
-LK
-LK
+ca
+ca
+dM
 dM
 dM
 dM
@@ -20609,7 +20647,7 @@ MO
 AZ
 AZ
 WB
-Rn
+WB
 Rn
 cB
 cB
@@ -20620,9 +20658,9 @@ cB
 cB
 cB
 cB
-ca
 Eg
-LK
+ca
+ca
 AZ
 AZ
 AZ
@@ -20751,7 +20789,7 @@ MO
 AZ
 AZ
 WB
-Rn
+WB
 Rn
 cB
 cB
@@ -20762,8 +20800,8 @@ cB
 cB
 cB
 cB
-ca
 Eg
+ca
 AZ
 AZ
 AZ
@@ -21031,11 +21069,11 @@ MO
 MO
 MO
 MO
-FF
-Bu
-FF
 WB
-Rn
+Bu
+WB
+WB
+WB
 Rn
 cB
 cB
@@ -21172,10 +21210,10 @@ MO
 MO
 FF
 MO
-FF
-FF
+WB
+WB
 Bu
-FF
+WB
 WB
 WB
 Rn
@@ -21317,9 +21355,9 @@ JQ
 JQ
 JQ
 pa
-iL
 WB
-Rn
+WB
+WB
 Rn
 cB
 cB
@@ -21459,8 +21497,8 @@ MO
 MO
 MO
 AZ
-iL
-Rn
+WB
+WB
 Rn
 cB
 cB
@@ -21618,7 +21656,7 @@ cB
 cB
 cB
 Eg
-Eg
+ca
 ca
 AZ
 AZ
@@ -21761,9 +21799,9 @@ cB
 cB
 cB
 Eg
-Eg
 ca
-LK
+ca
+ca
 AZ
 dM
 dM
@@ -21905,9 +21943,9 @@ cB
 cB
 Eg
 ca
-LK
-LK
-LK
+ca
+dM
+dM
 dM
 dM
 AZ
@@ -24605,12 +24643,12 @@ AZ
 AZ
 AZ
 AZ
-cB
-cB
-cB
-Yf
-cB
-ij
+sO
+sO
+sO
+tI
+sO
+vQ
 fm
 Ch
 wl
@@ -24921,7 +24959,7 @@ SP
 Al
 aR
 SK
-ca
+dM
 ca
 AZ
 AZ
@@ -25206,7 +25244,7 @@ na
 aR
 SK
 ca
-Eg
+ca
 lb
 ca
 ca
@@ -25348,7 +25386,7 @@ Tf
 Tf
 Tf
 Tf
-Eg
+ca
 tF
 zQ
 zQ
@@ -25494,8 +25532,8 @@ vM
 Wm
 vM
 vM
-Eg
-Eg
+ca
+ca
 ca
 ca
 AZ
@@ -25781,8 +25819,8 @@ vM
 vM
 AZ
 AZ
-Eg
-Eg
+ca
+ca
 AZ
 AZ
 AZ
@@ -26007,7 +26045,7 @@ FF
 FF
 co
 WB
-Rn
+WB
 Rn
 Eb
 Nv
@@ -26044,12 +26082,12 @@ rT
 rT
 rT
 AZ
-Yj
-rT
 rT
+LH
+LH
 AZ
-rT
-rT
+LH
+LH
 rT
 Tf
 Tf
@@ -26183,15 +26221,15 @@ Tv
 ma
 rT
 rT
-rT
-rT
+LH
+LH
 AZ
-rT
-rT
-rT
-rT
-rT
-Yj
+LH
+LH
+LH
+LH
+LH
+LH
 Yj
 AZ
 AZ
@@ -26324,15 +26362,15 @@ Ds
 vd
 ma
 rT
-rT
-rT
+LH
+LH
+LH
+LH
 Yj
 Yj
-Yj
-Yj
-rT
-rT
-Yj
+LH
+LH
+LH
 Yj
 vM
 vM
@@ -26466,9 +26504,9 @@ To
 vd
 ma
 AZ
-Yj
-Yj
-Yj
+LH
+LH
+LH
 Yj
 vM
 vM
@@ -26608,8 +26646,8 @@ eh
 kc
 ma
 AZ
-Yj
-Yj
+LH
+LH
 Yj
 vM
 vM
@@ -26662,7 +26700,7 @@ MO
 MO
 MO
 MO
-FF
+WB
 Jh
 FF
 MO
@@ -26751,7 +26789,7 @@ Pf
 ma
 AZ
 AZ
-Yj
+LH
 Yj
 vM
 vM
@@ -26944,12 +26982,12 @@ MO
 MO
 MO
 MO
-iL
-iL
+WB
+WB
 WB
 Jh
 WB
-FF
+WB
 FF
 MO
 MO
@@ -27230,9 +27268,9 @@ tG
 tG
 tG
 Rn
-Rn
+WB
 Jh
-Rn
+WB
 Rn
 MO
 MO
@@ -27251,7 +27289,7 @@ MO
 MO
 tG
 tG
-WL
+tG
 WL
 WL
 MO
@@ -27393,7 +27431,7 @@ tG
 tG
 tG
 tG
-WL
+tG
 WL
 WL
 tG
@@ -27535,7 +27573,7 @@ tG
 UX
 UX
 UX
-dL
+UX
 dL
 WL
 tG
@@ -27677,7 +27715,7 @@ UX
 UX
 tG
 tG
-dL
+UX
 dL
 dL
 UX
@@ -27819,7 +27857,7 @@ tG
 tG
 tG
 UX
-dL
+UX
 WL
 dL
 UX
@@ -27961,7 +27999,7 @@ tG
 tG
 tG
 tG
-WL
+tG
 WL
 WL
 tG
@@ -28103,7 +28141,7 @@ Ul
 Ul
 Ul
 Ul
-Hn
+Ul
 Hn
 Hn
 Ul
@@ -28188,9 +28226,9 @@ AZ
 AZ
 AZ
 AZ
-xU
+vp
 SH
-Cb
+vp
 vp
 AZ
 AZ
@@ -28209,7 +28247,7 @@ UX
 UX
 UX
 UX
-UX
+iL
 UX
 UX
 UX
@@ -28245,7 +28283,7 @@ tG
 tG
 tG
 tG
-WL
+tG
 WL
 WL
 tG
@@ -28387,7 +28425,7 @@ UX
 UX
 UX
 UX
-dL
+UX
 dL
 dL
 UX
@@ -28472,7 +28510,7 @@ AZ
 AZ
 AZ
 AZ
-vp
+nS
 NK
 ww
 ww
@@ -28529,7 +28567,7 @@ UX
 UX
 UX
 UX
-dL
+UX
 WL
 dL
 UX
@@ -28617,7 +28655,7 @@ AZ
 AZ
 AZ
 nS
-vp
+nS
 SH
 AZ
 AZ
@@ -28671,7 +28709,7 @@ tG
 tG
 tG
 UX
-WL
+tG
 WL
 WL
 tG
@@ -28813,7 +28851,7 @@ tG
 tG
 tG
 tG
-WL
+tG
 WL
 WL
 qE
@@ -28928,7 +28966,7 @@ qE
 qE
 iG
 Ro
-iG
+UE
 UE
 UE
 qE
@@ -28955,7 +28993,7 @@ qE
 qE
 qE
 qE
-WL
+tG
 WL
 qE
 qE
@@ -29070,8 +29108,8 @@ iH
 iH
 iH
 Ro
-sF
-sF
+UE
+UE
 UE
 qE
 qE
@@ -29212,8 +29250,8 @@ iY
 iY
 nk
 Ro
-sF
-sF
+UE
+UE
 qE
 qE
 qE
@@ -29354,8 +29392,8 @@ iY
 iY
 nk
 Ro
-sF
-pU
+UE
+UE
 qE
 qE
 qE
@@ -29496,8 +29534,8 @@ iH
 iH
 iH
 Ro
-pU
-pU
+UE
+UE
 qE
 qE
 qE
@@ -29638,7 +29676,7 @@ qE
 qE
 qE
 Ro
-pU
+UE
 qE
 qE
 qE
@@ -29780,7 +29818,7 @@ qE
 qE
 qE
 Ro
-pU
+UE
 qE
 qE
 qE
@@ -30602,8 +30640,8 @@ Lt
 ck
 Lt
 Lt
-nS
-nS
+vp
+vp
 SH
 nS
 nS
@@ -30744,8 +30782,8 @@ ck
 ck
 Lt
 vp
-nS
-nS
+vp
+vp
 SH
 nS
 Lt
@@ -30885,9 +30923,9 @@ ck
 ck
 ck
 Cb
-Cb
 vp
-nS
+vp
+vp
 SH
 nS
 Lt
@@ -32503,7 +32541,7 @@ pU
 pU
 pU
 Ro
-pU
+UE
 qE
 qE
 qE
@@ -32645,8 +32683,8 @@ qE
 qE
 qE
 Ro
-sF
-pU
+UE
+UE
 qE
 qE
 NI
@@ -33069,7 +33107,7 @@ qE
 qE
 qE
 UE
-iG
+UE
 Ro
 MK
 MK
@@ -33210,7 +33248,7 @@ qE
 MK
 MK
 qE
-UE
+iG
 iG
 KT
 MK
@@ -33372,7 +33410,7 @@ Ah
 Ah
 MK
 MK
-MK
+sF
 MK
 MK
 qE
@@ -33514,7 +33552,7 @@ Ah
 Ah
 Ah
 MK
-MK
+sF
 MK
 MK
 MK
@@ -33656,7 +33694,7 @@ MK
 MK
 MK
 MK
-MK
+sF
 MK
 MK
 MK
@@ -33798,7 +33836,7 @@ MK
 MK
 MK
 MK
-MK
+sF
 MK
 MK
 MK
@@ -33940,7 +33978,7 @@ ho
 ho
 ho
 ho
-ho
+xU
 ho
 ho
 ho
@@ -34082,7 +34120,7 @@ MK
 MK
 MK
 MK
-MK
+sF
 MK
 MK
 MK
@@ -34224,7 +34262,7 @@ MK
 MK
 MK
 MK
-MK
+sF
 MK
 MK
 MK
@@ -34366,7 +34404,7 @@ MK
 Ah
 MK
 Ah
-MK
+sF
 Ah
 Ah
 Ah
@@ -34508,7 +34546,7 @@ Ah
 Ah
 Ah
 Ah
-Ah
+LK
 Ah
 Ah
 Ah
@@ -34650,7 +34688,7 @@ Ah
 Ah
 Ah
 Ah
-Ah
+LK
 Ah
 Ah
 Ah
@@ -34792,7 +34830,7 @@ Ah
 MK
 MK
 Ah
-Ah
+LK
 Ah
 Ah
 Ah
@@ -34934,7 +34972,7 @@ MK
 MK
 Ah
 Ah
-Ah
+LK
 Ah
 Ah
 MK
@@ -35076,7 +35114,7 @@ MK
 MK
 MK
 MK
-MK
+sF
 Ah
 Ah
 MK
@@ -35090,7 +35128,7 @@ qE
 qE
 qE
 zf
-vj
+sV
 vj
 Lt
 Lt
@@ -35218,7 +35256,7 @@ MK
 MK
 MK
 MK
-MK
+sF
 MK
 MK
 MK
@@ -36006,7 +36044,7 @@ Pp
 Pp
 Pp
 Pp
-Pp
+ar
 Pp
 Pp
 Pp
@@ -37490,8 +37528,8 @@ uH
 uH
 uH
 uH
-Lb
-Lb
+uH
+uH
 Lb
 Lb
 Lb
@@ -37632,13 +37670,13 @@ uH
 uH
 uH
 uH
-Lb
-Lb
+uH
+uH
 qE
 Lb
 sV
 qE
-sV
+vj
 vj
 vj
 vj
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 86a082f6cf..ee742b024e 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -895,6 +895,14 @@
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room4)
+"cJ" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/se)
 "cK" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -1186,6 +1194,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/science/hall)
+"dG" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 5
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/se)
 "dH" = (
 /obj/machinery/status_display/supply_display,
 /turf/simulated/wall,
@@ -1683,6 +1699,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/groundbase/command/hop)
+"fi" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 10
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/se)
 "fj" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -4178,6 +4202,14 @@
 "ni" = (
 /turf/unsimulated/wall/planetary/virgo3c,
 /area/groundbase/level2/ne)
+"nj" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 9
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/se)
 "nk" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -4244,6 +4276,12 @@
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
+"nq" = (
+/obj/effect/landmark{
+	name = "droppod_landing"
+	},
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level2/se)
 "nt" = (
 /obj/item/weapon/stamp/rd,
 /turf/simulated/floor/tiled,
@@ -6272,6 +6310,12 @@
 /obj/machinery/chemical_dispenser/full,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/Chemistry)
+"ub" = (
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/se)
 "ue" = (
 /obj/machinery/button/remote/airlock{
 	dir = 8;
@@ -6593,6 +6637,14 @@
 /obj/structure/fence,
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/cargo/bay)
+"vl" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/se)
 "vm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -7871,6 +7923,10 @@
 "zs" = (
 /turf/simulated/wall,
 /area/groundbase/civilian/chapel)
+"zt" = (
+/obj/structure/fence/corner,
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/cargo/bay)
 "zw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -9861,6 +9917,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/command/hop)
+"Fs" = (
+/turf/simulated/floor/outdoors/newdirt/virgo3c{
+	outdoors = 0
+	},
+/area/groundbase/level2/nw)
 "Ft" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
@@ -10749,6 +10810,12 @@
 	},
 /turf/simulated/floor/carpet,
 /area/groundbase/civilian/chapel)
+"Ic" = (
+/obj/effect/landmark{
+	name = "droppod_landing"
+	},
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level2/sw)
 "Ie" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -11301,10 +11368,9 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot/storage)
 "JN" = (
-/obj/structure/fence{
+/obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/floor_decal/industrial/outline,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/cargo/bay)
 "JO" = (
@@ -11504,6 +11570,16 @@
 "Kl" = (
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/cargo/office)
+"Km" = (
+/obj/effect/shuttle_landmark{
+	base_area = /area/groundbase/cargo/bay;
+	base_turf = /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c;
+	docking_controller = "cargo_bay";
+	landmark_tag = "supply_station";
+	name = "Cargo Landing Pad"
+	},
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/cargo/bay)
 "Kn" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -11857,6 +11933,14 @@
 	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level2/ne)
+"Lx" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/se)
 "Ly" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -13550,9 +13634,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/bridge)
 "Qu" = (
-/obj/structure/fence/corner,
-/turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/cargo/bay)
+/obj/effect/landmark{
+	name = "droppod_landing"
+	},
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level2/ne)
 "Qv" = (
 /obj/machinery/vending/wardrobe/cargodrobe,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -14724,6 +14810,12 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/triage)
+"TI" = (
+/obj/structure/fence/corner{
+	dir = 10
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/cargo/bay)
 "TJ" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/item/weapon/towel/random,
@@ -15981,6 +16073,9 @@
 /obj/structure/sign/department/mail{
 	pixel_y = 32
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/groundbase/cargo/office)
 "XU" = (
@@ -16169,6 +16264,14 @@
 	},
 /turf/simulated/floor/tiled/eris/cafe,
 /area/groundbase/civilian/kitchen)
+"YC" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 6
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/level2/se)
 "YF" = (
 /obj/machinery/firealarm{
 	dir = 4
@@ -16472,8 +16575,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/bridge)
 "ZI" = (
-/obj/structure/fence{
-	dir = 4
+/obj/effect/floor_decal/industrial/outline,
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	dir = 4;
+	frequency = 1380;
+	id_tag = "cargo_bay";
+	pixel_x = -23
 	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/cargo/bay)
@@ -17200,9 +17307,9 @@ xE
 KW
 KW
 KW
-KW
-KW
-KW
+Fs
+Fs
+pw
 bY
 bY
 bY
@@ -17342,9 +17449,9 @@ KW
 KW
 KW
 KW
-KW
-KW
-KW
+Fs
+Fs
+pw
 bY
 bY
 Jc
@@ -17484,9 +17591,9 @@ xE
 KW
 xE
 xE
-KW
-KW
-KW
+Fs
+Fs
+pw
 bY
 Jc
 Jc
@@ -17626,8 +17733,8 @@ KW
 KW
 xE
 xE
-KW
-KW
+Fs
+Fs
 xE
 bY
 bY
@@ -19381,7 +19488,7 @@ Fl
 Fl
 Fl
 Fl
-Fl
+Ic
 Fl
 Fl
 jG
@@ -26932,7 +27039,7 @@ UE
 UE
 UE
 UE
-UE
+nq
 UE
 UE
 UE
@@ -28839,8 +28946,8 @@ Wj
 oa
 Wj
 Wj
-to
-to
+vk
+TI
 to
 to
 NC
@@ -28979,10 +29086,10 @@ pB
 KU
 fq
 PI
+ZI
 PI
-JN
-to
-to
+KU
+MH
 to
 to
 NC
@@ -29043,15 +29150,15 @@ Bo
 Bo
 Bo
 Bo
-Nq
-Nq
-Nq
-Nq
-Nq
-Nq
-Nq
-Nq
-Nq
+nj
+cJ
+cJ
+cJ
+cJ
+cJ
+cJ
+cJ
+fi
 Vs
 Vs
 Bo
@@ -29122,9 +29229,9 @@ KU
 KU
 KU
 KU
-ZI
-to
-to
+KU
+KU
+MH
 to
 to
 NC
@@ -29185,6 +29292,7 @@ At
 Bo
 Bo
 Bo
+Lx
 Nq
 Nq
 Nq
@@ -29192,8 +29300,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 Bo
 Bo
 Bo
@@ -29262,11 +29369,11 @@ KU
 KU
 KU
 KU
-PI
-PI
-JN
-to
-to
+KU
+KU
+KU
+KU
+MH
 to
 to
 NC
@@ -29327,6 +29434,7 @@ kU
 kU
 kU
 Sd
+Lx
 Nq
 Nq
 Nq
@@ -29334,8 +29442,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 Bo
 Bo
 Bo
@@ -29406,9 +29513,9 @@ KU
 KU
 KU
 KU
-ZI
-to
-to
+KU
+KU
+MH
 to
 to
 NC
@@ -29469,6 +29576,7 @@ GM
 GM
 GM
 kU
+Lx
 Nq
 Nq
 Nq
@@ -29476,8 +29584,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 Bo
 Bo
 Bo
@@ -29539,18 +29646,18 @@ ks
 ks
 to
 MH
-PI
-PI
-PI
-KU
-KU
-KU
-KU
-PI
-PI
 JN
-to
-to
+JN
+JN
+JN
+JN
+JN
+JN
+JN
+JN
+JN
+JN
+MH
 Pt
 to
 NC
@@ -29611,6 +29718,7 @@ NR
 la
 GM
 oQ
+Lx
 Nq
 Nq
 Nq
@@ -29618,8 +29726,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 UE
 UE
 UE
@@ -29690,9 +29797,9 @@ KU
 KU
 KU
 KU
-ZI
-to
-to
+KU
+KU
+MH
 XC
 XJ
 NC
@@ -29753,6 +29860,7 @@ xF
 gN
 mQ
 kU
+Lx
 Nq
 Nq
 Nq
@@ -29760,8 +29868,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 UE
 UE
 UE
@@ -29823,18 +29930,18 @@ ks
 to
 to
 MH
-PI
-PI
-PI
 KU
 KU
 KU
 KU
-PI
-PI
-JN
-to
-to
+KU
+KU
+KU
+KU
+KU
+KU
+KU
+MH
 gM
 to
 NC
@@ -29895,6 +30002,7 @@ jo
 qC
 UT
 kU
+Lx
 Nq
 Nq
 Nq
@@ -29902,8 +30010,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 UE
 UE
 UE
@@ -29974,9 +30081,9 @@ KU
 KU
 KU
 KU
-ZI
-to
-to
+KU
+KU
+MH
 to
 to
 NC
@@ -30037,6 +30144,7 @@ GC
 iC
 Bf
 kU
+Lx
 Nq
 Nq
 Nq
@@ -30044,8 +30152,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 UE
 UE
 UE
@@ -30107,18 +30214,18 @@ to
 to
 to
 MH
-PI
-PI
-PI
+KU
+Km
 KU
 KU
 KU
 KU
-PI
-PI
-JN
-to
-to
+KU
+KU
+KU
+KU
+KU
+MH
 to
 to
 NC
@@ -30179,6 +30286,7 @@ GC
 Jl
 Bf
 kU
+Lx
 Nq
 Nq
 Nq
@@ -30186,8 +30294,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 UE
 UE
 UE
@@ -30258,9 +30365,9 @@ KU
 KU
 KU
 KU
-ZI
-to
-to
+KU
+KU
+MH
 to
 to
 NC
@@ -30321,6 +30428,7 @@ GC
 Jl
 Bf
 kU
+Lx
 Nq
 Nq
 Nq
@@ -30328,8 +30436,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 UE
 UE
 UE
@@ -30391,18 +30498,18 @@ to
 iw
 iw
 MH
-PI
-PI
-PI
 KU
 KU
 KU
 KU
-PI
-PI
-JN
-to
-to
+KU
+KU
+KU
+KU
+KU
+KU
+KU
+MH
 to
 to
 NC
@@ -30463,7 +30570,7 @@ GC
 Jl
 Bf
 kU
-Nq
+Lx
 Nq
 Nq
 Nq
@@ -30471,7 +30578,7 @@ nG
 Nq
 Nq
 Nq
-Nq
+ub
 UE
 UE
 UE
@@ -30542,9 +30649,9 @@ KU
 KU
 KU
 KU
-ZI
-to
-to
+KU
+KU
+MH
 to
 to
 NC
@@ -30605,6 +30712,7 @@ GC
 Jl
 Bf
 kU
+Lx
 Nq
 Nq
 Nq
@@ -30612,8 +30720,7 @@ Nq
 Nq
 Nq
 Nq
-Nq
-Nq
+ub
 UE
 UE
 UE
@@ -30675,18 +30782,18 @@ iw
 iw
 to
 MH
-PI
-PI
-PI
 KU
 KU
 KU
 KU
-PI
-PI
-JN
-to
-to
+KU
+KU
+KU
+KU
+KU
+KU
+KU
+MH
 to
 to
 Hu
@@ -30747,15 +30854,15 @@ GC
 Jl
 Bf
 kU
-Nq
-Nq
-Nq
-Nq
-Nq
-Nq
-Nq
-Nq
-Nq
+dG
+vl
+vl
+vl
+vl
+vl
+vl
+vl
+YC
 Bo
 Bo
 UE
@@ -30826,9 +30933,9 @@ vk
 vk
 vk
 vk
-Qu
-to
-to
+vk
+vk
+zt
 to
 vb
 to
@@ -31189,7 +31296,7 @@ Bo
 UE
 UE
 UE
-UE
+nq
 UE
 UE
 Bo
@@ -32092,7 +32199,7 @@ iw
 iw
 iw
 iw
-iw
+Qu
 iw
 iw
 to
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index 8557da70cb..37604d01b6 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -2,6 +2,12 @@
 "aa" = (
 /turf/simulated/wall,
 /area/groundbase/exploration/equipment)
+"ai" = (
+/obj/effect/landmark{
+	name = "droppod_landing"
+	},
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level3/sw)
 "ak" = (
 /obj/structure/table/glass,
 /obj/item/weapon/paper_bin,
@@ -47,6 +53,12 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/shuttle/groundbase/exploration)
+"bi" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/exploration/equipment)
 "bk" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/tiled,
@@ -170,6 +182,14 @@
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/tiled,
 /area/groundbase/exploration/equipment)
+"dR" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/civilian/pilot)
 "dU" = (
 /obj/structure/table/bench/marble,
 /obj/structure/cable/yellow{
@@ -189,6 +209,21 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/computer/ship/engines,
+/turf/simulated/floor/tiled,
+/area/shuttle/groundbase/exploration)
+"ei" = (
+/obj/structure/panic_button{
+	pixel_x = 32;
+	pixel_y = 32
+	},
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	dir = 8;
+	frequency = 1380;
+	id_tag = "ex_docker";
+	pixel_x = 27;
+	pixel_y = 4
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
 "ey" = (
@@ -273,6 +308,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/virgo3c,
 /area/groundbase/medical/patio)
+"gt" = (
+/turf/simulated/wall,
+/area/groundbase/level3/nw)
 "gu" = (
 /obj/structure/bed/chair/shuttle{
 	dir = 4
@@ -336,9 +374,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
-/obj/item/weapon/paper{
-	info = "out of order"
-	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
 "hD" = (
@@ -432,6 +467,22 @@
 /obj/random/mob/bird,
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/level3/sw)
+"jo" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/exploration/shuttlepad)
 "jp" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -745,6 +796,14 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/patient4)
+"pd" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/outdoors/grass/virgo3c,
+/area/groundbase/civilian/pilot)
+"pm" = (
+/obj/machinery/computer/shuttle_control/explore/gbexplo,
+/turf/simulated/floor/tiled,
+/area/shuttle/groundbase/exploration)
 "pq" = (
 /obj/machinery/button/remote/airlock{
 	dir = 4;
@@ -929,9 +988,26 @@
 /obj/item/clothing/head/helmet/space/void/exploration,
 /turf/simulated/floor/tiled,
 /area/groundbase/exploration/equipment)
+"tY" = (
+/obj/machinery/power/apc{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/exploration/shuttlepad)
 "tZ" = (
 /turf/simulated/mineral/cave/virgo3c,
 /area/groundbase/level3/se)
+"ub" = (
+/obj/effect/landmark{
+	name = "droppod_landing"
+	},
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level3/se)
 "ui" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
@@ -1236,6 +1312,9 @@
 /area/groundbase/medical/patient3)
 "Ak" = (
 /obj/machinery/recharge_station,
+/obj/machinery/alarm{
+	pixel_y = 28
+	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
 "As" = (
@@ -1246,6 +1325,9 @@
 	},
 /turf/simulated/floor,
 /area/groundbase/medical/patient2)
+"Bb" = (
+/turf/simulated/open/virgo3c,
+/area/groundbase/cargo/bay/above)
 "Bd" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -1257,6 +1339,10 @@
 "Bg" = (
 /turf/unsimulated/wall/planetary/virgo3c,
 /area/groundbase/level3/sw)
+"Bo" = (
+/obj/machinery/computer/ship/sensors,
+/turf/simulated/floor/tiled,
+/area/shuttle/groundbase/exploration)
 "Bw" = (
 /obj/machinery/hologram/holopad,
 /obj/structure/cable/yellow{
@@ -1315,10 +1401,26 @@
 	},
 /turf/simulated/floor/tiled,
 /area/shuttle/groundbase/exploration)
+"Dy" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	dir = 4;
+	frequency = 1380;
+	id_tag = "expshuttle_dock";
+	pixel_x = -19;
+	req_one_access = list(19,43,67)
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/exploration/shuttlepad)
 "DE" = (
 /obj/machinery/shipsensors{
 	dir = 1
 	},
+/obj/machinery/light,
 /turf/simulated/shuttle/plating/airless,
 /area/shuttle/groundbase/exploration)
 "DI" = (
@@ -1359,6 +1461,17 @@
 	},
 /turf/simulated/open,
 /area/groundbase/medical/uhallway)
+"Ea" = (
+/obj/effect/shuttle_landmark{
+	base_area = /area/groundbase/exploration/shuttlepad;
+	base_turf = /turf/simulated/floor/reinforced/virgo3c;
+	docking_controller = "expshuttle_dock";
+	landmark_tag = "gb_excursion_pad";
+	name = "Excursion Shuttlepad"
+	},
+/obj/effect/overmap/visitable/ship/landable/gbexplo,
+/turf/simulated/floor/tiled,
+/area/shuttle/groundbase/exploration)
 "Ef" = (
 /obj/effect/landmark/start{
 	name = "Field Medic"
@@ -1565,6 +1678,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
 /area/groundbase/level3/nw)
+"Hm" = (
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/exploration/shuttlepad)
 "Hn" = (
 /obj/machinery/light{
 	dir = 8
@@ -1876,6 +1994,12 @@
 /obj/item/clothing/head/helmet/space/void/expedition_medical,
 /turf/simulated/floor/tiled,
 /area/groundbase/exploration/equipment)
+"Oc" = (
+/obj/machinery/light,
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/exploration/shuttlepad)
 "Og" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -2180,6 +2304,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/pilot)
+"Ts" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/outdoors/sidewalk/virgo3c,
+/area/groundbase/exploration/equipment)
 "Tv" = (
 /obj/structure/table/glass,
 /obj/item/weapon/paper_bin,
@@ -2195,21 +2328,19 @@
 /obj/machinery/atmospheric_field_generator/perma/underdoors,
 /obj/machinery/door/firedoor/glass/talon,
 /obj/machinery/door/airlock/science{
+	frequency = null;
 	name = "Shuttle";
 	req_one_access = null
 	},
+/obj/effect/map_helper/airlock/door/simple,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/shuttle/groundbase/exploration)
 "Ue" = (
-/obj/effect/shuttle_landmark{
-	base_area = /area/groundbase/cargo/office;
-	base_turf = /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c;
-	docking_controller = "cargo_bay";
-	landmark_tag = "supply_station";
-	name = "Cargo Landing Pad"
+/obj/effect/landmark{
+	name = "droppod_landing"
 	},
-/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
-/area/groundbase/cargo/office)
+/turf/simulated/floor/outdoors/grass/forest/virgo3c,
+/area/groundbase/level3/nw)
 "Uf" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -2384,6 +2515,10 @@
 	edge_blending_priority = -1
 	},
 /area/groundbase/exploration/shuttlepad)
+"XT" = (
+/obj/machinery/computer/ship/helm,
+/turf/simulated/floor/tiled,
+/area/shuttle/groundbase/exploration)
 "Yy" = (
 /obj/structure/table/rack,
 /obj/item/clothing/shoes/magboots,
@@ -2472,6 +2607,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/paramedic)
+"Zx" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced/virgo3c{
+	edge_blending_priority = -1
+	},
+/area/groundbase/exploration/shuttlepad)
 "ZH" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -4616,7 +4759,7 @@ rl
 rl
 rl
 rl
-rl
+ai
 rl
 rl
 rl
@@ -5101,7 +5244,7 @@ Qa
 Qa
 Qa
 Qa
-Qa
+Ue
 Qa
 Qa
 Qa
@@ -6373,7 +6516,7 @@ zG
 ma
 Ka
 aa
-qO
+bi
 Qa
 Qa
 Qa
@@ -6515,7 +6658,7 @@ Og
 YJ
 HE
 dE
-uF
+Ts
 uF
 mU
 Qa
@@ -6657,7 +6800,7 @@ IC
 Pf
 FV
 aa
-qO
+bi
 Qa
 Fx
 Qa
@@ -7219,17 +7362,17 @@ qO
 qO
 qO
 aa
-qO
-qO
-qO
-qO
-qO
-qO
+Zx
+Hm
+tY
+Hm
+Oc
+gt
 qO
 qO
 Fx
 qO
-qO
+pd
 GU
 Wm
 uP
@@ -7360,10 +7503,10 @@ qO
 qO
 pv
 jY
-jY
+Dy
 jY
 pL
-Oh
+jo
 Oh
 Oh
 Oh
@@ -7371,7 +7514,7 @@ XC
 SG
 ZH
 GW
-GW
+dR
 xO
 Nf
 Zp
@@ -7513,7 +7656,7 @@ Bd
 qO
 cf
 qO
-qO
+pd
 GU
 Wm
 Tk
@@ -7786,7 +7929,7 @@ qO
 qO
 uG
 jX
-dW
+pm
 Dm
 Jh
 wn
@@ -7928,7 +8071,7 @@ qO
 qO
 uG
 jX
-dW
+XT
 Dm
 hC
 oQ
@@ -8070,7 +8213,7 @@ qO
 qO
 uG
 jX
-dW
+Bo
 Dm
 dW
 cE
@@ -8213,8 +8356,8 @@ qO
 uG
 PH
 dX
-dW
-dW
+ei
+Ea
 Nb
 vV
 PH
@@ -9619,7 +9762,7 @@ Qa
 Qa
 Qa
 Qa
-Qa
+Ue
 Qa
 Qa
 Qa
@@ -13189,7 +13332,7 @@ Lf
 Lf
 Lf
 Lf
-Ue
+Lf
 Lf
 Lf
 Lf
@@ -15100,13 +15243,13 @@ cj
 cj
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -15242,13 +15385,13 @@ cj
 cj
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -15384,13 +15527,13 @@ yA
 yA
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -15526,13 +15669,13 @@ yA
 yA
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -15595,17 +15738,17 @@ kB
 IS
 IS
 IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
 IS
 IS
 IS
@@ -15668,13 +15811,13 @@ yA
 yA
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -15737,17 +15880,17 @@ kB
 IS
 IS
 IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
 IS
 IS
 IS
@@ -15810,13 +15953,13 @@ yA
 yA
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -15879,17 +16022,17 @@ kB
 IS
 IS
 IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
 IS
 IS
 IS
@@ -15952,13 +16095,13 @@ yA
 cj
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -16021,17 +16164,17 @@ IS
 IS
 IS
 IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
 IS
 IS
 IS
@@ -16094,13 +16237,13 @@ yA
 cj
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -16163,17 +16306,17 @@ IS
 IS
 IS
 IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
 IS
 IS
 IS
@@ -16236,13 +16379,13 @@ yA
 cj
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -16305,17 +16448,17 @@ IS
 IS
 IS
 IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
 IS
 IS
 IS
@@ -16378,13 +16521,13 @@ yA
 cj
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -16447,17 +16590,17 @@ IS
 IS
 IS
 IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
 IS
 IS
 IS
@@ -16520,13 +16663,13 @@ yA
 cj
 cj
 cj
-yA
-yA
-yA
-yA
-yA
-yA
-yA
+cj
+cj
+cj
+cj
+cj
+cj
+cj
 cj
 cj
 cj
@@ -16589,17 +16732,17 @@ IS
 IS
 IS
 IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
-IS
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
+Bb
 IS
 IS
 IS
@@ -19080,7 +19223,7 @@ Xv
 Xv
 Xv
 Xv
-Xv
+ub
 Xv
 Xv
 Xv
diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index b90ae2f892..23584544fb 100644
--- a/maps/groundbase/groundbase_areas.dm
+++ b/maps/groundbase/groundbase_areas.dm
@@ -244,6 +244,8 @@
 	name = "Cargo Office"
 /area/groundbase/cargo/bay
 	name = "Cargo Bay"
+/area/groundbase/cargo/bay/above
+	base_turf = /turf/simulated/open/virgo3c
 /area/groundbase/cargo/qm
 	name = "Quartermaster's Office"
 /area/groundbase/cargo/mining
@@ -290,7 +292,6 @@
 /area/groundbase/civilian/apparel
 	name = "Crew Apparel Care"
 
-
 /area/groundbase/exploration
 	name = "Exploration"
 	holomap_color = HOLOMAP_AREACOLOR_SCIENCE
diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm
index c3653b9a5b..4715bbd255 100644
--- a/maps/groundbase/groundbase_defines.dm
+++ b/maps/groundbase/groundbase_defines.dm
@@ -264,8 +264,8 @@
 	skybox_pixel_x = 0
 	skybox_pixel_y = 0
 
-	initial_generic_waypoints = list("groundbase")
-	initial_restricted_waypoints = list("Exploration Shuttle" = list("gbexplo"))
+	initial_generic_waypoints = list("groundbase", "gb_excursion_pad")
+	initial_restricted_waypoints = list()
 
 	extra_z_levels = list()
 
@@ -377,8 +377,8 @@
 /////EXPLOSHUTTL/////
 // The shuttle's 'shuttle' computer
 /obj/machinery/computer/shuttle_control/explore/gbexplo
-	name = "Shuttle control console"
-	shuttle_tag = "gbexplo"
+	name = "short jump console"
+	shuttle_tag = "Exploration Shuttle"
 	req_one_access = list(access_pilot)
 
 /obj/effect/overmap/visitable/ship/landable/gbexplo
@@ -386,18 +386,18 @@
 	desc = "A small shuttle from Rascal's Pass."
 	vessel_mass = 2500
 	vessel_size = SHIP_SIZE_TINY
-	shuttle = "gbexplo"
+	shuttle = "Exploration Shuttle"
 	known = TRUE
 
 // A shuttle lateloader landmark
 
 /datum/shuttle/autodock/overmap/gbexplo
-	name = "Exploration Shuttlepad"
-	current_location = "ex_shuttlepad"
-	docking_controller_tag = "ex_docker"
+	name = "Exploration Shuttle"
+	current_location = "gb_excursion_pad"
+	docking_controller_tag = "expshuttle_docker"
 	shuttle_area = list(/area/shuttle/groundbase/exploration)
 	fuel_consumption = 1
-	defer_initialisation = TRUE
+	move_direction = NORTH
 
 /area/shuttle/groundbase/exploration
 	icon = 'icons/turf/areas_vr.dmi'
@@ -418,6 +418,7 @@
 	docking_controller_tag = "supply_shuttle"
 	flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY
 	move_direction = WEST
+	ceiling_type = /turf/simulated/floor/reinforced/virgo3c
 
 ////////////////////////////////////////////////
 
@@ -432,6 +433,7 @@
 	move_time = SHUTTLE_TRANSIT_DURATION_RETURN
 	move_direction = SOUTH
 	docking_controller_tag = "escape_shuttle"
+	ceiling_type = /turf/simulated/floor/reinforced/virgo3c
 
 /obj/effect/shuttle_landmark/premade/groundbase
 	name = "Rascal's Pass"
@@ -509,49 +511,49 @@
 
  				Setup: <br> <br>
 
-           			 CAUTION: Do not remove too much air from the work space or personnel may be exposed to hypoxia or similar effects. <br> <br>
+					 CAUTION: Do not remove too much air from the work space or personnel may be exposed to hypoxia or similar effects. <br> <br>
 
-    				1. Prepare setup area. Remove machinery, debris, foreign objects, people, and extra air. <br> <br>
-    
-    				2. Lay out preliminary electrical wiring. <br>
-    				 2a. Connect electrical wiring to existing facility power grid. <br>
-    				 2b. Work wiring into shape as defined in TO 1-33-34-4-1 Figure 32 Index 6. <br>
-    
-    				3. Prepare gathered steel supplies as defined in TO 1-33-34-4-1 Figure 2 Index 3. <br>
-    
-    				4. Assemble prepared steel supplies into equipment framework by inserting rod A into slot B. Refer to TO 1-33-34-4-1 Figure 1 Index 1 for technical drawings. <br>
-    				 4a. Secure assembled equipment framework to flooring by tightening lower frame bolts. <br> <br>
-    
-    				5. Install and secure circuitry board, REG-D into marked receptacle. <br> <br>
-    
-    				6. Install electrical wiring. Refer to TO 1-33-34-4-1 Figure 666 Index 6 thru Index 90 for routing. <br> <br>
-    
-    				7. Install capacitors into marked circuitry board slots. Do not force components into place, use even pressure. Do not use a hammer. <br> <br>
-    
-    				        <b>WARNING</b>: Assembly will rapidly inflate when finalization is triggered. Ensure personnel and equipment are clear before initiating. <br> <br>
-    
-    				8. Finalize construction by turning the Initialize Finalization screw on the outer housing. <br> <br>
-    
-    				9. Wait for assembly to finish inflating, and the unit is ready for service. <br> <br>
-    
+					1. Prepare setup area. Remove machinery, debris, foreign objects, people, and extra air. <br> <br>
+	
+					2. Lay out preliminary electrical wiring. <br>
+					 2a. Connect electrical wiring to existing facility power grid. <br>
+					 2b. Work wiring into shape as defined in TO 1-33-34-4-1 Figure 32 Index 6. <br>
+	
+					3. Prepare gathered steel supplies as defined in TO 1-33-34-4-1 Figure 2 Index 3. <br>
+	
+					4. Assemble prepared steel supplies into equipment framework by inserting rod A into slot B. Refer to TO 1-33-34-4-1 Figure 1 Index 1 for technical drawings. <br>
+					 4a. Secure assembled equipment framework to flooring by tightening lower frame bolts. <br> <br>
+	
+					5. Install and secure circuitry board, REG-D into marked receptacle. <br> <br>
+	
+					6. Install electrical wiring. Refer to TO 1-33-34-4-1 Figure 666 Index 6 thru Index 90 for routing. <br> <br>
+	
+					7. Install capacitors into marked circuitry board slots. Do not force components into place, use even pressure. Do not use a hammer. <br> <br>
+	
+							<b>WARNING</b>: Assembly will rapidly inflate when finalization is triggered. Ensure personnel and equipment are clear before initiating. <br> <br>
+	
+					8. Finalize construction by turning the Initialize Finalization screw on the outer housing. <br> <br>
+	
+					9. Wait for assembly to finish inflating, and the unit is ready for service. <br> <br>
+	
 
  				Operating Procedures: <br> <br>
 
-    				    NOTE: Operation of REG-D type generators requires significant physical effort. Ensure users are provided adequare nutrition and hydration throughout the working period. <br> <br>
-        
-    					1. Designate the individual who will be operating the REG-D. <br> <br>
-    
-    					2. Provide a safety briefing regarding nutritional preparedness and physical ability.  <br> <br>
-    
-    					    NOTE: Stretching is highly recommended before and after any operation session. <br> <br>
-        
-    					3. Operator shall board the REG-D track body and ensure there are no unsecured objects on the path. <br> <br>
-    
-    					4. Once ready, Operator may begin running at own pace. Do not sprint. Maintain an even pace and proper running form for optimal energy generation. <br> <br>
-    
-    					5. Continue to run on the REG-D track body until sufficient energy is stored in systems or Operator is no longer able or willing to continue. <br> <br>
-    
-					    6. To end a session, carefully lower forward running speed until the track body comes to a complete stop, then disembark the REG-D. <br> <br>
+						NOTE: Operation of REG-D type generators requires significant physical effort. Ensure users are provided adequare nutrition and hydration throughout the working period. <br> <br>
+		
+						1. Designate the individual who will be operating the REG-D. <br> <br>
+	
+						2. Provide a safety briefing regarding nutritional preparedness and physical ability.  <br> <br>
+	
+							NOTE: Stretching is highly recommended before and after any operation session. <br> <br>
+
+						3. Operator shall board the REG-D track body and ensure there are no unsecured objects on the path. <br> <br>
+	
+						4. Once ready, Operator may begin running at own pace. Do not sprint. Maintain an even pace and proper running form for optimal energy generation. <br> <br>
+	
+						5. Continue to run on the REG-D track body until sufficient energy is stored in systems or Operator is no longer able or willing to continue. <br> <br>
+	
+						6. To end a session, carefully lower forward running speed until the track body comes to a complete stop, then disembark the REG-D. <br> <br>
 
 
 					 REFER TO TO 1-33-34-6 FOR MAINTENANCE AND INSPECTION PROCEDURES