diff --git a/maps/groundbase/rp-z2.dmm b/maps/groundbase/rp-z2.dmm
index 3fcb7769656..104af7b7b31 100644
--- a/maps/groundbase/rp-z2.dmm
+++ b/maps/groundbase/rp-z2.dmm
@@ -4409,6 +4409,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
 "po" = (
@@ -5482,6 +5483,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/chapel)
+"sH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/computer/guestpass{
+	dir = 4;
+	pixel_x = -22
+	},
+/turf/simulated/floor/tiled,
+/area/ai_monitored/storage/eva)
 "sJ" = (
 /turf/simulated/wall,
 /area/groundbase/level2/ne)
@@ -8993,11 +9002,10 @@
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room6)
 "EZ" = (
-/obj/machinery/computer/guestpass{
-	dir = 4;
-	pixel_x = -22
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
 "Fb" = (
@@ -20058,7 +20066,7 @@ TH
 ma
 QS
 Xp
-Xp
+sH
 Xp
 Xp
 EZ
diff --git a/maps/groundbase/rp-z3.dmm b/maps/groundbase/rp-z3.dmm
index cd982831566..6473e8bd03a 100644
--- a/maps/groundbase/rp-z3.dmm
+++ b/maps/groundbase/rp-z3.dmm
@@ -1531,13 +1531,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/groundbase/medical/cmo)
-"sH" = (
-/turf/simulated/floor/water/atoll{
-	desc = "This water looks pretty shallow and calm. You'd almost feel bad for hopping in and disturbing its serene flatness. Steam wafts off of the surface!";
-	name = "hotspring";
-	outdoors = 1
-	},
-/area/groundbase/level3/nw)
 "sK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2195,14 +2188,6 @@
 /obj/structure/disposalpipe/down,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/level3/nw)
-"yC" = (
-/obj/effect/map_effect/interval/effect_emitter/steam/less_frequent,
-/turf/simulated/floor/water/atoll{
-	desc = "This water looks pretty shallow and calm. You'd almost feel bad for hopping in and disturbing its serene flatness. Steam wafts off of the surface!";
-	name = "hotspring";
-	outdoors = 1
-	},
-/area/groundbase/level3/nw)
 "yD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -5031,10 +5016,10 @@ nX
 nX
 nX
 nX
-sH
-sH
-sH
-sH
+Mz
+Mz
+Mz
+Mz
 nX
 nX
 nX
@@ -5174,10 +5159,10 @@ nX
 Mz
 Mz
 Mz
-sH
-sH
-sH
-sH
+Mz
+Mz
+Mz
+Mz
 nX
 nX
 nX
@@ -5316,11 +5301,11 @@ Ue
 Mz
 na
 Mz
-sH
-sH
-sH
-sH
-sH
+Mz
+Mz
+Mz
+Mz
+Mz
 nX
 nX
 nX
@@ -5456,14 +5441,14 @@ Ue
 Ue
 Ue
 Ue
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
 nX
 nX
 nX
@@ -5598,14 +5583,14 @@ dO
 dO
 Ue
 Ue
-sH
-sH
-sH
-yC
-sH
-sH
-sH
-sH
+Mz
+Mz
+Mz
+na
+Mz
+Mz
+Mz
+Mz
 nX
 nX
 nX
@@ -5741,14 +5726,14 @@ Ue
 Ue
 Ue
 Ue
-sH
-sH
-sH
-sH
-sH
-sH
-sH
-sH
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
 nX
 nX
 nX
@@ -5884,12 +5869,12 @@ Ue
 Ue
 Ue
 Ue
-sH
-sH
-sH
-sH
-yC
-sH
+Mz
+Mz
+Mz
+Mz
+na
+Mz
 Ue
 Ue
 Ue
@@ -6027,10 +6012,10 @@ Ue
 Ue
 Ue
 Ue
-sH
-sH
-sH
-sH
+Mz
+Mz
+Mz
+Mz
 Ue
 Ue
 Ue