diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index 59153efc97f..18c9a094194 100644
--- a/maps/groundbase/groundbase_areas.dm
+++ b/maps/groundbase/groundbase_areas.dm
@@ -316,6 +316,7 @@
 	lightswitch = 1
 /area/groundbase/engineering/ce
 	name = "Chief Engineer's Office"
+	lightswitch = 1
 /area/groundbase/engineering/workshop
 	name = "Engineering Workshop"
 	lightswitch = 1
diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm
index 205d3500e0c..d0af16f4721 100644
--- a/maps/groundbase/rp-z1.dmm
+++ b/maps/groundbase/rp-z1.dmm
@@ -1370,16 +1370,6 @@
 "bsJ" = (
 /turf/simulated/mineral/cave,
 /area/groundbase/level1/se)
-"bsO" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/floor_decal/milspec/color/orange/half{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/atmos_personal,
-/turf/simulated/floor/tiled,
-/area/groundbase/engineering/workshop)
 "btM" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -3198,15 +3188,15 @@
 /turf/simulated/floor/outdoors/grass/seasonal,
 /area/groundbase/level1/nw)
 "cZC" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor,
 /area/groundbase/engineering/storage)
 "cZU" = (
@@ -3294,7 +3284,7 @@
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 1
 	},
-/obj/structure/closet/firecloset/full,
+/obj/structure/closet/firecloset/full/atmos,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos)
 "ddP" = (
@@ -3658,10 +3648,12 @@
 "dtZ" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
-/obj/structure/window/reinforced/polarized/full,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/window/reinforced/polarized/full{
+	id = "ce_office"
+	},
 /turf/simulated/floor,
 /area/groundbase/engineering/ce)
 "duA" = (
@@ -4056,7 +4048,7 @@
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 1
 	},
-/obj/structure/closet/firecloset/full,
+/obj/structure/closet/firecloset/full/atmos,
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/atmos)
 "dMt" = (
@@ -6600,7 +6592,9 @@
 "gkN" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
-/obj/structure/window/reinforced/polarized/full,
+/obj/structure/window/reinforced/polarized/full{
+	id = "ce_office"
+	},
 /turf/simulated/floor,
 /area/groundbase/engineering/ce)
 "gkU" = (
@@ -8725,6 +8719,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor,
 /area/groundbase/engineering/storage)
 "ilL" = (
@@ -9897,20 +9894,15 @@
 /turf/simulated/floor,
 /area/groundbase/engineering/storage)
 "jnI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
+/obj/effect/floor_decal/milspec/color/orange/half{
+	dir = 8
 	},
-/turf/simulated/floor,
-/area/groundbase/engineering/storage)
+/obj/structure/closet/secure_closet/atmos_personal,
+/turf/simulated/floor/tiled,
+/area/groundbase/engineering/workshop)
 "jop" = (
 /obj/machinery/vending/security,
 /obj/effect/floor_decal/milspec/color/red/half,
@@ -10798,19 +10790,18 @@
 "kdL" = (
 /obj/structure/table/reinforced,
 /obj/random/mug{
-	pixel_y = 7
+	pixel_y = 5
 	},
 /obj/random/mug{
 	pixel_x = 7;
-	pixel_y = 5
+	pixel_y = 3
 	},
-/obj/random/mug,
 /obj/random/mug{
-	pixel_x = 6;
 	pixel_y = -2
 	},
-/obj/machinery/camera/network/engineering{
-	dir = 8
+/obj/random/mug{
+	pixel_x = 6;
+	pixel_y = -4
 	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/groundbase/engineering/breakroom)
@@ -15245,6 +15236,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor,
 /area/groundbase/engineering/storage)
 "ooV" = (
@@ -16910,7 +16904,7 @@
 /turf/simulated/floor/water/seasonal{
 	outdoors = 0
 	},
-/area/groundbase/level1/se)
+/area/groundbase/engineering/pumpingstation)
 "pFX" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/yellow{
@@ -20991,18 +20985,16 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/civilian/bar)
 "sXR" = (
-/obj/structure/closet/radiation,
-/obj/item/device/geiger,
-/obj/item/device/geiger,
-/obj/item/device/geiger,
-/obj/item/clothing/head/radiation,
-/obj/item/clothing/head/radiation,
-/obj/item/clothing/suit/radiation,
-/obj/item/clothing/suit/radiation,
-/obj/item/clothing/suit/radiation/teshari,
-/obj/item/clothing/head/radiation/teshari,
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized/full{
+	id = "ce_office"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor,
-/area/groundbase/engineering/storage)
+/area/groundbase/engineering/ce)
 "sZc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/floor_decal/milspec/color/orange/half{
@@ -21416,8 +21408,17 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
 "tuJ" = (
+/obj/structure/closet/radiation,
+/obj/item/device/geiger,
+/obj/item/device/geiger,
+/obj/item/device/geiger,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/head/radiation,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/suit/radiation/teshari,
+/obj/item/clothing/head/radiation/teshari,
 /obj/machinery/light,
-/obj/structure/closet/firecloset/full/atmos,
 /turf/simulated/floor,
 /area/groundbase/engineering/storage)
 "tuO" = (
@@ -25402,6 +25403,9 @@
 /obj/structure/noticeboard{
 	pixel_x = 32
 	},
+/obj/machinery/camera/network/engineering{
+	dir = 8
+	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/groundbase/engineering/breakroom)
 "xgd" = (
@@ -25852,10 +25856,10 @@
 /area/groundbase/science/circuits)
 "xAS" = (
 /obj/structure/table/reinforced,
+/obj/random/soap,
 /obj/item/weapon/towel/random,
 /obj/item/weapon/towel/random,
 /obj/item/weapon/towel/random,
-/obj/random/soap,
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 8
 	},
@@ -38792,7 +38796,7 @@ wws
 pNE
 wSp
 wSp
-bsO
+jnI
 gYs
 uby
 wAO
@@ -39512,7 +39516,7 @@ lok
 ukd
 waD
 wPs
-jnI
+hfT
 cZC
 qGj
 tVT
@@ -39789,7 +39793,7 @@ aXg
 hMq
 gdO
 qhM
-dtZ
+sXR
 ukd
 vSz
 sPu
@@ -39797,7 +39801,7 @@ sPu
 sPu
 sPu
 eUW
-sXR
+sPu
 lyV
 bzN
 pVL
diff --git a/maps/groundbase/rp-z2.dmm b/maps/groundbase/rp-z2.dmm
index 58842d69bd8..829d57887e0 100644
--- a/maps/groundbase/rp-z2.dmm
+++ b/maps/groundbase/rp-z2.dmm
@@ -58,8 +58,11 @@
 /turf/simulated/floor/wood,
 /area/groundbase/cargo/qm)
 "an" = (
-/obj/structure/sign/department/engine,
-/turf/simulated/wall/r_wall,
+/obj/machinery/door/airlock/glass_engineering{
+	name = "Engineering Hangar"
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
 /area/groundbase/engineering/shuttlepad)
 "as" = (
 /obj/machinery/computer/prisoner{
@@ -1207,7 +1210,7 @@
 /area/groundbase/command/bridge)
 "dP" = (
 /obj/structure/stairs/spawner/east,
-/turf/simulated/floor/outdoors/grass/seasonal/dark,
+/turf/simulated/floor/outdoors/sidewalk/side,
 /area/groundbase/level2/se)
 "dQ" = (
 /obj/structure/railing,
@@ -1335,11 +1338,14 @@
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
 "ei" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/structure/railing{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/monotile,
-/area/groundbase/engineering/shuttlepad)
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/simulated/floor/outdoors/grass/seasonal,
+/area/groundbase/level2/ne)
 "ek" = (
 /obj/effect/floor_decal/chapel{
 	dir = 1
@@ -1683,6 +1689,12 @@
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/bathroom)
+"fq" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/monotile,
+/area/groundbase/engineering/shuttlepad)
 "fs" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -1752,14 +1764,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
 "fC" = (
-/obj/machinery/power/apc{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	id_tag = "engshuttle_dock";
+	pixel_y = 26;
+	tag_door = "eng_shuttle_airlock"
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/groundbase/engineering/shuttlepad)
@@ -2457,10 +2465,8 @@
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/bathroom)
 "ic" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/monotile,
+/obj/structure/sign/department/engine,
+/turf/simulated/wall/r_wall,
 /area/groundbase/engineering/shuttlepad)
 "ie" = (
 /obj/structure/table/standard,
@@ -8991,12 +8997,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/power/apc{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/groundbase/engineering/shuttlepad)
 "Ek" = (
@@ -9138,8 +9147,10 @@
 /turf/simulated/floor/outdoors/sidewalk/slab,
 /area/groundbase/level2/sw)
 "EM" = (
-/obj/structure/sign/department/eva,
-/turf/simulated/wall/r_wall,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/groundbase/engineering/shuttlepad)
 "EP" = (
 /obj/structure/table/reinforced,
@@ -9364,20 +9375,12 @@
 /turf/simulated/floor/plating,
 /area/groundbase/command/bridge)
 "FI" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
-	id_tag = "engshuttle_dock";
-	pixel_y = 26;
-	tag_door = "eng_shuttle_airlock"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/groundbase/engineering/shuttlepad)
 "FK" = (
@@ -11488,7 +11491,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/turf/simulated/open,
+/turf/simulated/floor/outdoors/grass/seasonal,
 /area/groundbase/level2/ne)
 "Mw" = (
 /obj/structure/cable/yellow{
@@ -13345,11 +13348,8 @@
 	},
 /area/groundbase/level2/nw)
 "Sf" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+	dir = 6
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/groundbase/engineering/shuttlepad)
@@ -14476,11 +14476,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
 "VH" = (
-/obj/machinery/door/airlock/glass_engineering{
-	name = "Engineering Hangar"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
+/obj/structure/sign/department/eva,
+/turf/simulated/wall/r_wall,
 /area/groundbase/engineering/shuttlepad)
 "VI" = (
 /obj/machinery/light,
@@ -15501,15 +15498,9 @@
 /turf/simulated/floor/tiled,
 /area/groundbase/security/processing)
 "Zu" = (
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
 /turf/simulated/floor/tiled/monotile,
 /area/groundbase/engineering/shuttlepad)
 "Zv" = (
@@ -27457,7 +27448,7 @@ zJ
 zJ
 zJ
 zJ
-zJ
+KF
 IO
 eJ
 OW
@@ -27598,11 +27589,11 @@ KF
 zJ
 zJ
 zJ
-zJ
-zJ
-EM
+KF
+KF
+IO
 fC
-ic
+OW
 lg
 ms
 Dp
@@ -27736,15 +27727,15 @@ VW
 VW
 VW
 IY
-jj
-jj
-Hu
-jj
-jj
-jj
+KF
+KF
+zJ
+zJ
+KF
+KF
 VH
 Sf
-OW
+EM
 lg
 oH
 sW
@@ -27878,15 +27869,15 @@ VW
 VW
 VW
 IY
-KF
-KF
-Sa
-zJ
-zJ
-zJ
+jj
+jj
+Hu
+jj
+jj
+jj
 an
 Zu
-ei
+OW
 Pl
 pm
 Bg
@@ -28024,11 +28015,11 @@ KF
 KF
 Sa
 zJ
-zJ
-zJ
-IO
+KF
+KF
+ic
 FI
-OW
+fq
 lg
 ms
 Cc
@@ -28167,7 +28158,7 @@ KF
 Sa
 zJ
 zJ
-zJ
+KF
 IO
 Ej
 OW
@@ -29274,7 +29265,7 @@ Ng
 Ng
 pi
 Mv
-yI
+ei
 bR
 bR
 pp
@@ -29700,9 +29691,9 @@ ZF
 MR
 Jv
 pC
-of
-of
-of
+pC
+pC
+pC
 jj
 jj
 jj
@@ -30157,7 +30148,7 @@ kp
 KF
 KF
 bs
-KF
+Sa
 kp
 kp
 rh
diff --git a/maps/groundbase/rp-z3.dmm b/maps/groundbase/rp-z3.dmm
index afa8b97e2da..b9d735f3a48 100644
--- a/maps/groundbase/rp-z3.dmm
+++ b/maps/groundbase/rp-z3.dmm
@@ -450,6 +450,9 @@
 "gt" = (
 /obj/structure/table/glass,
 /obj/random/soap,
+/obj/machinery/alarm{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/medicalshowers)
 "gA" = (
@@ -2477,10 +2480,6 @@
 "Cy" = (
 /turf/simulated/open,
 /area/groundbase/cargo/office)
-"Cz" = (
-/obj/machinery/power/apc,
-/turf/simulated/wall,
-/area/groundbase/medical/medicalshowers)
 "CC" = (
 /obj/machinery/camera/network/medbay{
 	dir = 4
@@ -3608,12 +3607,6 @@
 	},
 /turf/simulated/floor/bmarble,
 /area/groundbase/cargo/office)
-"Op" = (
-/obj/machinery/alarm{
-	dir = 1
-	},
-/turf/simulated/wall,
-/area/groundbase/medical/medicalshowers)
 "Ot" = (
 /turf/simulated/floor/bmarble,
 /area/groundbase/cargo/office)
@@ -4593,6 +4586,7 @@
 /obj/item/weapon/towel/random,
 /obj/machinery/light,
 /obj/structure/cable/yellow,
+/obj/machinery/power/apc,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/medicalshowers)
 "YO" = (
@@ -20287,7 +20281,7 @@ op
 Vy
 kT
 YI
-Cz
+RM
 Wy
 Wy
 MB
@@ -20429,7 +20423,7 @@ DG
 CW
 pS
 gt
-Op
+RM
 Wy
 Wy
 MB