diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 40ca6859754..d880eb2c641 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -5441,6 +5441,36 @@
 	dir = 1
 	},
 /area/tether/surfacebase/surface_one_hall)
+"ajb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/catwalk,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/door/airlock/maintenance/common{
+	name = "Mining Maintenance Access";
+	req_one_access = list(48)
+	},
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/cargo/mining)
+"ajc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/visible/supply{
+	dir = 8
+	},
+/obj/machinery/door/airlock/maintenance/common{
+	req_one_access = newlist()
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/lower/mining_eva)
 "ajd" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -5556,6 +5586,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
+"ajl" = (
+/turf/simulated/wall/r_wall,
+/area/crew_quarters/sleep/Dorm_7)
 "ajm" = (
 /obj/machinery/vending/tool{
 	dir = 1;
@@ -7969,6 +8002,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/storage/primary)
+"anm" = (
+/turf/simulated/wall/r_wall,
+/area/crew_quarters/sleep/Dorm_5)
+"ann" = (
+/turf/simulated/wall/r_wall,
+/area/crew_quarters/sleep/Dorm_3)
+"ano" = (
+/turf/simulated/wall/r_wall,
+/area/tether/surfacebase/outside/outside1)
 "anp" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -8160,6 +8202,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_one_hall)
+"anE" = (
+/turf/simulated/wall/r_wall,
+/area/crew_quarters/sleep/Dorm_1)
 "anF" = (
 /obj/machinery/door/airlock/maintenance/cargo{
 	name = "Mining Maintenance Access";
@@ -28229,17 +28274,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_one_hall)
-"crC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
-	dir = 4
-	},
-/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/visible/supply{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/lower/mining_eva)
 "csb" = (
 /obj/structure/railing{
 	dir = 4
@@ -29975,22 +30009,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_one_hall)
-"qIr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/structure/catwalk,
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/maintenance/common{
-	name = "Mining Maintenance Access"
-	},
-/turf/simulated/floor/plating,
-/area/tether/surfacebase/cargo/mining)
 "qKn" = (
 /obj/effect/floor_decal/steeldecal/steel_decals_central1{
 	dir = 8
@@ -36400,33 +36418,33 @@ aad
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
@@ -36542,33 +36560,33 @@ aad
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
@@ -36684,33 +36702,33 @@ aad
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
-adK
-adK
-adK
+ano
+ano
+ano
 aad
 aad
 aad
@@ -41592,7 +41610,7 @@ aar
 aar
 aar
 abT
-crC
+ajc
 abT
 agd
 acC
@@ -41732,7 +41750,7 @@ aaG
 aaM
 aaP
 aaY
-qIr
+ajb
 ecq
 nDD
 jPk
@@ -43915,21 +43933,21 @@ aJc
 agM
 agM
 aLg
-aLg
-aLg
-aLg
-aLg
-aOj
-aOj
-aOj
-aOj
-aQb
-aQb
-aQb
-aQb
-aSi
-aSi
-aSi
+ajl
+ajl
+ajl
+ajl
+anm
+anm
+anm
+anm
+ann
+ann
+ann
+ann
+anE
+anE
+anE
 aSi
 aUe
 aUH
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 859e8603753..0576e2644cd 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -190,17 +190,28 @@
 /area/maintenance/substation/medsec)
 "aay" = (
 /obj/effect/floor_decal/borderfloorwhite{
-	dir = 5
+	dir = 9
 	},
 /obj/effect/floor_decal/corner/white/border{
-	dir = 5
+	dir = 9;
+	icon_state = "bordercolor"
+	},
+/obj/effect/floor_decal/borderfloorwhite/corner2{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/white/bordercorner2{
+	dir = 10
 	},
 /obj/structure/table/standard,
-/obj/item/device/defib_kit/loaded,
-/obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/light_switch{
+	dir = 2;
+	name = "light switch ";
+	on = 0;
+	pixel_x = 0;
+	pixel_y = 26
 	},
+/obj/item/stack/nanopaste,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/surgery)
 "aaz" = (
@@ -228,7 +239,6 @@
 	icon_state = "bordercolorcorner2"
 	},
 /obj/structure/table/standard,
-/obj/item/stack/nanopaste,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 30
@@ -251,26 +261,22 @@
 /area/tether/surfacebase/medical/surgery)
 "aaD" = (
 /obj/effect/floor_decal/borderfloorwhite{
-	dir = 9
+	dir = 5
 	},
 /obj/effect/floor_decal/corner/white/border{
-	dir = 9;
-	icon_state = "bordercolor"
-	},
-/obj/effect/floor_decal/borderfloorwhite/corner2{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/white/bordercorner2{
-	dir = 10
+	dir = 5
 	},
 /obj/structure/table/standard,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/light_switch{
-	dir = 2;
-	name = "light switch ";
-	on = 0;
-	pixel_x = 0;
-	pixel_y = 26
+/obj/item/device/defib_kit/loaded,
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/obj/item/weapon/reagent_containers/spray/cleaner{
+	desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+	name = "Surgery Cleaner";
+	pixel_x = 2;
+	pixel_y = 2
 	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/surgery)
@@ -502,6 +508,12 @@
 	dir = 6
 	},
 /obj/structure/curtain/open/shower/medical,
+/obj/machinery/shower{
+	dir = 4;
+	icon_state = "shower";
+	pixel_x = 2;
+	pixel_y = 0
+	},
 /turf/simulated/floor/tiled/dark,
 /area/tether/surfacebase/medical/resleeving)
 "aaX" = (
@@ -1928,6 +1940,21 @@
 "aea" = (
 /turf/simulated/mineral/floor/virgo3b,
 /area/tether/surfacebase/outside/outside2)
+"aeb" = (
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/white/border{
+	dir = 8
+	},
+/obj/structure/table/standard,
+/obj/item/device/radio/intercom/department/medbay{
+	dir = 8;
+	pixel_x = -24
+	},
+/obj/item/weapon/storage/firstaid/surgery,
+/turf/simulated/floor/tiled/white,
+/area/tether/surfacebase/medical/surgery)
 "aec" = (
 /obj/structure/catwalk,
 /obj/structure/cable{
@@ -2029,6 +2056,21 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/north)
+"aem" = (
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/white/border{
+	dir = 8
+	},
+/obj/structure/table/standard,
+/obj/item/device/radio/intercom{
+	dir = 8;
+	pixel_x = -24
+	},
+/obj/item/device/healthanalyzer,
+/turf/simulated/floor/tiled/white,
+/area/tether/surfacebase/medical/surgery)
 "aen" = (
 /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{
 	scrub_id = "atrium"
@@ -2060,6 +2102,40 @@
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/lower/mining)
+"aer" = (
+/obj/structure/table/rack,
+/obj/machinery/light,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/obj/item/clothing/suit/space/void/medical/emt,
+/obj/item/clothing/suit/space/void/medical/emt,
+/obj/item/clothing/head/helmet/space/void/medical/emt,
+/obj/item/clothing/head/helmet/space/void/medical/emt,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/turf/simulated/floor/tiled/white,
+/area/tether/surfacebase/medical/paramed)
+"aes" = (
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 4
+	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/obj/structure/table/rack,
+/obj/item/weapon/storage/belt/medical,
+/obj/item/weapon/storage/belt/medical,
+/obj/item/weapon/storage/belt/medical,
+/obj/item/weapon/storage/belt/medical,
+/turf/simulated/floor/tiled/white,
+/area/tether/surfacebase/medical/storage)
 "aet" = (
 /obj/structure/railing{
 	dir = 1
@@ -2185,11 +2261,84 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/lower/north)
+"aeI" = (
+/obj/machinery/door/window/eastleft{
+	dir = 8;
+	icon_state = "left";
+	name = "Janitorial Desk"
+	},
+/obj/machinery/door/window/eastleft{
+	dir = 4;
+	icon_state = "left";
+	name = "Janitorial Desk";
+	req_access = list(26)
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/door/blast/shutters{
+	dir = 2;
+	id = "janitor_blast";
+	layer = 3.3;
+	name = "Janitorial Shutters"
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/simulated/floor/tiled,
+/area/janitor)
+"aeJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 25;
+	pixel_y = 0
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/purple/border{
+	dir = 4
+	},
+/obj/structure/table/steel,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/grenade/chem_grenade/cleaner,
+/obj/item/weapon/storage/box/mousetraps,
+/obj/item/weapon/storage/box/lights/mixed,
+/obj/item/weapon/storage/box/lights/mixed,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/turf/simulated/floor/tiled,
+/area/janitor)
 "aeK" = (
 /obj/structure/grille,
 /obj/structure/railing,
 /turf/simulated/floor/tiled/techmaint,
 /area/tether/surfacebase/surface_two_hall)
+"aeL" = (
+/obj/structure/catwalk,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	dir = 1;
+	icon_state = "bulb1"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/lower/bar)
+"aeM" = (
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/item/weapon/storage/toolbox/mechanical,
+/obj/item/device/multitool,
+/obj/item/device/multitool,
+/obj/structure/table/rack,
+/turf/simulated/floor/tiled/white,
+/area/tether/surfacebase/medical/storage)
 "aeN" = (
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/cleanable/dirt,
@@ -2303,6 +2452,33 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/tether/surfacebase/surface_two_hall)
+"afb" = (
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/machinery/power/apc{
+	dir = 2;
+	name = "south bump";
+	pixel_y = -28;
+	req_access = list(67)
+	},
+/obj/structure/cable/green,
+/obj/structure/table/rack,
+/obj/item/device/gps/medical{
+	pixel_y = 3
+	},
+/obj/item/device/gps/medical{
+	pixel_x = -3
+	},
+/obj/item/device/radio{
+	pixel_x = 2;
+	pixel_y = 0
+	},
+/obj/item/device/radio{
+	pixel_x = -1;
+	pixel_y = -3
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/surfacebase/medical/storage)
 "afd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 4;
@@ -13479,27 +13655,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/techmaint,
 /area/tether/surfacebase/east_stairs_two)
-"azK" = (
-/obj/machinery/door/window/eastleft{
-	dir = 8;
-	icon_state = "left";
-	name = "Janitorial Desk"
-	},
-/obj/machinery/door/window/eastleft{
-	dir = 4;
-	icon_state = "left";
-	name = "Janitorial Desk"
-	},
-/obj/structure/table/reinforced,
-/obj/machinery/door/blast/shutters{
-	dir = 2;
-	id = "janitor_blast";
-	layer = 3.3;
-	name = "Janitorial Shutters"
-	},
-/obj/machinery/door/firedoor/border_only,
-/turf/simulated/floor/tiled,
-/area/janitor)
 "azL" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -14340,36 +14495,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/janitor)
-"aBn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 25;
-	pixel_y = 0
-	},
-/obj/effect/floor_decal/borderfloor{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/purple/border{
-	dir = 4
-	},
-/obj/structure/table/steel,
-/obj/item/weapon/grenade/chem_grenade/cleaner,
-/obj/item/weapon/grenade/chem_grenade/cleaner,
-/obj/item/weapon/grenade/chem_grenade/cleaner,
-/obj/item/weapon/grenade/chem_grenade/cleaner,
-/obj/item/weapon/storage/box/mousetraps,
-/obj/item/weapon/storage/box/lights/mixed,
-/obj/item/weapon/storage/box/lights/mixed,
-/obj/item/weapon/reagent_containers/spray/cleaner,
-/obj/item/weapon/reagent_containers/spray/cleaner,
-/turf/simulated/floor/tiled,
-/area/janitor)
 "aBo" = (
 /obj/machinery/door/airlock/multi_tile/metal/mait,
 /obj/machinery/door/firedoor/glass,
@@ -21470,20 +21595,6 @@
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/techfloor,
 /area/tether/surfacebase/medical/lowerhall)
-"aPD" = (
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/white/border{
-	dir = 8
-	},
-/obj/structure/table/standard,
-/obj/item/device/radio/intercom/department/medbay{
-	dir = 8;
-	pixel_x = -24
-	},
-/turf/simulated/floor/tiled/white,
-/area/tether/surfacebase/medical/surgery)
 "aPE" = (
 /obj/effect/floor_decal/industrial/loading{
 	dir = 4
@@ -21779,20 +21890,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/lowerhall)
-"aQe" = (
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/white/border{
-	dir = 8
-	},
-/obj/structure/table/standard,
-/obj/item/device/radio/intercom{
-	dir = 8;
-	pixel_x = -24
-	},
-/turf/simulated/floor/tiled/white,
-/area/tether/surfacebase/medical/surgery)
 "aQf" = (
 /obj/effect/floor_decal/steeldecal/steel_decals6{
 	dir = 4
@@ -21967,18 +22064,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
-"aQv" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/space/void/medical/emt,
-/obj/item/clothing/head/helmet/space/void/medical/emt,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/mask/breath,
-/obj/machinery/light,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/tether/surfacebase/medical/paramed)
 "aQw" = (
 /obj/structure/extinguisher_cabinet{
 	dir = 1;
@@ -22313,22 +22398,6 @@
 /obj/machinery/vitals_monitor,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/storage)
-"aQR" = (
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/paleblue/border{
-	dir = 4
-	},
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = 24
-	},
-/obj/structure/table/rack,
-/obj/item/weapon/storage/belt/medical,
-/obj/item/weapon/storage/belt/medical,
-/turf/simulated/floor/tiled/white,
-/area/tether/surfacebase/medical/storage)
 "aQS" = (
 /obj/structure/table/glass,
 /obj/item/weapon/book/manual/resleeving,
@@ -23454,23 +23523,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/storage)
-"aSB" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/turf/simulated/floor/tiled/white,
-/area/tether/surfacebase/medical/storage)
-"aSC" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/power/apc{
-	dir = 2;
-	name = "south bump";
-	pixel_y = -28;
-	req_access = list(67)
-	},
-/obj/structure/cable/green,
-/turf/simulated/floor/tiled/white,
-/area/tether/surfacebase/medical/storage)
 "aSD" = (
 /obj/effect/floor_decal/borderfloorwhite,
 /obj/effect/floor_decal/corner/paleblue/border,
@@ -35061,9 +35113,9 @@ aab
 aab
 aab
 aab
-acD
-acD
-acD
+aaS
+aaS
+aaS
 aab
 aab
 aab
@@ -35203,9 +35255,9 @@ aab
 aab
 aab
 aab
-acD
-acD
-acD
+aaS
+aaS
+aaS
 aab
 aab
 aab
@@ -35345,9 +35397,9 @@ aab
 aab
 aab
 aab
-acD
-acD
-acD
+aaS
+aaS
+aaS
 aab
 aab
 aab
@@ -41380,7 +41432,7 @@ aab
 aac
 aNz
 ayf
-aQv
+aer
 aan
 aaz
 aan
@@ -42940,8 +42992,8 @@ aab
 aab
 aag
 aav
-aPD
-aQe
+aeb
+aem
 aQE
 aQV
 aRu
@@ -43282,7 +43334,7 @@ arl
 axB
 axB
 axB
-azK
+aeI
 axB
 aBj
 axB
@@ -43365,7 +43417,7 @@ aab
 aab
 aab
 aag
-aaD
+aay
 aPG
 aQh
 aQH
@@ -43507,7 +43559,7 @@ aab
 aab
 aab
 aag
-aay
+aaD
 aPH
 aQi
 aQI
@@ -43852,7 +43904,7 @@ ayl
 ayU
 azN
 aAG
-aBn
+aeJ
 aBU
 axB
 aac
@@ -44659,7 +44711,7 @@ abT
 aad
 acz
 adu
-adL
+aeL
 aec
 aew
 aeP
@@ -45361,7 +45413,7 @@ aRi
 aRz
 aRT
 aSm
-aSB
+aeM
 aad
 abl
 abx
@@ -45503,7 +45555,7 @@ aRj
 aRA
 aQs
 aSn
-aSC
+afb
 aad
 abm
 aby
@@ -45924,7 +45976,7 @@ aac
 aKv
 aPV
 aQt
-aQR
+aes
 aRl
 aRC
 ahi
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 2aba34d06c3..2666ca859ef 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -1572,7 +1572,7 @@
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
 /area/tether/surfacebase/reading_room)
 "acV" = (
 /turf/simulated/floor/tiled,
@@ -3347,10 +3347,15 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/maintenance/lower/medsec_maintenance)
 "afX" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether)
+/obj/machinery/door/airlock{
+	id_tag = "ReadingRoom2";
+	name = "Room 2"
+	},
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/reading_room)
 "afY" = (
 /obj/machinery/atmospherics/pipe/manifold/visible,
 /obj/machinery/meter,
@@ -4271,12 +4276,15 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/frontdesk)
 "ahz" = (
-/obj/machinery/atmospherics/unary/engine{
-	dir = 1
+/obj/machinery/door/airlock{
+	id_tag = "ReadingRoom3";
+	name = "Room 3"
 	},
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tourbus/engines)
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/reading_room)
 "ahA" = (
 /obj/structure/cable/green{
 	d1 = 2;
@@ -26385,25 +26393,22 @@
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/reading_room)
 "aTO" = (
-/obj/machinery/door/airlock{
-	id_tag = "ReadingRoom2";
-	name = "Room 2"
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 8
 	},
-/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_decals7{
+	dir = 1
+	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
-/area/tether/surfacebase/reading_room)
+/area/tether/surfacebase/surface_three_hall)
 "aTP" = (
-/obj/machinery/door/airlock{
-	id_tag = "ReadingRoom3";
-	name = "Room 3"
-	},
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/reading_room)
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether)
 "aTQ" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8;
@@ -34509,6 +34514,13 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/rnd/outpost/xenobiology/outpost_storage)
+"bhg" = (
+/obj/machinery/atmospherics/unary/engine{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tourbus/engines)
 "bhu" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/lightgrey/border,
@@ -43881,7 +43893,7 @@ aac
 agw
 aVG
 aWF
-akn
+aTO
 akS
 aly
 amn
@@ -48764,7 +48776,7 @@ jML
 jHw
 jpB
 qWU
-ahz
+bhg
 aKU
 aOI
 aPb
@@ -49616,7 +49628,7 @@ caw
 jHw
 gHh
 qWU
-ahz
+bhg
 aKU
 aOI
 aPb
@@ -51601,7 +51613,7 @@ aNk
 uSA
 aNJ
 aNP
-afX
+aTP
 aKU
 abg
 aOk
@@ -51743,7 +51755,7 @@ aNl
 aNl
 aNK
 aNP
-afX
+aTP
 aKU
 abg
 aOk
@@ -51885,7 +51897,7 @@ aNm
 aNl
 aNK
 aNP
-afX
+aTP
 aKU
 abg
 aOk
@@ -52532,7 +52544,7 @@ aac
 abf
 abt
 acS
-aTO
+afX
 aeg
 aTM
 aeR
@@ -52958,7 +52970,7 @@ aac
 abf
 abt
 acT
-aTP
+ahz
 aeg
 aTN
 adC
diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index fb137813e0d..c4528b69a06 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -438,13 +438,19 @@
 /turf/simulated/floor/tiled,
 /area/security/brig/visitation)
 "aW" = (
-/obj/structure/shuttle/engine/propulsion{
+/obj/structure/table/rack{
 	dir = 8;
-	icon_state = "propulsion_l"
+	layer = 2.9
 	},
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/large_escape_pod1)
+/obj/item/weapon/stock_parts/matter_bin,
+/obj/item/weapon/stock_parts/matter_bin,
+/obj/item/weapon/stock_parts/manipulator,
+/obj/item/weapon/stock_parts/manipulator,
+/obj/item/weapon/stock_parts/console_screen,
+/obj/item/weapon/circuitboard/autolathe,
+/obj/item/weapon/circuitboard/partslathe,
+/turf/simulated/floor,
+/area/storage/tech)
 "aX" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -781,7 +787,8 @@
 /area/security/brig)
 "bs" = (
 /obj/structure/shuttle/engine/propulsion{
-	dir = 8
+	dir = 8;
+	icon_state = "propulsion_l"
 	},
 /turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
@@ -887,8 +894,7 @@
 /area/security/brig)
 "bC" = (
 /obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion_r"
+	dir = 8
 	},
 /turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
@@ -2509,6 +2515,14 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/crew)
+"dI" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8;
+	icon_state = "propulsion_r"
+	},
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/large_escape_pod1)
 "dJ" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -2991,6 +3005,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/port)
+"ev" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/white/border{
+	dir = 6
+	},
+/obj/effect/floor_decal/borderfloorwhite/corner2,
+/obj/effect/floor_decal/corner/white/bordercorner2,
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery2)
 "ew" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -3126,6 +3152,40 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/crew)
+"eE" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 9
+	},
+/obj/effect/floor_decal/corner/white/border{
+	dir = 9
+	},
+/obj/effect/floor_decal/borderfloorwhite/corner2{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/white/bordercorner2{
+	dir = 1;
+	icon_state = "bordercolorcorner2"
+	},
+/obj/machinery/status_display{
+	density = 0;
+	layer = 4;
+	pixel_x = -32;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery)
+"eF" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/white/border{
+	dir = 10;
+	icon_state = "bordercolor"
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery)
 "eG" = (
 /turf/simulated/floor/tiled,
 /area/tether/exploration/crew)
@@ -3329,6 +3389,15 @@
 "eT" = (
 /turf/simulated/floor,
 /area/maintenance/station/micro)
+"eU" = (
+/obj/structure/table/standard,
+/obj/item/device/radio/intercom/department/medbay{
+	pixel_y = -24
+	},
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/white/border,
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery)
 "eV" = (
 /obj/structure/table/wooden_reinforced,
 /obj/item/weapon/paper_bin{
@@ -3360,6 +3429,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/staircase)
+"eX" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/white/border,
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery)
 "eY" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -3717,6 +3792,22 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/staircase)
+"fD" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/white/border{
+	dir = 6
+	},
+/obj/item/weapon/reagent_containers/spray/cleaner{
+	desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+	name = "Surgery Cleaner";
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery2)
 "fE" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 8
@@ -4517,6 +4608,29 @@
 /obj/random/maintenance/research,
 /turf/simulated/floor,
 /area/maintenance/station/exploration)
+"gS" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/white/border{
+	dir = 5
+	},
+/obj/effect/floor_decal/borderfloorwhite/corner2{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/white/bordercorner2{
+	dir = 4;
+	icon_state = "bordercolorcorner2"
+	},
+/obj/machinery/status_display{
+	density = 0;
+	layer = 4;
+	pixel_x = 32;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery2)
 "gV" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/red/border,
@@ -7051,19 +7165,6 @@
 /obj/item/device/analyzer,
 /turf/simulated/floor/plating,
 /area/storage/tech)
-"kN" = (
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.9
-	},
-/obj/item/weapon/stock_parts/matter_bin,
-/obj/item/weapon/stock_parts/matter_bin,
-/obj/item/weapon/stock_parts/manipulator,
-/obj/item/weapon/stock_parts/console_screen,
-/obj/item/weapon/circuitboard/autolathe,
-/obj/item/weapon/circuitboard/partslathe,
-/turf/simulated/floor,
-/area/storage/tech)
 "kO" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -15377,18 +15478,6 @@
 /obj/effect/floor_decal/industrial/loading,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery2)
-"yx" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/white/border{
-	dir = 6
-	},
-/obj/effect/floor_decal/borderfloorwhite/corner2,
-/obj/effect/floor_decal/corner/white/bordercorner2,
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery2)
 "yy" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -15910,32 +15999,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/medical/patient_a)
-"zH" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/white/border{
-	dir = 10;
-	icon_state = "bordercolor"
-	},
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery)
-"zI" = (
-/obj/structure/table/standard,
-/obj/item/device/radio/intercom/department/medbay{
-	pixel_y = -24
-	},
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/white/border,
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery)
-"zJ" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/white/border,
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery)
 "zK" = (
 /obj/structure/closet/crate/freezer,
 /obj/item/weapon/reagent_containers/blood/OMinus,
@@ -16026,16 +16089,6 @@
 /obj/effect/floor_decal/corner/white/border,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery2)
-"zQ" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/white/border{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery2)
 "zR" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -16304,29 +16357,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery_hallway)
-"An" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/white/border{
-	dir = 9
-	},
-/obj/effect/floor_decal/borderfloorwhite/corner2{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/white/bordercorner2{
-	dir = 1;
-	icon_state = "bordercolorcorner2"
-	},
-/obj/machinery/status_display{
-	density = 0;
-	layer = 4;
-	pixel_x = -32;
-	pixel_y = 0
-	},
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery)
 "Ao" = (
 /obj/structure/filingcabinet/chestdrawer{
 	name = "Scan Records"
@@ -19235,29 +19265,6 @@
 	},
 /turf/simulated/floor/airless,
 /area/maintenance/station/sec_lower)
-"Fg" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/borderfloorwhite{
-	dir = 5
-	},
-/obj/effect/floor_decal/corner/white/border{
-	dir = 5
-	},
-/obj/effect/floor_decal/borderfloorwhite/corner2{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/white/bordercorner2{
-	dir = 4;
-	icon_state = "bordercolorcorner2"
-	},
-/obj/machinery/status_display{
-	density = 0;
-	layer = 4;
-	pixel_x = 32;
-	pixel_y = 0
-	},
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery2)
 "Fh" = (
 /obj/structure/bed/roller,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -28399,13 +28406,13 @@ fX
 fX
 fX
 fX
-kJ
+lw
 lw
 lw
 mF
 lw
 lw
-kJ
+lw
 kJ
 pG
 pG
@@ -28967,7 +28974,7 @@ is
 jb
 jC
 fX
-kN
+aW
 kK
 mj
 mJ
@@ -31976,8 +31983,8 @@ xb
 ya
 xZ
 yY
-An
-zH
+eE
+eF
 xb
 Ah
 Aw
@@ -32119,7 +32126,7 @@ xp
 yb
 yZ
 zq
-zI
+eU
 xb
 Ai
 Ax
@@ -32261,7 +32268,7 @@ xq
 yc
 za
 zr
-zJ
+eX
 xb
 Aj
 Ax
@@ -33962,10 +33969,10 @@ wi
 wI
 xf
 ys
-yx
+ev
 zm
-Fg
-zQ
+gS
+fD
 xf
 pp
 pp
@@ -37493,11 +37500,11 @@ hl
 DI
 RX
 DL
-aW
-bs
-bs
 bs
 bC
+bC
+bC
+dI
 oY
 sW
 ef