diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index 5edd275c85..dba2c25e03 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -430,6 +430,12 @@
 	icon_state = "darkmarble"
 	initial_flooring = /decl/flooring/bmarble
 
+/turf/simulated/floor/fakesprings //I don't care enough to fix catwalk decals, have this hack
+	name = "Hotsprings"
+	desc = "A natural hotspring connecting to an aquifer. It seems the facility was built ontop of it."
+	icon = 'icons/turf/outdoors.dmi'
+	icon_state = "seashallow"
+
 //ATMOS PREMADES
 /turf/simulated/floor/reinforced/airless
 	name = "vacuum floor"
diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm
index 12084f5858..02da26402f 100644
--- a/code/game/turfs/simulated/water.dm
+++ b/code/game/turfs/simulated/water.dm
@@ -112,6 +112,12 @@
 	under_state = "pool"
 	outdoors = OUTDOORS_NO
 
+/turf/simulated/floor/water/pool/black
+	name = "pool"
+	desc = "Don't worry, it's not closed."
+	under_state = "poolblack"
+	outdoors = OUTDOORS_NO
+
 /turf/simulated/floor/water/deep/pool
 	name = "deep pool"
 	desc = "Don't worry, it's not closed."
diff --git a/icons/turf/outdoors.dmi b/icons/turf/outdoors.dmi
index 5895a29740..696bad3f3e 100644
Binary files a/icons/turf/outdoors.dmi and b/icons/turf/outdoors.dmi differ
diff --git a/maps/yw/cryogaia-04-maintenance.dmm b/maps/yw/cryogaia-04-maintenance.dmm
index bd3884a77f..c50bb06da5 100644
--- a/maps/yw/cryogaia-04-maintenance.dmm
+++ b/maps/yw/cryogaia-04-maintenance.dmm
@@ -330,7 +330,7 @@
 "alY" = (
 /obj/structure/catwalk,
 /obj/effect/mist,
-/turf/simulated/floor/water/hotspring,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "amj" = (
 /obj/machinery/light_construct{
@@ -712,13 +712,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_7)
-"aAI" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 5
-	},
-/obj/effect/decal/shadow/floor,
-/turf/simulated/floor/water/hotspring,
-/area/crew_quarters/pool)
 "aBb" = (
 /obj/structure/sink{
 	dir = 8;
@@ -964,6 +957,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "aLl" = (
@@ -1316,6 +1312,20 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/fitness)
+"aSh" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/obj/effect/floor_decal/steeldecal/steel_decals_central4{
+	dir = 1
+	},
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
+/area/civilian/atrium/lower)
 "aSi" = (
 /obj/machinery/ai_status_display{
 	pixel_y = 32
@@ -1822,6 +1832,24 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/sleep/cryo)
+"bir" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/plain/corner,
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "bjf" = (
 /turf/simulated/wall,
 /area/crew_quarters/kitchen/lower)
@@ -2697,6 +2725,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "bQs" = (
@@ -2865,8 +2896,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/aft)
 "bVp" = (
-/obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/water/pool,
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "bVz" = (
 /obj/structure/bed/chair/office/dark{
@@ -3286,13 +3319,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/dormitory)
-"chU" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 5
-	},
-/obj/effect/decal/shadow/floor,
-/turf/simulated/floor/water/deep/pool,
-/area/crew_quarters/pool)
 "cia" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/tiled,
@@ -3387,6 +3413,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/aft)
+"clj" = (
+/obj/effect/catwalk_plated/techfloor,
+/turf/simulated/floor,
+/area/crew_quarters/recreation_area)
 "clp" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -4865,7 +4895,7 @@
 	},
 /obj/machinery/space_heater{
 	name = "sauna space heater";
-	set_temperature = 313.15
+	set_temperature = 367.15
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/fitness)
@@ -6028,7 +6058,7 @@
 "dSy" = (
 /obj/machinery/space_heater{
 	name = "sauna space heater";
-	set_temperature = 313.15
+	set_temperature = 367.15
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/fitness)
@@ -6321,9 +6351,8 @@
 /turf/simulated/floor,
 /area/maintenance/security_lower)
 "ebB" = (
-/obj/structure/catwalk,
-/obj/effect/decal/shadow/floor,
-/turf/simulated/floor/water/hotspring,
+/obj/effect/catwalk_plated/dark,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "ebF" = (
 /obj/machinery/firealarm{
@@ -6799,10 +6828,8 @@
 /turf/simulated/floor/reinforced/nitrogen,
 /area/engineering/atmos)
 "eor" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
-	},
-/turf/simulated/floor/water/deep/pool,
+/obj/effect/floor_decal/spline/plain/corner,
+/turf/simulated/floor/water/pool,
 /area/crew_quarters/pool)
 "eoD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -7649,6 +7676,11 @@
 	},
 /turf/simulated/floor/carpet,
 /area/chapel/office)
+"eOV" = (
+/obj/effect/mist,
+/obj/effect/catwalk_plated/techmaint,
+/turf/simulated/floor/fakesprings,
+/area/crew_quarters/fitness)
 "eOY" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/green{
 	dir = 8
@@ -8261,6 +8293,9 @@
 "fmg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "fmr" = (
@@ -8545,6 +8580,9 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "fsT" = (
@@ -9386,7 +9424,7 @@
 /obj/structure/catwalk,
 /obj/effect/mist,
 /obj/effect/decal/shadow/floor,
-/turf/simulated/floor/water/hotspring,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "gaL" = (
 /obj/effect/decal/cleanable/blood/drip,
@@ -10179,6 +10217,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "gvz" = (
@@ -10379,6 +10420,7 @@
 "gBA" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/weapon/toolbox_tiles,
+/obj/structure/sign/poster,
 /turf/simulated/floor,
 /area/crew_quarters/recreation_area)
 "gBC" = (
@@ -10408,10 +10450,10 @@
 /turf/simulated/floor/tiled,
 /area/security/prison)
 "gBZ" = (
-/obj/structure/catwalk,
 /obj/effect/decal/shadow/floor,
 /obj/effect/mist,
-/turf/simulated/floor/water/pool,
+/obj/effect/catwalk_plated/techmaint,
+/turf/simulated/floor/fakesprings,
 /area/crew_quarters/fitness)
 "gCj" = (
 /obj/structure/table/standard,
@@ -11227,10 +11269,8 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/medical/morgue)
 "haS" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/turf/simulated/floor/beach/sand,
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/water/pool,
 /area/crew_quarters/pool)
 "hbw" = (
 /obj/structure/cable/green{
@@ -13111,6 +13151,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/spline/plain/corner,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/recreation_area_restroom)
 "iet" = (
@@ -13569,6 +13610,10 @@
 /obj/structure/table/steel,
 /turf/simulated/floor,
 /area/maintenance/lowfloor1)
+"iqT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/recreation_area)
 "irb" = (
 /obj/machinery/computer/atmoscontrol,
 /turf/simulated/floor/tiled,
@@ -14696,10 +14741,10 @@
 /obj/item/device/radio/intercom{
 	pixel_y = -24
 	},
-/obj/structure/catwalk,
 /obj/effect/mist,
 /obj/effect/decal/shadow/floor,
-/turf/simulated/floor/water/hotspring,
+/obj/effect/catwalk_plated/techmaint,
+/turf/simulated/floor/fakesprings,
 /area/crew_quarters/fitness)
 "iWB" = (
 /obj/effect/floor_decal/corner/white/border{
@@ -14803,6 +14848,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/fitness)
 "iZx" = (
@@ -15008,9 +15056,6 @@
 /area/ai_monitored/storage/emergency/eva)
 "jfB" = (
 /obj/effect/floor_decal/spline/plain,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "jfN" = (
@@ -15875,7 +15920,13 @@
 	dir = 8;
 	pixel_x = 24
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/steeldecal/steel_decals_central4{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/civilian/atrium/lower)
 "jEs" = (
 /obj/machinery/alarm{
@@ -16163,10 +16214,9 @@
 /turf/simulated/floor,
 /area/chapel/main)
 "jLX" = (
-/obj/structure/catwalk,
-/obj/effect/decal/shadow/floor,
 /obj/effect/mist,
-/turf/simulated/floor/water/hotspring,
+/obj/effect/catwalk_plated/dark,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "jMc" = (
 /obj/machinery/camera/network/northern_star{
@@ -16186,6 +16236,12 @@
 /obj/item/tape/engineering,
 /turf/simulated/floor/reinforced,
 /area/rnd/lab)
+"jMt" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/fitness)
 "jMH" = (
 /obj/machinery/door/airlock{
 	name = "Restroom"
@@ -16829,6 +16885,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "kdY" = (
@@ -17352,6 +17409,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "kpQ" = (
@@ -18388,9 +18448,6 @@
 "kQt" = (
 /obj/machinery/scale,
 /obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
-	dir = 1
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -18531,9 +18588,6 @@
 /turf/simulated/floor,
 /area/engineering/atmos)
 "kUq" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
-	},
 /obj/effect/decal/shadow/floor,
 /turf/simulated/floor/water/deep/pool,
 /area/crew_quarters/pool)
@@ -18545,6 +18599,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "kVb" = (
@@ -18957,6 +19014,13 @@
 	},
 /turf/simulated/floor/tiled/steel_dirty,
 /area/rnd/storage)
+"lia" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
+/turf/simulated/floor/water/pool/black,
+/area/crew_quarters/pool)
 "lig" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -19040,14 +19104,14 @@
 	id = "sauna2";
 	pixel_x = -24
 	},
-/obj/machinery/space_heater{
-	name = "sauna space heater";
-	set_temperature = 313.15
-	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
 /obj/effect/floor_decal/spline/plain,
+/obj/machinery/space_heater{
+	name = "sauna space heater";
+	set_temperature = 367.15
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/fitness)
 "lkA" = (
@@ -19641,13 +19705,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/security/range)
-"lCL" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
-	},
-/obj/effect/mist,
-/turf/simulated/floor/water/hotspring,
-/area/crew_quarters/pool)
 "lDh" = (
 /obj/machinery/firealarm{
 	dir = 1;
@@ -19938,11 +19995,12 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 10
+	dir = 10;
+	pixel_y = -3
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central7{
-	pixel_x = -7;
-	pixel_y = 11
+/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
@@ -20023,7 +20081,13 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/turf/simulated/floor/wood,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/crew_quarters/fitness)
 "lNA" = (
 /obj/structure/cable{
@@ -20038,6 +20102,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/medical_lower)
+"lND" = (
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 4
+	},
+/turf/simulated/floor/water/pool,
+/area/crew_quarters/pool)
 "lNK" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
@@ -20155,6 +20225,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "lPG" = (
@@ -20343,6 +20416,9 @@
 /area/tcomfoyer)
 "lUQ" = (
 /obj/effect/floor_decal/spline/plain,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "lVi" = (
@@ -20666,7 +20742,7 @@
 /area/crew_quarters/coffee_shop)
 "mih" = (
 /obj/structure/catwalk,
-/turf/simulated/floor/water/hotspring,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "miq" = (
 /obj/machinery/vending/coffee,
@@ -21485,7 +21561,7 @@
 	},
 /obj/machinery/space_heater{
 	name = "sauna space heater";
-	set_temperature = 313.15
+	set_temperature = 367.15
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/fitness)
@@ -21613,7 +21689,13 @@
 	},
 /obj/structure/closet/secure_closet/personal,
 /obj/item/clothing/suit/storage/hooded/wintercoat,
-/turf/simulated/floor/wood,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/crew_quarters/fitness)
 "mLf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21998,6 +22080,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "mYk" = (
@@ -22701,9 +22786,8 @@
 /obj/structure/railing{
 	flags = null
 	},
-/obj/effect/decal/shadow/floor,
-/obj/structure/catwalk,
-/turf/simulated/floor/water/hotspring,
+/obj/effect/catwalk_plated/dark,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "ntK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -23193,6 +23277,9 @@
 	dir = 4;
 	pixel_x = -28
 	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "nPc" = (
@@ -23227,10 +23314,9 @@
 /obj/structure/railing{
 	flags = null
 	},
-/obj/effect/decal/shadow/floor,
-/obj/structure/catwalk,
 /obj/effect/mist,
-/turf/simulated/floor/water/hotspring,
+/obj/effect/catwalk_plated/dark,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "nPH" = (
 /turf/simulated/wall,
@@ -23883,6 +23969,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "oiy" = (
@@ -24017,8 +24106,8 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/ai_upload_foyer)
 "oms" = (
-/obj/structure/sign/poster,
-/turf/simulated/wall,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/carpet,
 /area/crew_quarters/recreation_area)
 "omT" = (
 /obj/effect/floor_decal/industrial/outline/grey,
@@ -24287,8 +24376,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/recreation_area)
@@ -24688,6 +24777,12 @@
 /obj/structure/barricade,
 /turf/simulated/floor/tiled/white,
 /area/maintenance/maintroom1)
+"oJG" = (
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/fitness)
 "oJN" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -24826,6 +24921,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_9)
+"oNb" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
+/turf/simulated/floor/water/pool,
+/area/crew_quarters/pool)
 "oNG" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
@@ -24835,6 +24936,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "oNT" = (
@@ -26124,10 +26228,9 @@
 	flags = null
 	},
 /obj/effect/floor_decal/spline/plain,
-/obj/effect/decal/shadow/floor,
-/obj/structure/catwalk,
 /obj/effect/mist,
-/turf/simulated/floor/water/hotspring,
+/obj/effect/catwalk_plated/dark,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "pwK" = (
 /obj/structure/cable/green{
@@ -26614,7 +26717,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/borealis2/outdoors/grounds/tower/southwest)
 "pLL" = (
-/obj/structure/catwalk,
+/obj/effect/catwalk_plated/dark,
 /turf/simulated/floor,
 /area/chapel/main)
 "pLP" = (
@@ -27123,11 +27226,11 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/maintenance/starboard)
 "pYg" = (
-/obj/structure/catwalk,
 /obj/machinery/alarm{
 	dir = 4;
 	pixel_x = -23
 	},
+/obj/effect/catwalk_plated/dark,
 /turf/simulated/floor,
 /area/chapel/main)
 "pYh" = (
@@ -27950,7 +28053,7 @@
 /obj/effect/floor_decal/techfloor/corner{
 	dir = 1
 	},
-/obj/structure/catwalk,
+/obj/effect/catwalk_plated/techfloor,
 /turf/simulated/floor,
 /area/crew_quarters/recreation_area)
 "qzn" = (
@@ -28381,9 +28484,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
 "qMS" = (
-/obj/structure/catwalk,
-/obj/effect/decal/shadow/floor,
-/turf/simulated/floor/water/hotspring,
+/obj/effect/catwalk_plated/white,
+/turf/simulated/floor/fakesprings,
 /area/crew_quarters/pool)
 "qNz" = (
 /obj/structure/sign/poster,
@@ -28442,11 +28544,14 @@
 /turf/simulated/floor/tiled,
 /area/security/brig/visitation)
 "qPR" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 10
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
 	},
-/turf/simulated/floor/beach/sand,
-/area/crew_quarters/pool)
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
+/area/civilian/atrium/lower)
 "qPW" = (
 /obj/structure/closet/cabinet,
 /obj/item/device/uv_light,
@@ -28518,6 +28623,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/vacant/vacant_shop)
+"qUM" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "qVM" = (
 /obj/item/device/radio/intercom{
 	dir = 4;
@@ -29510,6 +29621,24 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/maintroom6)
+"rAR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/freezer,
+/area/crew_quarters/pool)
 "rAZ" = (
 /obj/structure/mopbucket,
 /obj/item/weapon/reagent_containers/glass/bucket,
@@ -30024,7 +30153,13 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/civilian/atrium/lower)
 "rQN" = (
 /obj/effect/decal/cleanable/dirt,
@@ -30897,6 +31032,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
 /area/crew_quarters/recreation_area)
+"swu" = (
+/obj/item/device/radio/intercom{
+	pixel_y = -24
+	},
+/obj/effect/mist,
+/obj/effect/catwalk_plated/techmaint,
+/turf/simulated/floor/fakesprings,
+/area/crew_quarters/fitness)
 "swD" = (
 /obj/structure/table/standard,
 /obj/machinery/microwave,
@@ -30904,9 +31047,9 @@
 /area/crew_quarters/sleep/Dorm_2)
 "swO" = (
 /obj/effect/floor_decal/spline/plain{
-	dir = 6
+	dir = 4
 	},
-/turf/simulated/floor/water/deep/pool,
+/turf/simulated/floor/water/pool,
 /area/crew_quarters/pool)
 "swP" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -31163,9 +31306,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "sEo" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
 /obj/effect/mist,
 /turf/simulated/floor/water/hotspring,
 /area/crew_quarters/pool)
@@ -31196,6 +31336,9 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/fitness)
 "sGd" = (
@@ -31713,6 +31856,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
+"sUA" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/turf/simulated/floor/water/pool,
+/area/crew_quarters/pool)
 "sUB" = (
 /obj/machinery/washing_machine,
 /turf/simulated/floor/tiled/techfloor,
@@ -31764,6 +31913,12 @@
 "sVS" = (
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/aft)
+"sWj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/catwalk_plated/techmaint,
+/turf/simulated/floor/beach/sand/desert,
+/area/crew_quarters/fitness)
 "sWk" = (
 /obj/structure/railing{
 	dir = 4
@@ -32810,9 +32965,15 @@
 /area/ai)
 "tBM" = (
 /obj/machinery/camera/network/civilian,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
 /obj/structure/closet/secure_closet/personal,
 /obj/item/clothing/suit/storage/hooded/wintercoat,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
 /area/crew_quarters/fitness)
 "tCk" = (
 /obj/structure/window/reinforced/full{
@@ -33358,8 +33519,8 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/tcommsat/computer)
 "tOI" = (
-/obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/beach/sand,
+/obj/effect/floor_decal/steeldecal/steel_decals_central6,
+/turf/simulated/floor/water/pool/black,
 /area/crew_quarters/pool)
 "tOO" = (
 /obj/effect/floor_decal/chapel{
@@ -34109,9 +34270,8 @@
 /obj/structure/railing{
 	flags = null
 	},
-/obj/effect/decal/shadow/floor,
-/obj/structure/catwalk,
-/turf/simulated/floor,
+/obj/effect/catwalk_plated/dark,
+/turf/simulated/floor/fakesprings,
 /area/chapel/main)
 "uhz" = (
 /obj/effect/decal/cleanable/dirt,
@@ -34700,9 +34860,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "uyA" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
-	},
 /obj/effect/decal/shadow/floor,
 /turf/simulated/floor/water/pool,
 /area/crew_quarters/pool)
@@ -35087,7 +35244,7 @@
 /area/engineering/hallway_lower)
 "uKe" = (
 /obj/structure/catwalk,
-/obj/structure/closet/lasertag/red,
+/obj/structure/closet/lasertag/blue,
 /turf/simulated/floor,
 /area/crew_quarters/recreation_area)
 "uKg" = (
@@ -35747,11 +35904,14 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/kitchen/lower)
 "vde" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 9
+/obj/effect/floor_decal/steeldecal/steel_decals_central4{
+	dir = 1
 	},
-/turf/simulated/floor/beach/sand,
-/area/crew_quarters/pool)
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
+/area/civilian/atrium/lower)
 "vdE" = (
 /obj/machinery/portable_atmospherics/canister/empty,
 /obj/machinery/atmospherics/pipe/simple/hidden/red,
@@ -35812,6 +35972,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/pyschwarde)
+"vff" = (
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 8
+	},
+/turf/simulated/floor/water/pool,
+/area/crew_quarters/pool)
 "vfP" = (
 /obj/item/weapon/stool/padded,
 /obj/machinery/light_switch{
@@ -35849,10 +36015,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/medical_lower)
 "vgE" = (
-/obj/effect/floor_decal/spline/plain{
+/obj/effect/floor_decal/spline/plain/corner{
 	dir = 1
 	},
-/turf/simulated/floor/beach/sand,
+/turf/simulated/floor/water/pool,
 /area/crew_quarters/pool)
 "vgM" = (
 /obj/structure/catwalk,
@@ -36354,9 +36520,6 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
-	dir = 1
-	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/fitness)
 "vxr" = (
@@ -36583,13 +36746,6 @@
 	},
 /turf/simulated/wall,
 /area/maintenance/lowfloor3)
-"vDv" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 9
-	},
-/obj/effect/decal/shadow/floor,
-/turf/simulated/floor/water/hotspring,
-/area/crew_quarters/pool)
 "vDD" = (
 /obj/machinery/space_heater,
 /obj/machinery/light/small{
@@ -36648,9 +36804,6 @@
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/medical/morgue)
 "vFn" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
-	},
 /obj/effect/decal/shadow/floor,
 /turf/simulated/floor/water/hotspring,
 /area/crew_quarters/pool)
@@ -36665,6 +36818,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
+/obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "vFX" = (
@@ -37832,6 +37986,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/Dorm_2)
+"wpG" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
+/turf/simulated/floor/wood,
+/area/crew_quarters/fitness)
 "wpL" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/green{
 	dir = 1
@@ -37890,9 +38050,19 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/tcommsat/computer)
 "wsr" = (
-/obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/water/deep/pool,
-/area/crew_quarters/pool)
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
+/area/civilian/atrium/lower)
 "wsV" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -37947,8 +38117,8 @@
 "wva" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/catwalk,
 /obj/effect/decal/shadow/floor,
+/obj/effect/catwalk_plated/techmaint,
 /turf/simulated/floor/beach/sand/desert,
 /area/crew_quarters/fitness)
 "wvi" = (
@@ -38960,6 +39130,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
+/obj/effect/floor_decal/spline/plain/corner,
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "xch" = (
@@ -39935,7 +40106,7 @@
 /obj/effect/floor_decal/techfloor/corner{
 	dir = 4
 	},
-/obj/structure/catwalk,
+/obj/effect/catwalk_plated/techfloor,
 /turf/simulated/floor,
 /area/crew_quarters/recreation_area)
 "xBc" = (
@@ -39998,6 +40169,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "xCk" = (
@@ -40494,6 +40671,15 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/crew_quarters/coffee_shop)
+"xTw" = (
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/obj/effect/floor_decal/steeldecal/steel_decals_central4{
+	dir = 1
+	},
+/turf/simulated/floor/tiled{
+	icon_state = "monotile"
+	},
+/area/civilian/atrium/lower)
 "xTD" = (
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -41067,7 +41253,7 @@
 /obj/effect/floor_decal/spline/plain,
 /obj/machinery/space_heater{
 	name = "sauna space heater";
-	set_temperature = 313.15
+	set_temperature = 367.15
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/fitness)
@@ -54503,13 +54689,13 @@ gRO
 jAP
 fph
 eDV
-eDV
-eDV
+qPR
+vde
 eDV
 fnR
 qvi
 rQv
-eDV
+xTw
 eDV
 nUt
 eDV
@@ -54665,13 +54851,13 @@ xoe
 idM
 urx
 eDV
-eDV
-eDV
+qPR
+vde
 eDV
 rsA
 oJN
-laN
-laN
+wsr
+aSh
 laN
 vMm
 laN
@@ -54814,7 +55000,7 @@ rPu
 nvu
 hQO
 gBA
-oms
+xyQ
 dAN
 dmq
 iBj
@@ -54827,13 +55013,13 @@ uuf
 iFY
 alt
 eDV
-eDV
+qPR
 jDJ
 ieb
 hGb
 jRk
-eDV
-eDV
+qPR
+xTw
 eDV
 wiH
 ylv
@@ -54982,7 +55168,7 @@ mGC
 xBc
 mGC
 hqI
-tjs
+oms
 mzj
 xyQ
 gxb
@@ -55135,7 +55321,7 @@ pjW
 sUd
 vku
 ile
-nSa
+clj
 bQK
 pzu
 xyQ
@@ -55297,7 +55483,7 @@ qxD
 noc
 cFq
 gzj
-nSa
+clj
 nXB
 udT
 uUD
@@ -55306,20 +55492,20 @@ wwi
 wwi
 wwi
 ovO
-tjs
+iqT
 lUQ
 eaz
 mcc
 iie
 vFU
-vde
-haS
-haS
-haS
-haS
-haS
-haS
-qPR
+bLT
+bLT
+bLT
+bLT
+bLT
+bLT
+bLT
+bLT
 gvu
 qMS
 lJa
@@ -55459,7 +55645,7 @@ hNi
 sBM
 vku
 cOD
-nSa
+clj
 bQK
 ntm
 xyQ
@@ -55474,14 +55660,14 @@ irg
 cpt
 mcc
 kdW
-vgE
 bLT
 bLT
 bLT
 bLT
 bLT
 bLT
-tOI
+bLT
+bLT
 lPF
 mcc
 mcc
@@ -55643,7 +55829,7 @@ xEO
 xEO
 xEO
 xEO
-bVp
+xEO
 lPF
 qMS
 qwk
@@ -55805,7 +55991,7 @@ xEO
 xEO
 xEO
 xEO
-bVp
+xEO
 lPF
 qMS
 ayH
@@ -55961,13 +56147,13 @@ ayH
 mcc
 kdW
 uyA
+eor
+swO
+vgE
+eor
+swO
+vgE
 xEO
-xEO
-xEO
-xEO
-xEO
-xEO
-bVp
 lPF
 qMS
 cFa
@@ -56090,7 +56276,7 @@ vku
 jHr
 awQ
 vku
-alY
+jLX
 vku
 vku
 tLY
@@ -56122,14 +56308,14 @@ xyQ
 hSm
 mcc
 kdW
-kUq
+uyA
+haS
+tOI
+oNb
+haS
+lia
+oNb
 xEO
-aMQ
-aMQ
-xEO
-xEO
-xEO
-bVp
 lPF
 qMS
 cpt
@@ -56252,7 +56438,7 @@ vku
 nwk
 awQ
 wRW
-mih
+ebB
 pYg
 vku
 vku
@@ -56284,17 +56470,17 @@ xyQ
 ayH
 mcc
 kdW
-kUq
-aMQ
-aMQ
-aMQ
-aMQ
+uyA
+vff
+sUA
+lND
+vff
+sUA
+lND
 xEO
-xEO
-wsr
-lPF
-mcc
-mcc
+bir
+qUM
+qUM
 tid
 hdU
 lEm
@@ -56453,9 +56639,9 @@ aMQ
 aMQ
 aMQ
 aMQ
-wsr
-lPF
-vDv
+aMQ
+rAR
+vFn
 sEo
 tid
 hdU
@@ -56615,7 +56801,7 @@ aMQ
 aMQ
 aMQ
 aMQ
-wsr
+aMQ
 lKS
 vFn
 iAQ
@@ -56770,17 +56956,17 @@ gxb
 mRw
 mcc
 kdW
-chU
-eor
-eor
-eor
-eor
-eor
-eor
-swO
-lPF
-aAI
-lCL
+kUq
+aMQ
+aMQ
+aMQ
+aMQ
+aMQ
+aMQ
+aMQ
+rAR
+vFn
+sEo
 tid
 oGs
 gJW
@@ -56932,17 +57118,17 @@ gxb
 eQh
 mcc
 aLg
-mcc
-mcc
-mcc
-mcc
-mcc
-mcc
-mcc
+bVp
+bVp
+bVp
+bVp
+bVp
+bVp
+bVp
 frS
 xCe
-mcc
-mcc
+bVp
+bVp
 tid
 oGs
 bJT
@@ -57224,8 +57410,8 @@ vku
 nwk
 nwk
 wRW
-mih
-mih
+ebB
+ebB
 pLL
 ool
 otV
@@ -57274,7 +57460,7 @@ vso
 eTy
 wSC
 bOr
-iWq
+swu
 vso
 txp
 dNi
@@ -57386,7 +57572,7 @@ vku
 fZp
 fGQ
 vku
-alY
+jLX
 dWj
 qHa
 ool
@@ -57436,7 +57622,7 @@ aRV
 sJh
 sJh
 vsG
-wva
+sWj
 bbk
 aVS
 wSP
@@ -57593,12 +57779,12 @@ lSK
 amR
 buW
 tBM
-sJh
+wpG
 wJC
 dSy
 mHq
 yiU
-gBZ
+eOV
 aSJ
 txp
 dNi
@@ -57755,7 +57941,7 @@ buW
 bjX
 buW
 lMT
-sJh
+wpG
 vso
 vso
 qnZ
@@ -57917,7 +58103,7 @@ buW
 kVE
 buW
 mKK
-sJh
+wpG
 auz
 dSy
 deE
@@ -58078,8 +58264,8 @@ buW
 buW
 buW
 buW
-sJh
-sJh
+jMt
+oJG
 mLj
 sJh
 sJh