diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm
index 1fd1d6e6ed3..7f59c0fb7df 100644
--- a/code/game/turfs/flooring/flooring_decals.dm
+++ b/code/game/turfs/flooring/flooring_decals.dm
@@ -1180,6 +1180,8 @@ var/list/floor_decals = list()
 /obj/effect/floor_decal/steeldecal/steel_decals_central7
 	icon_state = "steel_decals_central7"
 
+/obj/effect/floor_decal/steeldecal/monofloor //VOREStation Add
+	icon_state = "monofloor" //VOREStation Add
 
 /obj/effect/floor_decal/techfloor
 	name = "techfloor edges"
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index 62705f8b67a..148eb41df98 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -106,12 +106,6 @@
 	icon_state = "techmaint"
 	initial_flooring = /decl/flooring/tiling/new_tile/techmaint
 
-/turf/simulated/floor/tiled/monofloor
-	name = "floor"
-	icon = 'icons/turf/flooring/tiles_vr.dmi'
-	icon_state = "monofloor"
-	initial_flooring = /decl/flooring/tiling/new_tile/monofloor
-
 /turf/simulated/floor/tiled/techfloor
 	name = "floor"
 	icon = 'icons/turf/flooring/techfloor.dmi'
diff --git a/icons/turf/flooring/decals_vr.dmi b/icons/turf/flooring/decals_vr.dmi
index 03b66e10200..383eb972dab 100644
Binary files a/icons/turf/flooring/decals_vr.dmi and b/icons/turf/flooring/decals_vr.dmi differ
diff --git a/icons/turf/flooring/tiles_vr.dmi b/icons/turf/flooring/tiles_vr.dmi
index 0961221efb4..2b87ddaab02 100644
Binary files a/icons/turf/flooring/tiles_vr.dmi and b/icons/turf/flooring/tiles_vr.dmi differ
diff --git a/maps/gateway_vr/carpfarm.dmm b/maps/gateway_vr/carpfarm.dmm
index 1dca81d55bc..51a3348abf1 100644
--- a/maps/gateway_vr/carpfarm.dmm
+++ b/maps/gateway_vr/carpfarm.dmm
@@ -33,8 +33,7 @@
 "an" = (
 /obj/structure/cable{
 	d2 = 2;
-	icon_state = "0-2";
-	pixel_y = 0
+	icon_state = "0-2"
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/power/smes/buildable,
@@ -45,15 +44,14 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/warning{
-	icon_state = "warning";
 	dir = 8
 	},
 /obj/machinery/power/terminal{
 	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "0-4";
-	d2 = 4
+	d2 = 4;
+	icon_state = "0-4"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/carpfarm/base)
@@ -90,7 +88,6 @@
 "at" = (
 /obj/machinery/shower{
 	dir = 4;
-	icon_state = "shower";
 	pixel_x = 5
 	},
 /obj/machinery/door/window,
@@ -111,7 +108,6 @@
 	dir = 8
 	},
 /obj/machinery/light/small{
-	icon_state = "bulb1";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
@@ -144,7 +140,6 @@
 /area/awaymission/carpfarm/base)
 "aA" = (
 /obj/effect/floor_decal/industrial/warning/corner{
-	icon_state = "warningcorner";
 	dir = 1
 	},
 /turf/simulated/floor/plating,
@@ -227,15 +222,13 @@
 /area/awaymission/carpfarm/base)
 "aP" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
 	},
 /obj/structure/mirror{
 	dir = 4;
-	pixel_x = -32;
-	pixel_y = 0
+	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/white,
 /area/awaymission/carpfarm/base)
@@ -500,15 +493,13 @@
 /area/awaymission/carpfarm/base)
 "bI" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 1;
-	icon_state = "map"
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/awaymission/carpfarm/base)
 "bJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/machinery/access_button{
 	command = "cycle_interior";
@@ -553,9 +544,7 @@
 	desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
 	icon_state = "space";
 	layer = 4;
-	name = "EXTERNAL AIRLOCK";
-	pixel_x = 0;
-	pixel_y = 0
+	name = "EXTERNAL AIRLOCK"
 	},
 /turf/simulated/wall/iron,
 /area/awaymission/carpfarm/base)
@@ -607,7 +596,6 @@
 	frequency = 1375;
 	id_tag = "carp_airlock";
 	pixel_x = -28;
-	pixel_y = 0;
 	req_access = null;
 	tag_airpump = "carp_pump";
 	tag_chamber_sensor = "carp_sensor";
@@ -615,7 +603,6 @@
 	tag_interior_door = "carp_inner"
 	},
 /obj/effect/floor_decal/industrial/warning/cee{
-	icon_state = "warningcee";
 	dir = 8
 	},
 /turf/simulated/floor/plating,
@@ -627,7 +614,6 @@
 	id_tag = "carp_pump"
 	},
 /obj/effect/floor_decal/industrial/warning/cee{
-	icon_state = "warningcee";
 	dir = 4
 	},
 /turf/simulated/floor/plating,
@@ -726,7 +712,6 @@
 /area/space)
 "cl" = (
 /obj/effect/floor_decal/industrial/warning{
-	icon_state = "warning";
 	dir = 4
 	},
 /turf/simulated/floor/airless,
diff --git a/maps/gateway_vr/eggnogtownunderground.dmm b/maps/gateway_vr/eggnogtownunderground.dmm
index 953d6e60d1f..c88b450f4cb 100644
--- a/maps/gateway_vr/eggnogtownunderground.dmm
+++ b/maps/gateway_vr/eggnogtownunderground.dmm
@@ -17,8 +17,7 @@
 /area/gateway/eggnogtown/hotspring)
 "af" = (
 /obj/machinery/light/small{
-	dir = 8;
-	pixel_x = 0
+	dir = 8
 	},
 /turf/simulated/mineral/floor/ignore_cavegen{
 	temperature = 258.15
@@ -234,8 +233,7 @@
 /area/gateway/eggnogtown/vibeout)
 "kV" = (
 /obj/machinery/light/small{
-	dir = 8;
-	pixel_x = 0
+	dir = 8
 	},
 /turf/simulated/mineral/floor/ignore_cavegen{
 	temperature = 303.15
@@ -267,8 +265,7 @@
 /area/gateway/eggnogtown/vibeout)
 "ma" = (
 /obj/machinery/light/small{
-	dir = 8;
-	pixel_x = 0
+	dir = 8
 	},
 /turf/unsimulated/beach/water{
 	name = "hot spring";
@@ -313,8 +310,7 @@
 /area/gateway/eggnogtown/vibeout)
 "qb" = (
 /obj/machinery/light/small{
-	dir = 4;
-	pixel_y = 0
+	dir = 4
 	},
 /turf/simulated/floor/bmarble{
 	temperature = 303.15
@@ -429,8 +425,7 @@
 /area/gateway/eggnogtown/houserhomestead/basement)
 "vs" = (
 /obj/machinery/light/small{
-	dir = 4;
-	pixel_y = 0
+	dir = 4
 	},
 /turf/simulated/mineral/floor/ignore_cavegen{
 	temperature = 303.15
diff --git a/maps/gateway_vr/listeningpost.dmm b/maps/gateway_vr/listeningpost.dmm
index 63084cda974..ef039b722b9 100644
--- a/maps/gateway_vr/listeningpost.dmm
+++ b/maps/gateway_vr/listeningpost.dmm
@@ -218,28 +218,24 @@
 /area/mine/explored)
 "aN" = (
 /obj/machinery/gateway{
-	icon_state = "off";
 	dir = 9
 	},
 /turf/simulated/floor/greengrid,
 /area/mine/explored)
 "aO" = (
 /obj/machinery/gateway{
-	icon_state = "off";
 	dir = 1
 	},
 /turf/simulated/floor/greengrid,
 /area/mine/explored)
 "aP" = (
 /obj/machinery/gateway{
-	icon_state = "off";
 	dir = 5
 	},
 /turf/simulated/floor/greengrid,
 /area/mine/explored)
 "aQ" = (
 /obj/machinery/gateway{
-	icon_state = "off";
 	dir = 8
 	},
 /turf/simulated/floor/greengrid,
@@ -250,14 +246,12 @@
 /area/mine/explored)
 "aS" = (
 /obj/machinery/gateway{
-	icon_state = "off";
 	dir = 4
 	},
 /turf/simulated/floor/greengrid,
 /area/mine/explored)
 "aT" = (
 /obj/machinery/gateway{
-	icon_state = "off";
 	dir = 10
 	},
 /turf/simulated/floor/greengrid,
@@ -268,7 +262,6 @@
 /area/mine/explored)
 "aV" = (
 /obj/machinery/gateway{
-	icon_state = "off";
 	dir = 6
 	},
 /turf/simulated/floor/greengrid,
@@ -414,8 +407,8 @@
 /area/awaymission/listeningpost)
 "bu" = (
 /obj/structure/toilet{
-	icon_state = "toilet00";
-	dir = 8
+	dir = 8;
+	icon_state = "toilet00"
 	},
 /obj/item/weapon/tool/crowbar,
 /obj/item/weapon/paper/crumpled/listeningpost/fanfiction,
diff --git a/maps/gateway_vr/snowfield.dmm b/maps/gateway_vr/snowfield.dmm
index 6b433ada1ff..2d09b9b2b3a 100644
--- a/maps/gateway_vr/snowfield.dmm
+++ b/maps/gateway_vr/snowfield.dmm
@@ -110,8 +110,8 @@
 	output_level = 250000
 	},
 /obj/structure/cable{
-	icon_state = "0-2";
-	d2 = 2
+	d2 = 2;
+	icon_state = "0-2"
 	},
 /obj/machinery/light/small{
 	dir = 1
@@ -138,8 +138,8 @@
 	pixel_x = -24
 	},
 /obj/structure/cable{
-	icon_state = "0-4";
-	d2 = 4
+	d2 = 4;
+	icon_state = "0-4"
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/snowfield/base)
@@ -174,9 +174,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/awaymission/snowfield/base)
@@ -356,7 +354,6 @@
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/visible{
-	icon_state = "intact";
 	dir = 9
 	},
 /obj/machinery/meter,
@@ -429,7 +426,6 @@
 /area/awaymission/snowfield/base)
 "bi" = (
 /obj/machinery/atmospherics/unary/freezer{
-	dir = 2;
 	icon_state = "freezer"
 	},
 /obj/effect/floor_decal/corner/green{
@@ -439,7 +435,6 @@
 /area/awaymission/snowfield/base)
 "bj" = (
 /obj/machinery/atmospherics/unary/heater{
-	dir = 2;
 	icon_state = "heater"
 	},
 /obj/effect/floor_decal/corner/green{
@@ -497,7 +492,6 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/visible{
-	icon_state = "intact";
 	dir = 5
 	},
 /turf/simulated/floor/tiled/hydro,
@@ -514,7 +508,6 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/visible{
-	icon_state = "intact";
 	dir = 9
 	},
 /turf/simulated/floor/tiled/hydro,
@@ -524,7 +517,6 @@
 	dir = 8
 	},
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
@@ -576,9 +568,7 @@
 /area/awaymission/snowfield/base)
 "bz" = (
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/hydro,
 /area/awaymission/snowfield/base)
@@ -863,9 +853,7 @@
 	dir = 8
 	},
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/reinforced,
 /area/awaymission/snowfield/base)
@@ -883,8 +871,7 @@
 	dir = 4
 	},
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/reinforced,
 /area/awaymission/snowfield/base)
@@ -903,7 +890,6 @@
 /area/awaymission/snowfield/base)
 "cr" = (
 /obj/structure/sink{
-	icon_state = "sink";
 	dir = 8;
 	pixel_x = -12;
 	pixel_y = 2
@@ -958,16 +944,13 @@
 /area/awaymission/snowfield/base)
 "cz" = (
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/awaymission/snowfield/base)
 "cA" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/awaymission/snowfield/base)
@@ -975,17 +958,14 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/vending/sovietsoda,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
 /area/awaymission/snowfield/base)
 "cC" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
 /area/awaymission/snowfield/base)
@@ -1002,16 +982,13 @@
 /area/awaymission/snowfield/base)
 "cG" = (
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
 /area/awaymission/snowfield/base)
 "cH" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
 /area/awaymission/snowfield/base)
@@ -1027,8 +1004,7 @@
 "cK" = (
 /obj/structure/table/standard,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/wood,
 /area/awaymission/snowfield/base)
@@ -1274,26 +1250,21 @@
 "dF" = (
 /obj/structure/closet/firecloset,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
 /area/awaymission/snowfield/base)
 "dG" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /obj/item/device/radio/phone,
 /turf/simulated/floor/tiled/dark,
 /area/awaymission/snowfield/base)
 "dH" = (
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/grass,
 /area/awaymission/snowfield/base)
@@ -1311,25 +1282,21 @@
 /area/awaymission/snowfield/base)
 "dK" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/grass,
 /area/awaymission/snowfield/base)
 "dL" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /turf/simulated/floor/tiled/neutral,
 /area/awaymission/snowfield/base)
 "dM" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /turf/simulated/floor/tiled/neutral,
 /area/awaymission/snowfield/base)
@@ -1439,9 +1406,7 @@
 /area/awaymission/snowfield/base)
 "ee" = (
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
+	dir = 8
 	},
 /mob/living/simple_mob/mechanical/viscerator,
 /turf/simulated/floor/tiled/dark,
@@ -1452,8 +1417,7 @@
 /area/awaymission/snowfield/base)
 "eg" = (
 /obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+	dir = 4
 	},
 /mob/living/simple_mob/mechanical/viscerator,
 /turf/simulated/floor/tiled/dark,
@@ -1490,7 +1454,6 @@
 /area/awaymission/snowfield/base)
 "em" = (
 /obj/effect/floor_decal/industrial/loading{
-	icon_state = "loadingarea";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/neutral,
@@ -1521,7 +1484,6 @@
 "er" = (
 /obj/structure/plasticflaps/mining,
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "away_soviet"
 	},
 /turf/simulated/floor/tiled/neutral,
@@ -1535,7 +1497,6 @@
 /area/awaymission/snowfield/base)
 "et" = (
 /obj/effect/floor_decal/industrial/warning/dust/corner{
-	icon_state = "warningcorner_dust";
 	dir = 4
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
@@ -1546,7 +1507,6 @@
 /area/awaymission/snowfield/base)
 "eu" = (
 /obj/effect/floor_decal/industrial/warning/dust{
-	icon_state = "warning_dust";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
@@ -1557,7 +1517,6 @@
 /area/awaymission/snowfield/base)
 "ev" = (
 /obj/effect/floor_decal/industrial/warning/dust/corner{
-	icon_state = "warningcorner_dust";
 	dir = 1
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
@@ -1571,7 +1530,6 @@
 	id = "away_soviet"
 	},
 /obj/effect/floor_decal/industrial/warning/dust{
-	icon_state = "warning_dust";
 	dir = 4
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
@@ -1582,7 +1540,6 @@
 /area/awaymission/snowfield/base)
 "ex" = (
 /obj/machinery/conveyor{
-	dir = 2;
 	id = "away_soviet"
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
@@ -1593,7 +1550,6 @@
 /area/awaymission/snowfield/base)
 "ey" = (
 /obj/effect/floor_decal/industrial/warning/dust{
-	icon_state = "warning_dust";
 	dir = 8
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
@@ -1604,7 +1560,6 @@
 /area/awaymission/snowfield/base)
 "ez" = (
 /obj/effect/floor_decal/industrial/warning/dust{
-	icon_state = "warning_dust";
 	dir = 4
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
@@ -1631,7 +1586,6 @@
 /area/awaymission/snowfield/base)
 "eC" = (
 /obj/effect/floor_decal/industrial/warning/dust/corner{
-	icon_state = "warningcorner_dust";
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning/dust,
@@ -1643,7 +1597,6 @@
 /area/awaymission/snowfield/base)
 "eD" = (
 /obj/effect/floor_decal/industrial/warning/dust{
-	icon_state = "warning_dust";
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/warning/dust,
@@ -1655,7 +1608,6 @@
 /area/awaymission/snowfield/base)
 "eE" = (
 /obj/effect/floor_decal/industrial/warning/dust/corner{
-	icon_state = "warningcorner_dust";
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/warning/dust,
@@ -1667,7 +1619,6 @@
 /area/awaymission/snowfield/base)
 "eF" = (
 /obj/effect/floor_decal/industrial/warning/dust/corner{
-	icon_state = "warningcorner_dust";
 	dir = 8
 	},
 /turf/simulated/floor/tiled/asteroid_steel{
diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm
index c301808b407..02354f8abfa 100644
--- a/maps/gateway_vr/wildwest.dmm
+++ b/maps/gateway_vr/wildwest.dmm
@@ -1393,7 +1393,7 @@
 /area/awaymission/wwvault)
 "ws" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly,
+/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly,
 /turf/simulated/floor/carpet,
 /area/awaymission/wwmines)
 "xo" = (
@@ -1504,7 +1504,7 @@
 /area/awaymission/wwrefine)
 "zY" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
+/obj/item/weapon/reagent_containers/food/snacks/donut/choc/jelly,
 /turf/simulated/floor/carpet,
 /area/awaymission/wwmines)
 "AA" = (
@@ -1527,7 +1527,7 @@
 /area/awaymission/wwmines)
 "Ce" = (
 /obj/structure/table/woodentable,
-/obj/item/weapon/reagent_containers/food/snacks/donut/normal,
+/obj/item/weapon/reagent_containers/food/snacks/donut/plain,
 /turf/simulated/floor/carpet,
 /area/awaymission/wwmines)
 "Ch" = (
@@ -1721,7 +1721,7 @@
 "Io" = (
 /obj/structure/table/woodentable,
 /obj/item/weapon/reagent_containers/food/drinks/coffee,
-/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly,
+/obj/item/weapon/reagent_containers/food/snacks/donut/pink/jelly,
 /turf/simulated/floor/carpet,
 /area/awaymission/wwmines)
 "Iy" = (
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index cbe4be6725c..f877a475d88 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -2736,13 +2736,14 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/north_stairs_one)
 "aez" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3199,15 +3200,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 1;
 	name = "West Hallway"
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_one_hall)
 "afi" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -5170,16 +5172,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor,
 /obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 1;
 	name = "West Hallway"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/north_stairs_one)
 "aiQ" = (
 /obj/effect/floor_decal/industrial/warning/dust{
@@ -5333,12 +5336,13 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_one_hall)
 "ajb" = (
 /obj/machinery/computer/arcade{
@@ -6449,12 +6453,13 @@
 /area/maintenance/lower/xenoflora)
 "alc" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/public_garden_one)
 "ald" = (
 /obj/effect/floor_decal/borderfloor{
@@ -6656,10 +6661,6 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/public_garden_one)
 "aln" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1;
-	name = "Public Gardens"
-	},
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -6670,13 +6671,18 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/monofloor,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 1;
+	name = "Public Gardens"
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/public_garden_one)
 "alo" = (
 /obj/effect/floor_decal/borderfloor,
@@ -8008,33 +8014,35 @@
 /turf/simulated/floor/plating,
 /area/maintenance/lower/trash_pit)
 "ans" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Public Gardens"
-	},
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 8
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 8
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Public Gardens"
 	},
+/turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/first_west)
 "ant" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 4
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/first_west)
 "anu" = (
 /obj/machinery/door/firedoor/glass,
@@ -8785,16 +8793,17 @@
 /turf/simulated/floor/plating,
 /area/hallway/lower/first_west)
 "aoF" = (
-/obj/machinery/door/airlock/multi_tile/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 8
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 8
-	},
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/first_west)
 "aoG" = (
 /obj/structure/cable/green{
@@ -8802,13 +8811,14 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 4
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 4
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/first_west)
 "aoH" = (
 /turf/simulated/wall,
@@ -9060,17 +9070,18 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central1{
-	dir = 1
-	},
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 1
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/storage/surface_eva)
 "apd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -9152,12 +9163,13 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/storage/surface_eva)
 "aph" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -9456,15 +9468,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/storage/surface_eva)
-"apN" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1;
-	name = "Surface EVA"
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/turf/simulated/floor/tiled/monofloor,
-/area/storage/surface_eva)
 "apO" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 8
@@ -9516,12 +9519,13 @@
 /area/storage/surface_eva)
 "apS" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor,
 /obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 1;
 	name = "Surface EVA"
 	},
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/storage/surface_eva)
 "apT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -10719,12 +10723,13 @@
 /area/hallway/lower/first_west)
 "arW" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/first_west)
 "arX" = (
 /obj/effect/floor_decal/rust,
@@ -10853,12 +10858,13 @@
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
 "asm" = (
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/glass,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/first_west)
 "asn" = (
 /obj/structure/railing{
@@ -16098,9 +16104,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/locker/laundry_arrival)
 "aAg" = (
 /obj/machinery/light,
@@ -18203,15 +18207,6 @@
 /obj/structure/catwalk,
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/locker/laundry_arrival)
-"aDT" = (
-/obj/machinery/door/firedoor/glass,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
-/area/tether/surfacebase/surface_one_hall)
 "aDU" = (
 /obj/machinery/disposal/deliveryChute{
 	dir = 1
@@ -18574,13 +18569,14 @@
 /area/maintenance/lower/atmos)
 "aEF" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor,
 /obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 2;
 	id_tag = null;
 	name = "Construction Site"
 	},
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_one_hall)
 "aEG" = (
 /obj/structure/table/rack,
@@ -18598,12 +18594,13 @@
 /area/tether/surfacebase/surface_one_hall)
 "aEI" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/visitor_dining)
 "aEJ" = (
 /obj/structure/disposalpipe/segment,
@@ -19024,12 +19021,6 @@
 /area/tether/surfacebase/lowernorthhall)
 "aFw" = (
 /obj/machinery/door/firedoor/glass,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 2;
-	id_tag = null;
-	name = "Cafe"
-	},
 /obj/structure/cable/orange{
 	d1 = 4;
 	d2 = 8;
@@ -19044,7 +19035,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monofloor,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 2;
+	id_tag = null;
+	name = "Cafe"
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/visitor_dining)
 "aFx" = (
 /obj/structure/cable/orange{
@@ -20771,7 +20769,13 @@
 /area/tether/surfacebase/tram)
 "aIp" = (
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_one_hall)
 "aIq" = (
 /obj/effect/floor_decal/borderfloor{
@@ -21271,13 +21275,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 2
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 2
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_one_hall)
 "aJj" = (
 /obj/structure/disposalpipe/segment{
@@ -22416,7 +22422,6 @@
 /turf/simulated/wall,
 /area/crew_quarters/sleep/Dorm_7)
 "aLh" = (
-/obj/machinery/door/airlock/multi_tile/glass,
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -22425,22 +22430,25 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 8
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 8
-	},
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/visitor_lodging)
 "aLi" = (
 /obj/machinery/door/firedoor/glass,
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 4
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 4
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/visitor_lodging)
 "aLj" = (
 /turf/simulated/wall,
@@ -24808,6 +24816,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/processing)
 "aPr" = (
@@ -25067,6 +25081,8 @@
 /area/engineering/atmos/processing)
 "aPQ" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 1
 	},
@@ -25090,6 +25106,8 @@
 /area/engineering/atmos/processing)
 "aPT" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/processing)
 "aPU" = (
@@ -27355,21 +27373,16 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_laundry)
 "aUq" = (
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/visitor_laundry)
 "aUr" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 2;
-	id_tag = null;
-	name = "Laundry"
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/structure/cable/orange{
 	d1 = 4;
 	d2 = 8;
@@ -27385,7 +27398,14 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/monofloor,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 2;
+	id_tag = null;
+	name = "Laundry"
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/visitor_laundry)
 "aUs" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -30016,22 +30036,23 @@
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/cargostore/office)
 "bbb" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Mental Health and North EVA"
-	},
 /obj/machinery/door/firedoor/glass,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 8
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 8
+	},
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Mental Health and North EVA"
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/lowernorthhall)
 "bbc" = (
 /obj/structure/cable{
@@ -30057,12 +30078,13 @@
 /area/maintenance/lower/mining_eva)
 "bbf" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 4
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 4
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/lowernorthhall)
 "bbg" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -31803,7 +31825,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/locker/laundry_arrival)
 "cqg" = (
 /obj/structure/railing{
@@ -36514,9 +36536,7 @@
 /obj/machinery/door/airlock/multi_tile/glass{
 	name = "Dorms & Cafe"
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 8
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_one_hall)
 "qOa" = (
 /obj/machinery/power/apc{
@@ -37786,9 +37806,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 4
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_one_hall)
 "uVK" = (
 /turf/simulated/wall,
@@ -43297,7 +43315,7 @@ aiA
 agU
 agU
 apc
-apN
+apS
 agU
 aqU
 aah
@@ -52834,7 +52852,7 @@ uEK
 agM
 agM
 agM
-aDT
+aIp
 aEF
 agM
 agM
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 55f46785287..1a1a56d0b79 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -16395,8 +16395,8 @@
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
+/turf/simulated/floor/tiled/monotile{
+	dir = 
 	},
 /area/tether/surfacebase/surface_two_hall)
 "aBS" = (
@@ -16825,7 +16825,7 @@
 	name = "Atrium Second Floor"
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_two_hall)
 "aCF" = (
 /obj/structure/cable{
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index e27b8c1c23c..35b394a75d6 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -5585,9 +5585,6 @@
 "aii" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1{
-	dir = 4
-	},
 /obj/machinery/door/blast/shutters{
 	closed_layer = 10;
 	density = 0;
@@ -5604,9 +5601,13 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 4
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/medical/lobby)
 "aij" = (
 /obj/structure/sign/greencross,
@@ -6559,15 +6560,9 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/recreation_area_restroom)
 "ajL" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Security Lobby"
-	},
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1{
-	dir = 8
-	},
 /obj/machinery/door/blast/regular{
 	density = 0;
 	icon_state = "pdoor0";
@@ -6576,9 +6571,16 @@
 	opacity = 0
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 8
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 8
+	},
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Security Lobby"
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/security/lobby)
 "ajM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -6606,9 +6608,6 @@
 /area/tether/surfacebase/security/upperhall)
 "ajO" = (
 /obj/machinery/door/firedoor/glass,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1{
-	dir = 4
-	},
 /obj/machinery/door/blast/regular{
 	density = 0;
 	icon_state = "pdoor0";
@@ -6617,9 +6616,13 @@
 	opacity = 0
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 4
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/security/lobby)
 "ajP" = (
 /obj/structure/cable/green{
@@ -7278,9 +7281,7 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 8
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/pool)
 "akV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -7294,9 +7295,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 4
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/pool)
 "akW" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
@@ -7789,9 +7788,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/north_stairs_three)
 "alW" = (
 /obj/effect/floor_decal/steeldecal/steel_decals6{
@@ -8122,7 +8119,7 @@
 	name = "Atrium Third Floor"
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/north_stairs_three)
 "amG" = (
 /obj/structure/cable{
@@ -14616,9 +14613,7 @@
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 8
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/library)
 "axT" = (
 /obj/machinery/door/firedoor/glass,
@@ -14626,9 +14621,7 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/monofloor{
-	dir = 4
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/library)
 "axU" = (
 /obj/structure/bookcase{
@@ -20436,12 +20429,13 @@
 /area/hallway/lower/third_south)
 "aHu" = (
 /obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/bar)
 "aHv" = (
 /obj/machinery/door/airlock{
@@ -23855,9 +23849,10 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 1
 	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/shuttle_pad)
 "aNH" = (
 /obj/structure/window/reinforced{
@@ -23912,7 +23907,8 @@
 /turf/simulated/open/virgo3b,
 /area/tether/surfacebase/outside/outside3)
 "aNN" = (
-/turf/simulated/floor/tiled/monofloor,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/shuttle_pad)
 "aNO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27189,18 +27185,14 @@
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 8
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/third_south)
 "aUp" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 4
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/third_south)
 "aUq" = (
 /obj/effect/floor_decal/rust/part_rusted1,
@@ -27836,13 +27828,7 @@
 /turf/simulated/open,
 /area/maintenance/lower/mining)
 "aVt" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	name = "Infirmary Lobby"
-	},
 /obj/machinery/door/firedoor/glass,
-/obj/effect/floor_decal/steeldecal/steel_decals_central1{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/blast/shutters{
 	closed_layer = 10;
@@ -27857,9 +27843,16 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 8
 	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 8
+	},
+/obj/machinery/door/airlock/multi_tile/glass{
+	name = "Infirmary Lobby"
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/medical/lobby)
 "aVu" = (
 /obj/effect/floor_decal/corner/lightgrey{
@@ -28917,9 +28910,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 4
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/library)
 "aXm" = (
 /obj/effect/decal/cleanable/blood/oil,
@@ -34449,7 +34440,13 @@
 /area/crew_quarters/bar)
 "bgU" = (
 /obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/sleep/cryo)
 "bgV" = (
 /obj/machinery/firealarm{
@@ -34546,6 +34543,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/machinery/door/airlock/multi_tile/metal{
 	dir = 2;
 	name = "Cryogenic Storage"
@@ -35114,9 +35113,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/tiled/monofloor{
-	dir = 1
-	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/topairlock)
 "bil" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -35265,7 +35262,7 @@
 	name = "Surface EVA"
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/turf/simulated/floor/tiled/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/topairlock)
 "biv" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -38258,6 +38255,10 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/machinery/door/airlock/multi_tile/metal{
+	dir = 2;
+	name = "Cryogenic Storage"
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/southhall)
 "daN" = (
@@ -41097,9 +41098,10 @@
 /area/crew_quarters/recreation_area)
 "ooM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow,
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 1
 	},
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/shuttle_pad)
 "opE" = (
 /obj/effect/floor_decal/steeldecal/steel_decals4{
@@ -42363,24 +42365,25 @@
 /turf/simulated/floor/tiled,
 /area/rnd/outpost/xenobiology/outpost_hallway)
 "sPd" = (
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 1;
-	name = "Bar"
-	},
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central1,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/monofloor,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central1,
+/obj/machinery/door/airlock/multi_tile/glass{
+	dir = 1;
+	name = "Bar"
+	},
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/bar)
 "sSK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -42922,7 +42925,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow{
 	dir = 9
 	},
-/turf/simulated/floor/tiled/monofloor,
+/obj/effect/floor_decal/steeldecal/monofloor,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/shuttle_pad)
 "viF" = (
 /obj/structure/disposalpipe/segment,
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index ec7c03bb3c3..b88ea070f55 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -8781,10 +8781,11 @@
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/backup)
 "auX" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/station/dock_two)
 "auY" = (
 /obj/machinery/atmospherics/omni/atmos_filter{
@@ -11091,6 +11092,9 @@
 	name = "Engineering EVA Storage";
 	req_one_access = list(11,24)
 	},
+/obj/effect/floor_decal/steeldecal/monofloor{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/workshop)
 "aCP" = (
@@ -13478,6 +13482,15 @@
 /obj/structure/catwalk,
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
+"aVm" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass_engineering{
+	name = "Engineering EVA Storage";
+	req_one_access = list(11,24)
+	},
+/obj/effect/floor_decal/steeldecal/monofloor,
+/turf/simulated/floor/tiled/monotile,
+/area/engineering/workshop)
 "aVs" = (
 /obj/structure/plasticflaps,
 /obj/machinery/conveyor{
@@ -33152,11 +33165,12 @@
 /area/ai_monitored/storage/eva)
 "tZN" = (
 /obj/machinery/door/airlock/multi_tile/glass,
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/map_helper/airlock/door/simple,
-/turf/simulated/floor/tiled/monofloor{
+/obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 8
 	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/monotile,
 /area/tether/station/dock_two)
 "tZQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow{
@@ -42227,7 +42241,7 @@ agd
 acS
 aqN
 aCM
-aCM
+aVm
 aqN
 acS
 anu