diff --git a/maps/stellardelight/ship_centcom.dmm b/maps/stellardelight/ship_centcom.dmm
index 8185a306419..7026a1dc441 100644
--- a/maps/stellardelight/ship_centcom.dmm
+++ b/maps/stellardelight/ship_centcom.dmm
@@ -2399,7 +2399,7 @@
 /obj/effect/map_helper/airlock/atmos/chamber_pump,
 /obj/effect/shuttle_landmark/shuttle_initializer/ccboat,
 /obj/effect/overmap/visitable/ship/landable/ccboat,
-/turf/simulated/floor/tiled/eris/dark/danger,
+/turf/simulated/floor/airless,
 /area/shuttle/ccboat)
 "ih" = (
 /obj/effect/floor_decal/corner/blue{
@@ -4542,7 +4542,7 @@
 	id_tag = "ccboat";
 	pixel_y = 29
 	},
-/turf/simulated/floor/tiled/eris/dark/danger,
+/turf/simulated/floor/airless,
 /area/shuttle/ccboat)
 "qZ" = (
 /obj/machinery/body_scanconsole{
@@ -4655,7 +4655,7 @@
 	id_tag = null
 	},
 /obj/effect/map_helper/airlock/atmos/chamber_pump,
-/turf/simulated/floor/tiled/eris/dark/danger,
+/turf/simulated/floor/airless,
 /area/shuttle/ccboat)
 "rU" = (
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
@@ -6077,7 +6077,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/eris/dark/danger,
+/turf/simulated/floor/airless,
 /area/shuttle/ccboat)
 "zy" = (
 /obj/effect/floor_decal/derelict/d11,
diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm
index d4a2b5ba031..5172b50ac4e 100644
--- a/maps/stellardelight/stellar_delight1.dmm
+++ b/maps/stellardelight/stellar_delight1.dmm
@@ -640,29 +640,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/aft)
 "bv" = (
-/obj/item/weapon/soap/nanotrasen,
-/obj/item/weapon/soap/nanotrasen,
-/obj/item/weapon/soap/nanotrasen,
-/obj/item/weapon/grenade/chem_grenade/cleaner,
-/obj/item/weapon/grenade/chem_grenade/cleaner,
-/obj/item/weapon/grenade/chem_grenade/cleaner,
-/obj/item/weapon/reagent_containers/spray/cleaner,
-/obj/item/weapon/reagent_containers/spray/cleaner,
-/obj/item/weapon/reagent_containers/spray/cleaner,
-/obj/structure/table/steel,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/obj/machinery/disposal/wall{
-	dir = 1
-	},
-/obj/item/weapon/storage/bag/trash,
-/obj/item/weapon/storage/bag/trash,
-/obj/item/weapon/storage/bag/trash,
-/obj/item/weapon/storage/bag/trash,
-/obj/item/weapon/storage/bag/trash,
-/obj/item/device/lightreplacer,
-/obj/item/weapon/storage/box/lights/mixed,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/monotile,
 /area/janitor)
 "bw" = (
@@ -810,23 +788,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "bJ" = (
-/obj/structure/cable/green{
-	icon_state = "0-4"
-	},
-/obj/machinery/power/apc/angled{
-	dir = 1;
-	name = "night shift APC";
-	nightshift_setting = 2
-	},
-/obj/random/soap,
-/obj/random/soap,
-/obj/item/weapon/towel/random,
-/obj/item/weapon/towel/random,
-/obj/item/clothing/under/bathrobe,
-/obj/item/clothing/under/bathrobe,
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/white,
-/area/stellardelight/deck1/shower)
+/obj/structure/table/steel,
+/obj/item/weapon/storage/box/lights/mixed,
+/turf/simulated/floor/tiled/monotile,
+/area/janitor)
 "bK" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 8
@@ -1158,16 +1123,7 @@
 /turf/simulated/floor/tiled/eris/steel/panels,
 /area/stellardelight/deck1/pilot)
 "cu" = (
-/obj/machinery/shower{
-	pixel_y = 15
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 10
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/shower)
 "cv" = (
 /obj/structure/cable/green{
@@ -2355,11 +2311,9 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/security/warden)
 "fb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
@@ -3082,6 +3036,18 @@
 	},
 /turf/simulated/floor/airless,
 /area/stellardelight/deck1/exterior)
+"gI" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 5
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/stellardelight/deck1/shower)
 "gK" = (
 /obj/structure/table/woodentable,
 /obj/machinery/alarm/angled{
@@ -3912,18 +3878,21 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck1/starboard)
 "in" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 5
+/obj/structure/cable/green{
+	icon_state = "0-4"
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 6
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/machinery/power/apc/angled{
+	dir = 1;
+	name = "night shift APC";
+	nightshift_setting = 2
 	},
+/obj/random/soap,
+/obj/random/soap,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/obj/item/clothing/under/bathrobe,
+/obj/item/clothing/under/bathrobe,
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "io" = (
@@ -3978,12 +3947,16 @@
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck1/portfore)
 "it" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock{
+	name = "Unisex Showers"
+	},
 /obj/structure/cable/green{
-	icon_state = "1-8"
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/shower)
 "iv" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
@@ -4297,16 +4270,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/security_lockerroom)
 "jd" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 10
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 9
-	},
-/obj/machinery/alarm/angled{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/shower)
 "jf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4756,15 +4723,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/storage)
-"kb" = (
-/obj/structure/cable/green{
-	icon_state = "1-8"
-	},
-/obj/machinery/alarm/angled{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/toilet)
 "kc" = (
 /obj/machinery/power/breakerbox/activated{
 	RCon_tag = "Civilian Substation Bypass"
@@ -4932,11 +4890,16 @@
 /area/maintenance/stellardelight/deck1/portfore)
 "ky" = (
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "1-4"
 	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 24
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
@@ -5016,8 +4979,11 @@
 /turf/simulated/floor/airless,
 /area/stellardelight/deck1/exterior)
 "kK" = (
-/obj/machinery/light/small{
-	dir = 4
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
@@ -5082,9 +5048,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/port)
-"kW" = (
-/turf/simulated/floor/tiled/white,
-/area/stellardelight/deck1/shower)
 "kY" = (
 /obj/structure/cable/pink{
 	icon_state = "1-2"
@@ -5554,14 +5517,11 @@
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/shuttlebay)
 "lQ" = (
-/obj/structure/mirror{
-	pixel_y = 38
-	},
-/obj/structure/sink{
-	pixel_y = 20
-	},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/toilet)
+/obj/structure/table/steel,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/turf/simulated/floor/tiled/monotile,
+/area/janitor)
 "lR" = (
 /obj/structure/stairs/spawner/north,
 /obj/structure/railing/grey{
@@ -5677,9 +5637,18 @@
 /turf/simulated/floor/reinforced,
 /area/stellardelight/deck1/shuttlebay)
 "mc" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/toilet)
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/structure/table/steel,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal/wall{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/monotile,
+/area/janitor)
 "md" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -5869,6 +5838,12 @@
 /obj/item/clothing/suit/caution,
 /obj/item/clothing/suit/caution,
 /obj/item/clothing/suit/caution,
+/obj/item/device/lightreplacer,
+/obj/structure/mopbucket,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/storage/bag/trash,
+/obj/item/weapon/soap/nanotrasen,
 /turf/simulated/floor/tiled/monotile,
 /area/janitor)
 "mw" = (
@@ -6384,6 +6359,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
+/obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck1/exploration)
 "nC" = (
@@ -6603,21 +6579,6 @@
 /obj/item/weapon/hand_labeler,
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
-"ob" = (
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/toilet)
 "oc" = (
 /obj/machinery/light{
 	dir = 4
@@ -6856,16 +6817,13 @@
 /area/security/security_cell_hallway)
 "oC" = (
 /obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "1-2"
+	},
+/obj/machinery/firealarm/angled{
+	dir = 4
 	},
 /obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
@@ -7013,13 +6971,9 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/rnd/workshop)
 "oT" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/clothing/under/bathrobe,
-/obj/item/clothing/under/bathrobe,
-/obj/item/weapon/towel/random,
-/obj/item/weapon/towel/random,
-/turf/simulated/floor/tiled/white,
-/area/stellardelight/deck1/shower)
+/obj/structure/closet/l3closet/janitor,
+/turf/simulated/floor/tiled/monotile,
+/area/janitor)
 "oU" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -7467,6 +7421,21 @@
 "pR" = (
 /turf/simulated/wall/bay/brown,
 /area/stellardelight/deck1/miningequipment)
+"pS" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 5
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/white,
+/area/stellardelight/deck1/shower)
 "pT" = (
 /obj/structure/cable/pink{
 	icon_state = "4-8"
@@ -8451,13 +8420,12 @@
 /turf/simulated/floor/lino,
 /area/chapel/office)
 "rZ" = (
-/obj/machinery/door/airlock/angled_bay/standard/color/common{
-	dir = 4;
-	id_tag = "bathroomstall1";
-	name = "Toilet 1"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/steel_ridged,
-/area/crew_quarters/toilet)
+/obj/structure/closet/l3closet/janitor,
+/turf/simulated/floor/tiled/monotile,
+/area/janitor)
 "sa" = (
 /obj/structure/cable/green{
 	color = "#42038a";
@@ -8983,6 +8951,10 @@
 	},
 /turf/simulated/floor/tiled/eris/white/gray_platform,
 /area/gateway)
+"tc" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck1/exploration)
 "td" = (
 /obj/structure/cable/pink{
 	icon_state = "4-8"
@@ -9871,15 +9843,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
 "vd" = (
-/obj/structure/mirror{
-	pixel_y = 38
+/obj/structure/toilet{
+	dir = 4
 	},
-/obj/structure/sink{
-	pixel_y = 20
-	},
-/obj/machinery/light{
-	dir = 8
+/obj/machinery/alarm/angled{
+	dir = 4
 	},
+/obj/effect/landmark/start/visitor,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "ve" = (
@@ -10178,15 +10148,14 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck1/starboard)
 "vM" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/obj/machinery/button/remote/airlock{
+	id = "bathroomstall1";
+	name = "Toilet 1 Lock";
+	pixel_x = -10;
+	pixel_y = 22;
+	specialfunctions = 4
 	},
+/obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "vN" = (
@@ -10547,7 +10516,7 @@
 /turf/simulated/floor/tiled/eris,
 /area/rnd/xenobiology/xenoflora)
 "wJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "wK" = (
@@ -11089,10 +11058,19 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/tactical)
 "xS" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 5
 	},
-/turf/simulated/floor/tiled/steel_ridged,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "xT" = (
 /obj/structure/disposalpipe/segment,
@@ -11244,8 +11222,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "yl" = (
-/obj/machinery/light/small{
-	dir = 8
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/machinery/alarm/angled{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
@@ -12002,18 +11986,11 @@
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/shuttlebay)
 "zP" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 5
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+/obj/structure/cable/green{
+	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "zQ" = (
@@ -13272,6 +13249,18 @@
 "Ct" = (
 /turf/simulated/wall/bay/r_wall/purple,
 /area/assembly/robotics)
+"Cu" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 5
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/stellardelight/deck1/shower)
 "Cv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -13308,14 +13297,12 @@
 /turf/simulated/floor/tiled/white,
 /area/security/detectives_office)
 "CA" = (
-/obj/structure/toilet{
-	dir = 4
+/obj/machinery/door/airlock/angled_bay/standard/color/common{
+	dir = 4;
+	id_tag = "bathroomstall1";
+	name = "Toilet 1"
 	},
-/obj/machinery/alarm/angled{
-	dir = 4
-	},
-/obj/effect/landmark/start/visitor,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/crew_quarters/toilet)
 "CB" = (
 /obj/structure/cable{
@@ -13973,21 +13960,6 @@
 	},
 /turf/simulated/floor,
 /area/stellardelight/deck1/fore)
-"DZ" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 5
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 6
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/white,
-/area/stellardelight/deck1/shower)
 "Eb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -14128,15 +14100,11 @@
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck1/portfore)
 "Ew" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 5
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
+/obj/structure/closet/secure_closet/personal,
+/obj/item/clothing/under/bathrobe,
+/obj/item/clothing/under/bathrobe,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "Ex" = (
@@ -14276,11 +14244,14 @@
 /turf/simulated/floor/tiled/eris/white/bluecorner,
 /area/stellardelight/deck1/paramedic)
 "EN" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
+/obj/structure/mirror{
+	pixel_y = 38
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/sink{
+	pixel_y = 20
+	},
+/obj/machinery/light{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
@@ -14639,10 +14610,7 @@
 /turf/simulated/floor/tiled/milspec,
 /area/stellardelight/deck1/explobriefing)
 "Fz" = (
-/obj/structure/closet/l3closet/janitor,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/monotile,
 /area/janitor)
 "FA" = (
@@ -15757,17 +15725,10 @@
 /area/prison/cell_block/B)
 "Ig" = (
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
-/obj/random/soap,
-/obj/random/soap,
-/obj/item/weapon/towel/random,
-/obj/item/weapon/towel/random,
-/obj/item/clothing/under/bathrobe,
-/obj/item/clothing/under/bathrobe,
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/white,
-/area/stellardelight/deck1/shower)
+/turf/simulated/wall/bay/r_wall/steel,
+/area/crew_quarters/toilet)
 "Ih" = (
 /obj/structure/closet{
 	name = "robotics equipment"
@@ -16218,9 +16179,6 @@
 /area/maintenance/stellardelight/deck1/portcent)
 "IU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "IV" = (
@@ -16751,11 +16709,18 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/dorms/dorm6)
 "Ki" = (
-/obj/structure/mopbucket,
-/obj/item/weapon/mop,
-/obj/item/weapon/reagent_containers/glass/bucket,
-/turf/simulated/floor/tiled/monotile,
-/area/janitor)
+/obj/structure/toilet{
+	dir = 4
+	},
+/obj/machinery/alarm/angled{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/landmark/start/visitor,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/toilet)
 "Kj" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/tiled/eris/white/gray_platform,
@@ -16790,6 +16755,18 @@
 /obj/machinery/portable_atmospherics/canister/air/airlock,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck1/exploration)
+"Ko" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/toilet)
 "Kp" = (
 /obj/structure/bed/chair/comfy/brown{
 	dir = 8
@@ -16865,14 +16842,16 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/fore)
 "Kz" = (
-/obj/machinery/power/apc/angled{
-	dir = 1
+/obj/machinery/button/remote/airlock{
+	id = "bathroomstall2";
+	name = "Toilet 2 Lock";
+	pixel_x = -10;
+	pixel_y = 22;
+	specialfunctions = 4
 	},
+/obj/machinery/light/small,
 /obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/obj/structure/closet/crate/bin{
-	anchored = 1
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
@@ -17253,11 +17232,14 @@
 /turf/simulated/floor/tiled/eris/white/bluecorner,
 /area/medical/exam_room)
 "Ls" = (
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/power/apc/angled{
+	dir = 1
 	},
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "0-2"
+	},
+/obj/structure/closet/crate/bin{
+	anchored = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
@@ -17531,14 +17513,11 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "LR" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/firealarm/angled{
+/obj/machinery/light{
 	dir = 4
 	},
 /obj/structure/cable/green{
-	icon_state = "2-8"
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
@@ -17758,15 +17737,15 @@
 /turf/simulated/floor/bluegrid,
 /area/assembly/robotics)
 "Ms" = (
-/obj/machinery/door/window{
-	dir = 1
-	},
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 9
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 10
 	},
+/obj/structure/curtain/open/privacy{
+	name = "shower curtain"
+	},
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "Mt" = (
@@ -17931,15 +17910,15 @@
 /turf/simulated/floor,
 /area/stellardelight/deck1/dorms/dorm6)
 "MO" = (
-/obj/machinery/button/remote/airlock{
-	id = "bathroomstall1";
-	name = "Toilet 1 Lock";
-	pixel_x = -10;
-	pixel_y = 22;
-	specialfunctions = 4
+/obj/machinery/door/airlock/angled_bay/standard/color/common{
+	dir = 4;
+	id_tag = "bathroomstall2";
+	name = "Toilet 2"
 	},
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/white,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/steel_ridged,
 /area/crew_quarters/toilet)
 "MP" = (
 /obj/machinery/power/pointdefense{
@@ -18046,10 +18025,19 @@
 /turf/simulated/floor/tiled/eris/white/bluecorner,
 /area/stellardelight/deck1/resleeving)
 "MZ" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 5
 	},
-/turf/simulated/floor/tiled/steel_ridged,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "Nb" = (
 /obj/machinery/door/firedoor/glass,
@@ -18323,9 +18311,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "NC" = (
-/obj/structure/mopbucket,
-/obj/item/weapon/mop,
-/obj/item/weapon/reagent_containers/glass/bucket,
 /obj/item/device/radio/intercom{
 	dir = 8;
 	pixel_x = -24
@@ -18832,13 +18817,10 @@
 /turf/simulated/floor/tiled/eris/steel/gray_platform,
 /area/stellardelight/deck1/exploshuttle)
 "OM" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 9
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/shower)
 "ON" = (
 /obj/structure/cable/green{
@@ -18972,9 +18954,14 @@
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck1/exploration)
 "Pf" = (
-/obj/structure/closet/l3closet/janitor,
-/turf/simulated/floor/tiled/monotile,
-/area/janitor)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/toilet)
 "Pg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -19167,15 +19154,17 @@
 /turf/simulated/floor/tiled/milspec,
 /area/stellardelight/deck1/exploration)
 "PF" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 5
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
+/obj/random/soap,
+/obj/random/soap,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/obj/item/clothing/under/bathrobe,
+/obj/item/clothing/under/bathrobe,
+/obj/structure/table/standard,
+/obj/item/weapon/bikehorn/rubberducky,
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "PG" = (
@@ -19199,6 +19188,12 @@
 /obj/item/clothing/suit/caution,
 /obj/item/clothing/suit/caution,
 /obj/item/clothing/suit/caution,
+/obj/item/device/lightreplacer,
+/obj/structure/mopbucket,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/storage/bag/trash,
+/obj/item/weapon/soap/nanotrasen,
 /turf/simulated/floor/tiled/monotile,
 /area/janitor)
 "PI" = (
@@ -19300,16 +19295,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/security_cell_hallway)
 "PU" = (
-/obj/structure/toilet{
-	dir = 4
+/obj/machinery/button/remote/airlock{
+	id = "bathroomstall3";
+	name = "Toilet 3 Lock";
+	pixel_x = -10;
+	pixel_y = 22;
+	specialfunctions = 4
 	},
-/obj/machinery/alarm/angled{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/landmark/start/visitor,
+/obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "PV" = (
@@ -19700,12 +19693,13 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/maintenance/stellardelight/deck1/starboardaft)
 "QS" = (
-/obj/machinery/vending/wallmed1/public{
-	pixel_x = 29
-	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "QU" = (
@@ -19828,15 +19822,12 @@
 /turf/simulated/floor,
 /area/maintenance/stellardelight/substation/medical)
 "Ri" = (
-/obj/machinery/button/remote/airlock{
-	id = "bathroomstall3";
-	name = "Toilet 3 Lock";
-	pixel_x = -10;
-	pixel_y = 22;
-	specialfunctions = 4
+/obj/machinery/door/airlock/angled_bay/standard/color/common{
+	dir = 4;
+	id_tag = "bathroomstall3";
+	name = "Toilet 3"
 	},
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/crew_quarters/toilet)
 "Rj" = (
 /obj/structure/cable/green{
@@ -19960,6 +19951,12 @@
 /obj/item/clothing/suit/caution,
 /obj/item/clothing/suit/caution,
 /obj/item/clothing/suit/caution,
+/obj/item/device/lightreplacer,
+/obj/structure/mopbucket,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/storage/bag/trash,
+/obj/item/weapon/soap/nanotrasen,
 /turf/simulated/floor/tiled/monotile,
 /area/janitor)
 "Rr" = (
@@ -20156,6 +20153,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/security_cell_hallway)
+"RK" = (
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/machinery/alarm/angled{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/toilet)
 "RL" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -20544,15 +20550,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "SG" = (
-/obj/machinery/door/airlock/angled_bay/standard/color/common{
-	dir = 4;
-	id_tag = "bathroomstall2";
-	name = "Toilet 2"
+/obj/machinery/vending/wallmed1/public{
+	pixel_x = 29
 	},
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/steel_ridged,
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "SH" = (
 /obj/structure/cable/green{
@@ -20700,7 +20704,12 @@
 /turf/simulated/floor/carpet/purcarpet,
 /area/stellardelight/deck1/dorms/dorm7)
 "SV" = (
-/obj/item/weapon/bikehorn/rubberducky,
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "SW" = (
@@ -20718,16 +20727,19 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/maintenance/stellardelight/deck1/exploration)
 "SX" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock{
-	name = "Unisex Showers"
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
 	},
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/steel_ridged,
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "SY" = (
 /obj/structure/cable/green{
@@ -21372,11 +21384,11 @@
 /turf/simulated/floor/airless,
 /area/stellardelight/deck1/exterior)
 "Um" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
+/obj/structure/mirror{
+	pixel_y = 38
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/sink{
+	pixel_y = 20
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
@@ -22198,7 +22210,7 @@
 /area/rnd/xenobiology/xenoflora_storage)
 "VP" = (
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "2-8"
 	},
 /turf/simulated/wall/bay/r_wall/steel,
 /area/crew_quarters/toilet)
@@ -22259,6 +22271,9 @@
 	name = "night shift APC";
 	nightshift_setting = 2
 	},
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/wood,
 /area/library)
 "Wa" = (
@@ -23118,12 +23133,13 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/assembly/robotics)
 "XP" = (
-/obj/machinery/door/airlock/angled_bay/standard/color/common{
-	dir = 4;
-	id_tag = "bathroomstall3";
-	name = "Toilet 3"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/steel_ridged,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/white,
 /area/crew_quarters/toilet)
 "XQ" = (
 /obj/structure/disposalpipe/trunk{
@@ -23794,14 +23810,9 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/prison/cell_block/C)
 "Zk" = (
-/obj/machinery/button/remote/airlock{
-	id = "bathroomstall2";
-	name = "Toilet 2 Lock";
-	pixel_x = -10;
-	pixel_y = 22;
-	specialfunctions = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
 	},
-/obj/machinery/light/small,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -31371,7 +31382,7 @@ Om
 BN
 pO
 Uw
-vT
+tc
 Ua
 Jg
 ne
@@ -31488,11 +31499,11 @@ PM
 PM
 PM
 PM
-Xc
-Xc
+PM
+PM
 Xc
 VP
-Xc
+Ig
 Xc
 Xc
 Xc
@@ -31630,17 +31641,17 @@ PM
 KA
 Lj
 NC
+bJ
+mM
+vd
 IY
-CA
-IY
-PU
-IY
-CA
+Ki
 IY
 vd
-EN
 IY
-bJ
+EN
+XP
+NH
 in
 xS
 jd
@@ -31771,22 +31782,22 @@ GV
 Rt
 no
 Eo
-Ki
-IY
-MO
-IY
-Zk
-IY
-Ri
-IY
+no
 lQ
-Um
+mM
+vM
 IY
-Ig
-PF
+Kz
+IY
+PU
+IY
+Um
+Zk
 NH
+PF
+gI
 cu
-kW
+SV
 NH
 NH
 NH
@@ -31914,19 +31925,19 @@ PM
 mv
 pN
 bv
+mc
+mM
+CA
 IY
-rZ
+MO
 IY
-SG
+Ri
 IY
-XP
-IY
-lQ
-ob
+Um
 SX
 it
 zP
-NH
+pS
 cu
 SV
 Ms
@@ -32055,22 +32066,22 @@ GN
 PM
 PH
 Bz
-Pf
-IY
-mc
+no
+oT
+mM
 wJ
 IU
 fb
+Pf
 kQ
 kQ
 kQ
-vM
-IY
-oT
-Ew
+Ko
 NH
+Ew
+Cu
 cu
-kW
+SV
 NH
 NH
 NH
@@ -32198,18 +32209,18 @@ PM
 Rq
 Nr
 Fz
-IY
-Kz
+rZ
+mM
 Ls
 LR
 oC
 ky
 QS
-Ls
-kb
-IY
-oT
-DZ
+SG
+LR
+RK
+NH
+Ew
 MZ
 OM
 kK
@@ -32340,8 +32351,8 @@ PM
 mM
 iF
 mM
-IY
-IY
+mM
+mM
 IY
 IY
 Fu
diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm
index fa48b0d90d9..49289fe490d 100644
--- a/maps/stellardelight/stellar_delight2.dmm
+++ b/maps/stellardelight/stellar_delight2.dmm
@@ -413,6 +413,10 @@
 /obj/structure/low_wall/bay/reinforced/steel,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portfore)
+"aV" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck2/portaft)
 "aW" = (
 /obj/structure/cable/orange{
 	icon_state = "4-8"
@@ -1243,6 +1247,7 @@
 /obj/effect/landmark{
 	name = "morphspawn"
 	},
+/obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/portaft)
 "cW" = (
@@ -4502,6 +4507,7 @@
 /obj/structure/cable/blue{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck2/briefingroom)
 "kE" = (
@@ -10299,6 +10305,9 @@
 /obj/random/tech_supply,
 /obj/random/tech_supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/storage/primary)
 "xL" = (
@@ -11941,6 +11950,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/plating,
 /area/engineering/storage)
 "BB" = (
@@ -16066,6 +16076,10 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/item/paint_palette,
+/obj/item/paint_palette,
+/obj/item/paint_brush,
+/obj/item/paint_brush,
 /turf/simulated/floor/tiled,
 /area/storage/art)
 "KD" = (
@@ -18054,6 +18068,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled/eris/steel/brown_platform,
 /area/crew_quarters/bar)
 "Pf" = (
@@ -20907,6 +20924,7 @@
 	req_one_access = list(19);
 	stripe_color = "#f7d35c"
 	},
+/obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck2/briefingroom)
 "VG" = (
@@ -22289,6 +22307,13 @@
 	},
 /turf/simulated/floor/tiled/eris/dark/cargo,
 /area/crew_quarters/recreation_area)
+"YO" = (
+/obj/structure/table/gamblingtable,
+/obj/machinery/recharger{
+	pixel_y = 5
+	},
+/turf/simulated/floor/carpet,
+/area/crew_quarters/recreation_area)
 "YP" = (
 /obj/structure/disposalpipe/junction{
 	dir = 8
@@ -29864,7 +29889,7 @@ kg
 RZ
 dC
 cV
-iz
+aV
 qC
 zv
 Xm
@@ -32672,7 +32697,7 @@ JL
 nt
 BS
 Dl
-UX
+YO
 BK
 Fw
 vS
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 83aabfc07b3..115a2f4f5a5 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -3075,6 +3075,10 @@
 /obj/effect/landmark/start/visitor,
 /turf/simulated/floor/wood,
 /area/stellardelight/deck3/cafe)
+"ms" = (
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck3/portfore)
 "mv" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
@@ -4406,6 +4410,13 @@
 /obj/random/vendorfood,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
+"qY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck3/portaft)
 "qZ" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/power/apc/angled{
@@ -7747,6 +7758,11 @@
 	},
 /turf/simulated/floor/airless,
 /area/stellardelight/deck3/exterior)
+"Dk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor,
+/area/maintenance/stellardelight/deck3/portaft)
 "Dn" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
@@ -9703,6 +9719,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck3/portfore)
 "KS" = (
@@ -20956,7 +20973,7 @@ eF
 IP
 YD
 bC
-Ns
+ms
 Ns
 Ns
 Hk
@@ -26386,8 +26403,8 @@ Ne
 iS
 iS
 Kz
-iS
-FG
+Dk
+qY
 JW
 Ld
 KD
diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm
index 76bd7c36af5..88cc87563c7 100644
--- a/maps/tether/submaps/tether_centcom.dmm
+++ b/maps/tether/submaps/tether_centcom.dmm
@@ -1897,7 +1897,7 @@
 /obj/effect/map_helper/airlock/atmos/chamber_pump,
 /obj/effect/shuttle_landmark/shuttle_initializer/ccboat,
 /obj/effect/overmap/visitable/ship/landable/ccboat,
-/turf/simulated/floor/tiled/eris/dark/danger,
+/turf/simulated/floor/airless,
 /area/shuttle/ccboat)
 "gj" = (
 /obj/machinery/vending/cola{
@@ -2099,7 +2099,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/eris/dark/danger,
+/turf/simulated/floor/airless,
 /area/shuttle/ccboat)
 "gP" = (
 /obj/structure/table/rack,
@@ -5573,7 +5573,7 @@
 	id_tag = null
 	},
 /obj/effect/map_helper/airlock/atmos/chamber_pump,
-/turf/simulated/floor/tiled/eris/dark/danger,
+/turf/simulated/floor/airless,
 /area/shuttle/ccboat)
 "wx" = (
 /obj/structure/bed/chair/shuttle{
@@ -6550,7 +6550,7 @@
 	id_tag = "ccboat";
 	pixel_y = 29
 	},
-/turf/simulated/floor/tiled/eris/dark/danger,
+/turf/simulated/floor/airless,
 /area/shuttle/ccboat)
 "Cn" = (
 /turf/unsimulated/wall,