diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm
index 6e0d51d46d..4be8f92f4a 100644
--- a/maps/groundbase/gb-centcomm.dmm
+++ b/maps/groundbase/gb-centcomm.dmm
@@ -24,8 +24,7 @@
 	landmark_tag = "escape_cc";
 	name = "Escape Shuttle"
 	},
-/obj/effect/map_helper/airlock/door/simple,
-/turf/simulated/shuttle/plating/airless,
+/turf/simulated/shuttle/plating,
 /area/shuttle/escape{
 	base_turf = /turf/simulated/floor/tiled/techfloor/grid
 	})
@@ -63,7 +62,7 @@
 /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
 	})
@@ -79,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{
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 988e3feaa8..ee742b024e 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -16073,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" = (
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index 16e7ed8bb4..37604d01b6 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -1325,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
@@ -15735,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
@@ -15877,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
@@ -16019,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
@@ -16161,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
@@ -16303,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
@@ -16445,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
@@ -16587,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
@@ -16729,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
diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index 401e935ac6..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