diff --git a/code/game/objects/effects/decals/posters/posters.dm b/code/game/objects/effects/decals/posters/posters.dm
index 8046cf439ab..7db111f8e4e 100644
--- a/code/game/objects/effects/decals/posters/posters.dm
+++ b/code/game/objects/effects/decals/posters/posters.dm
@@ -115,7 +115,8 @@
 /obj/structure/sign/poster
 	name = "poster"
 	desc = "A large piece of space-resistant printed paper. "
-	icon = 'icons/obj/contraband.dmi'
+	icon = 'icons/obj/contraband_vr.dmi' //VOREStation Edit
+	icon_state = "poster" //VOREStation Edit
 	anchored = 1
 	var/decl/poster/poster_decl = null
 	var/target_poster_decl_path = /decl/poster
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 46c08359515..77e19b3b98f 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -2868,7 +2868,7 @@
 	dir = 8
 	},
 /obj/structure/sign/poster{
-	pixel_y = 32
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lowmedbaymaint)
@@ -3815,6 +3815,7 @@
 	dir = 8;
 	pixel_x = 24
 	},
+/obj/machinery/light/small,
 /turf/simulated/floor/tiled,
 /area/rnd/hardstorage)
 "ags" = (
@@ -6361,9 +6362,11 @@
 /turf/simulated/floor/plating,
 /area/hallway/lower/first_west)
 "akT" = (
-/obj/structure/sign/poster,
-/turf/simulated/wall,
-/area/hallway/lower/first_west)
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/reinforced,
+/area/rnd/testingroom)
 "akU" = (
 /obj/item/device/radio/intercom{
 	dir = 8;
@@ -6533,6 +6536,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/sign/poster{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
 "alh" = (
@@ -7797,6 +7803,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 10
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
 "anc" = (
@@ -10311,7 +10320,7 @@
 	dir = 8
 	},
 /obj/structure/sign/poster{
-	pixel_y = 32
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/first_aid_west)
@@ -13210,6 +13219,9 @@
 /obj/effect/floor_decal/corner/red/border{
 	dir = 4
 	},
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/security/checkpoint)
 "awi" = (
@@ -17593,6 +17605,9 @@
 /obj/effect/floor_decal/corner/lightgrey/border{
 	dir = 8
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/locker/laundry_arrival)
 "aCI" = (
@@ -21769,6 +21784,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "aJY" = (
@@ -26672,6 +26690,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 4
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos/processing)
 "aTg" = (
@@ -28356,6 +28375,9 @@
 "aWb" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/item/weapon/stool/padded,
+/obj/structure/sign/poster{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/vacant/vacant_bar)
 "aWc" = (
@@ -29147,6 +29169,9 @@
 /obj/structure/table/steel,
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/pen,
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/vacant/vacant_bar)
 "aXB" = (
@@ -31056,6 +31081,7 @@
 	dir = 5
 	},
 /obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/rnd/external)
 "bcV" = (
@@ -32584,6 +32610,10 @@
 /obj/effect/floor_decal/corner/red/border,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/lowerhall)
+"fna" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled,
+/area/rnd/hardstorage)
 "fpU" = (
 /obj/machinery/meter,
 /obj/machinery/atmospherics/pipe/manifold/hidden/green,
@@ -33123,6 +33153,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/trash_pit)
+"haz" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/engineering/atmos/processing)
 "hco" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/green{
 	dir = 9
@@ -33953,6 +33987,12 @@
 	},
 /turf/simulated/floor/carpet/gaycarpet,
 /area/tether/surfacebase/funny/clownoffice)
+"jYP" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
 "kbZ" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 9
@@ -34767,6 +34807,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/funny/hideyhole)
+"lZU" = (
+/obj/structure/sign/poster,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/tram)
 "meS" = (
 /turf/simulated/floor/carpet/gaycarpet,
 /area/tether/surfacebase/funny/clownoffice)
@@ -34850,6 +34894,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tether/surfacebase/tram)
+"mtL" = (
+/obj/structure/sign/poster,
+/turf/simulated/floor/lino,
+/area/crew_quarters/visitor_dining)
 "mvM" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -35877,6 +35925,12 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/plating,
 /area/crew_quarters/visitor_laundry)
+"pxk" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/grey/border,
+/obj/structure/sign/poster,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/visitor_laundry)
 "pyD" = (
 /obj/machinery/door/airlock/maintenance/common{
 	name = "Mining Maintenance Access"
@@ -44360,7 +44414,7 @@ axI
 awU
 aAk
 abN
-aeR
+akT
 aeR
 agl
 agN
@@ -44893,7 +44947,7 @@ akn
 abE
 jbU
 akJ
-akT
+ahl
 alg
 alq
 alB
@@ -45355,7 +45409,7 @@ abn
 abn
 acx
 afg
-abv
+fna
 abm
 aCm
 akg
@@ -46095,7 +46149,7 @@ aQR
 aRu
 aPl
 aPl
-aPl
+haz
 aOR
 aTW
 aUv
@@ -47652,7 +47706,7 @@ aOx
 aJI
 aPt
 aJI
-aJI
+jYP
 aQy
 aRD
 aRW
@@ -53204,7 +53258,7 @@ aVA
 aVQ
 bHR
 aUP
-bcT
+pxk
 aVn
 anK
 aYi
@@ -53321,7 +53375,7 @@ aDu
 atm
 aCQ
 aJV
-aDu
+mtL
 aLj
 aLT
 aME
@@ -54451,7 +54505,7 @@ auB
 aEO
 lsh
 aFW
-auB
+lZU
 aCO
 jCv
 aIz
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index b6f2fabcc9f..7f3f7234393 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -752,7 +752,7 @@
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals10,
 /obj/structure/sign/poster{
-	pixel_y = 32
+	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/recoveryward)
@@ -1961,7 +1961,7 @@
 	dir = 4
 	},
 /obj/structure/sign/poster{
-	pixel_y = 32
+	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/tether/surfacebase/security/evidence)
@@ -5669,9 +5669,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/obj/structure/sign/poster{
-	pixel_y = -32
-	},
+/obj/structure/sign/poster,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/centralhall)
 "aiO" = (
@@ -6757,9 +6755,7 @@
 /obj/effect/floor_decal/corner/paleblue/bordercorner2{
 	dir = 9
 	},
-/obj/structure/sign/poster{
-	pixel_y = -32
-	},
+/obj/structure/sign/poster,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/centralhall)
 "akF" = (
@@ -6948,7 +6944,7 @@
 	dir = 8
 	},
 /obj/structure/sign/poster{
-	pixel_x = -32
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/middlehall)
@@ -7653,9 +7649,7 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
-/obj/structure/sign/poster{
-	pixel_y = -32
-	},
+/obj/structure/sign/poster,
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/uppersouthstairwell)
 "alW" = (
@@ -10332,10 +10326,6 @@
 /obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
-"aqt" = (
-/obj/structure/sign/poster,
-/turf/simulated/wall,
-/area/tether/surfacebase/public_garden_two)
 "aqu" = (
 /obj/structure/table/standard{
 	name = "plastic table frame"
@@ -10346,6 +10336,9 @@
 /obj/effect/floor_decal/corner/lime/border{
 	dir = 9
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/public_garden_two)
 "aqv" = (
@@ -11352,14 +11345,10 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
-/obj/machinery/vending/cigarette{
-	name = "Cigarette machine";
-	prices = list();
-	products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
-	},
 /obj/effect/floor_decal/techfloor/hole{
 	dir = 1
 	},
+/obj/machinery/vending/sovietvend,
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/lower/bar)
 "ash" = (
@@ -12609,6 +12598,9 @@
 /obj/effect/floor_decal/corner/lime/border{
 	dir = 6
 	},
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/public_garden_two)
 "auk" = (
@@ -14370,12 +14362,12 @@
 /area/tether/surfacebase/surface_two_hall)
 "axu" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/structure/sign/poster{
-	pixel_x = -32
-	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/breakroom)
 "axv" = (
@@ -25880,7 +25872,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals9{
 	dir = 8
 	},
-/obj/machinery/vending/snack{
+/obj/machinery/vending/weeb{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/monotile,
@@ -34679,15 +34671,15 @@
 /area/ai_upload)
 "xbt" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/structure/sign/poster{
-	pixel_x = -32
-	},
 /obj/structure/bed/chair{
 	dir = 4
 	},
 /obj/effect/landmark/start{
 	name = "Medical Doctor"
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/breakroom)
 "xfa" = (
@@ -39377,7 +39369,7 @@ adt
 adt
 adt
 akX
-aqt
+akX
 akX
 akX
 adt
@@ -40517,7 +40509,7 @@ aqz
 aog
 ars
 atI
-aqt
+akX
 akX
 aPv
 aPD
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 8efa0893bf7..34f9ebd1969 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -791,13 +791,13 @@
 /obj/effect/floor_decal/corner/red/bordercorner2{
 	dir = 4
 	},
-/obj/structure/sign/poster{
-	pixel_x = 32
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/upperhall)
 "abj" = (
@@ -7085,6 +7085,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/chemistry)
 "akC" = (
@@ -10071,6 +10074,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 9
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/surface_three_hall)
 "apU" = (
@@ -11072,7 +11078,6 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/recreation_area_restroom)
 "arE" = (
-/obj/machinery/vending/cola,
 /obj/effect/floor_decal/corner/lightgrey{
 	dir = 9
 	},
@@ -11089,6 +11094,7 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals9,
+/obj/machinery/vending/bepis,
 /turf/simulated/floor/tiled/monotile,
 /area/tether/surfacebase/surface_three_hall)
 "arF" = (
@@ -13685,6 +13691,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 9
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/research/researchdivision)
 "awy" = (
@@ -14091,32 +14100,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/research)
-"axb" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals7{
-	dir = 5
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals7{
-	dir = 6
-	},
-/obj/effect/floor_decal/corner/blue/border{
-	dir = 8
-	},
-/obj/effect/floor_decal/borderfloor/corner2{
-	dir = 8
-	},
-/obj/effect/floor_decal/corner/blue/bordercorner2{
-	dir = 8
-	},
-/obj/machinery/computer/id_restorer{
-	dir = 4;
-	pixel_x = -30
-	},
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/surface_three_hall)
 "axc" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/borderfloor{
@@ -23732,9 +23715,6 @@
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/shuttle_pad)
 "aNy" = (
-/obj/structure/sign/poster{
-	pixel_x = -32
-	},
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 8
 	},
@@ -24730,7 +24710,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/xenobiology/outpost_autopsy)
 "aPB" = (
-/obj/machinery/vending/snack{
+/obj/machinery/vending/weeb{
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
@@ -24970,7 +24950,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/barrestroom)
 "aQg" = (
-/obj/machinery/vending/cola{
+/obj/machinery/vending/bepis{
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
@@ -27983,9 +27963,7 @@
 	},
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/red/border,
-/obj/structure/sign/poster{
-	pixel_y = -32
-	},
+/obj/structure/sign/poster,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/upperhall)
 "aVM" = (
@@ -33177,6 +33155,9 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "beB" = (
@@ -33898,6 +33879,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/lino,
 /area/crew_quarters/bar)
 "bfY" = (
@@ -35518,15 +35502,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/tether/surfacebase/topairlock)
 "biU" = (
-/obj/machinery/vending/snack{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/lightgrey{
 	dir = 5
 	},
 /obj/effect/floor_decal/corner/lightgrey{
 	dir = 10
 	},
+/obj/machinery/vending/sol{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/cafeteria)
 "biV" = (
@@ -38700,6 +38684,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/third_south)
+"eWS" = (
+/obj/structure/sign/poster{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/cafeteria)
 "faL" = (
 /obj/structure/lattice,
 /obj/structure/cable/orange{
@@ -39805,7 +39795,7 @@
 	dir = 4
 	},
 /obj/structure/sign/poster{
-	pixel_x = 32
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/security/breakroom)
@@ -41105,6 +41095,9 @@
 /area/tether/surfacebase/security/hos)
 "oMK" = (
 /obj/machinery/atmospherics/unary/engine,
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/tether/surfacebase/shuttle_pad)
 "oOD" = (
@@ -42506,9 +42499,6 @@
 "uiJ" = (
 /obj/machinery/chemical_dispenser/full,
 /obj/structure/table/reinforced,
-/obj/structure/sign/poster{
-	pixel_x = 32
-	},
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 6
 	},
@@ -42518,6 +42508,9 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -30
 	},
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/chemistry)
 "ukn" = (
@@ -57473,7 +57466,7 @@ aqR
 aZS
 aZZ
 anL
-axb
+vvA
 viF
 vKm
 nlf
@@ -58102,7 +58095,7 @@ beU
 bhx
 beU
 biF
-biL
+eWS
 bjc
 bjj
 bjq
diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm
index 248bcc9039a..6eda2b804f2 100644
--- a/maps/tether/tether-04-transit.dmm
+++ b/maps/tether/tether-04-transit.dmm
@@ -19,14 +19,12 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5;
-	icon_state = "intact-scrubbers"
+	dir = 5
 	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/tether_midpoint)
@@ -186,8 +184,7 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
-	dir = 4;
-	icon_state = "map-scrubbers"
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/visible/supply{
 	dir = 4
@@ -214,12 +211,10 @@
 "oz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5;
-	icon_state = "intact-scrubbers"
+	dir = 5
 	},
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
+	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
@@ -257,14 +252,13 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/tether/midpoint)
 "tn" = (
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -282,8 +276,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
@@ -331,8 +324,7 @@
 /area/tether/midpoint)
 "xl" = (
 /obj/machinery/light/small{
-	dir = 4;
-	pixel_y = 0
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/zpipe/down,
 /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
@@ -352,8 +344,7 @@
 /area/maintenance/tether_midpoint)
 "zi" = (
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
+	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/tether/midpoint)
@@ -460,25 +451,21 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/maintenance/tether_midpoint)
 "Iq" = (
-/obj/machinery/light{
-	dir = 2
-	},
+/obj/machinery/light,
 /turf/simulated/floor/wood,
 /area/tether/midpoint)
 "It" = (
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -497,8 +484,7 @@
 	dir = 5
 	},
 /obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
+	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
@@ -508,9 +494,7 @@
 	dir = 4
 	},
 /obj/machinery/firealarm{
-	dir = 2;
 	layer = 3.3;
-	pixel_x = 0;
 	pixel_y = 26
 	},
 /turf/simulated/floor/wood,
@@ -533,8 +517,7 @@
 	dir = 1
 	},
 /obj/machinery/light/small{
-	dir = 4;
-	pixel_y = 0
+	dir = 4
 	},
 /obj/structure/lattice,
 /obj/machinery/door/firedoor/glass,
@@ -566,8 +549,7 @@
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
-	icon_state = "1-2";
-	pixel_y = 0
+	icon_state = "1-2"
 	},
 /obj/structure/lattice,
 /obj/structure/disposalpipe/down,
@@ -698,12 +680,11 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/turf/simulated/floor/holofloor/tiled/dark,
+/turf/simulated/floor/tiled/dark,
 /area/tether/midpoint)
 "YB" = (
 /obj/structure/table/woodentable,
 /obj/structure/flora/pottedplant/smallcactus{
-	pixel_x = 0;
 	pixel_y = 8
 	},
 /turf/simulated/floor/wood,
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index af265d452bb..0c6f6f5a3e6 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -195,7 +195,9 @@
 /turf/simulated/floor,
 /area/engineering/engine_smes)
 "aat" = (
-/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/airlock/maintenance/common{
+	name = "Robotic Long-Term Storage"
+	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
 /area/maintenance/station/exploration)
@@ -1255,14 +1257,20 @@
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "acr" = (
-/obj/structure/railing{
-	dir = 1
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/structure/railing{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "2-4"
 	},
 /turf/simulated/floor,
-/area/maintenance/station/exploration)
+/area/maintenance/station/eng_lower)
 "acs" = (
 /obj/structure/railing{
 	dir = 1
@@ -1374,8 +1382,7 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /turf/simulated/floor/tiled,
 /area/tcommsat/computer)
@@ -1387,12 +1394,15 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 26
+	},
 /turf/simulated/floor/tiled,
 /area/tcommsat/computer)
 "acE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 10;
-	icon_state = "intact"
+	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -1421,7 +1431,6 @@
 	},
 /obj/machinery/turretid/lethal{
 	ailock = 1;
-	check_synth = 0;
 	control_area = /area/tcommsat/chamber;
 	desc = "A firewall prevents AIs from interacting with this device.";
 	name = "Telecoms lethal turret control";
@@ -1744,7 +1753,6 @@
 	},
 /obj/machinery/turretid/stun{
 	ailock = 1;
-	check_synth = 0;
 	control_area = /area/tcomsat;
 	desc = "A firewall prevents AIs from interacting with this device.";
 	name = "Telecoms Foyer turret control";
@@ -1760,7 +1768,6 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 9
 	},
-/obj/machinery/suit_cycler/pilot,
 /obj/effect/floor_decal/corner/green/border{
 	dir = 9
 	},
@@ -1770,6 +1777,7 @@
 /obj/effect/floor_decal/corner/green/bordercorner2{
 	dir = 1
 	},
+/obj/structure/closet/secure_closet/pilot,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/pilot_office)
 "add" = (
@@ -1867,13 +1875,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/storage/tech)
 "adj" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
-/turf/simulated/floor,
-/area/storage/emergency_storage/emergency4)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "adk" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -1902,9 +1914,7 @@
 	name = "\improper Telecomms Entrance"
 	})
 "adm" = (
-/obj/machinery/atmospherics/binary/passive_gate/on{
-	dir = 2
-	},
+/obj/machinery/atmospherics/binary/passive_gate/on,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 8;
@@ -1971,13 +1981,19 @@
 /turf/simulated/floor/tiled/dark,
 /area/storage/tech)
 "adq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor,
-/area/storage/emergency_storage/emergency4)
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "adr" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -1996,18 +2012,6 @@
 /area/tcommsat/entrance{
 	name = "\improper Telecomms Entrance"
 	})
-"ads" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/door/airlock/maintenance/engi{
-	name = "Civilian Substation"
-	},
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor,
-/area/maintenance/substation/civilian)
 "adt" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -2213,6 +2217,11 @@
 	dir = 4
 	},
 /obj/machinery/meter,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -16;
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/gravity_lobby)
 "adI" = (
@@ -2322,11 +2331,18 @@
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/backup)
 "adU" = (
-/obj/machinery/light/small,
-/obj/machinery/floodlight,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor,
-/area/storage/emergency_storage/emergency4)
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/structure/cable/green,
+/obj/machinery/power/apc{
+	name = "south bump";
+	nightshift_setting = 0;
+	pixel_y = -28;
+	req_access = list(67)
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "adV" = (
 /obj/structure/closet/crate,
 /obj/random/maintenance/clean,
@@ -2370,6 +2386,12 @@
 	icon_state = "pipe-c"
 	},
 /obj/structure/catwalk,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/rust,
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "aea" = (
@@ -3048,7 +3070,6 @@
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration)
 "afE" = (
-/obj/machinery/vending/cola,
 /obj/effect/floor_decal/corner/lightgrey{
 	dir = 9
 	},
@@ -3058,6 +3079,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/vending/cola/soft,
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "afF" = (
@@ -3093,7 +3115,6 @@
 /turf/simulated/floor/tiled,
 /area/engineering/hallway)
 "afJ" = (
-/obj/machinery/vending/snack,
 /obj/machinery/light{
 	dir = 1
 	},
@@ -3107,6 +3128,7 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/vending/snlvend,
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "afK" = (
@@ -3115,6 +3137,10 @@
 	pixel_x = 26;
 	pixel_y = 8
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "afL" = (
@@ -3175,6 +3201,9 @@
 /obj/effect/floor_decal/corner/yellow/bordercorner2{
 	dir = 4
 	},
+/obj/structure/sign/poster{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_monitoring)
 "afR" = (
@@ -3741,6 +3770,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "aha" = (
@@ -3990,6 +4022,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "ahJ" = (
@@ -4182,6 +4219,10 @@
 	pixel_y = 22
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/white,
 /area/tether/exploration/hallway)
 "aij" = (
@@ -4219,10 +4260,6 @@
 /obj/effect/floor_decal/corner/lightgrey/border,
 /obj/effect/floor_decal/borderfloor/corner2,
 /obj/effect/floor_decal/corner/lightgrey/bordercorner2,
-/obj/machinery/computer/id_restorer{
-	dir = 1;
-	pixel_y = -32
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "aio" = (
@@ -4832,6 +4869,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/pathfinder_office)
 "ake" = (
@@ -5461,9 +5502,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/hallway)
-"alQ" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/substation/civilian)
 "alR" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/firealarm{
@@ -5473,9 +5511,6 @@
 /obj/vehicle/train/trolley,
 /turf/simulated/floor/tiled/monotile,
 /area/engineering/hallway)
-"alT" = (
-/turf/simulated/wall,
-/area/storage/emergency_storage/emergency4)
 "alV" = (
 /obj/structure/table/woodentable,
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -5683,7 +5718,12 @@
 /turf/simulated/floor/tiled,
 /area/engineering/engine_airlock)
 "amm" = (
-/obj/structure/closet/secure_closet/pilot,
+/obj/structure/table/rack/shelf,
+/obj/item/weapon/tank/oxygen,
+/obj/item/device/suit_cooling_unit,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/suit/space/void/pilot,
+/obj/item/clothing/head/helmet/space/void/pilot,
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
 	},
@@ -5786,10 +5826,15 @@
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "amE" = (
-/obj/machinery/portable_atmospherics/powered/pump/filled,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/plating,
-/area/storage/emergency_storage/emergency4)
+/obj/structure/mirror{
+	dir = 4;
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	pixel_y = 22
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "amJ" = (
 /obj/machinery/telecomms/processor/preset_two,
 /turf/simulated/floor/tiled/dark{
@@ -5978,6 +6023,9 @@
 /obj/machinery/computer/atmoscontrol{
 	dir = 4
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engineering_monitoring)
 "anf" = (
@@ -6168,6 +6216,9 @@
 	icon_state = "pipe-c"
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "anF" = (
@@ -6351,22 +6402,19 @@
 /turf/simulated/floor/tiled/dark,
 /area/tcommsat/computer)
 "aof" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/industrial/warning{
+/obj/structure/toilet{
 	dir = 4
 	},
-/obj/random/junk,
-/turf/simulated/floor,
-/area/maintenance/substation/civilian)
+/obj/machinery/light/small,
+/obj/machinery/button/remote/airlock{
+	id = "bathroomlock17";
+	name = "Bathroom Lock";
+	pixel_x = 8;
+	pixel_y = 25;
+	specialfunctions = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "aog" = (
 /obj/structure/table/rack/steel,
 /obj/item/weapon/circuitboard/mech_recharger{
@@ -6417,10 +6465,17 @@
 /turf/simulated/floor,
 /area/engineering/atmos/backup)
 "aoi" = (
-/obj/machinery/space_heater,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/plating,
-/area/storage/emergency_storage/emergency4)
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = 8
+	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -28
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "aoj" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/supply{
 	dir = 8
@@ -6626,9 +6681,6 @@
 	temperature = 80
 	},
 /area/tcommsat/chamber)
-"aoO" = (
-/turf/simulated/wall/r_wall,
-/area/storage/emergency_storage/emergency4)
 "aoP" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/material/plasteel{
@@ -7640,11 +7692,17 @@
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "arf" = (
-/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock{
+	name = "Emergency Storage"
+	},
 /obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/maintenance/common,
-/turf/simulated/floor/tiled,
-/area/maintenance/cargo)
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/storage/emergency_storage/emergency4)
 "arg" = (
 /obj/effect/floor_decal/techfloor,
 /obj/structure/window/reinforced{
@@ -7828,6 +7886,10 @@
 /obj/machinery/camera/network/engineering{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/backup)
 "arQ" = (
@@ -7948,6 +8010,10 @@
 /obj/effect/floor_decal/corner/green/bordercorner2{
 	dir = 4
 	},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "ask" = (
@@ -8065,6 +8131,7 @@
 	icon_state = "1-2"
 	},
 /obj/structure/railing,
+/obj/random/trash_pile,
 /turf/simulated/floor/plating,
 /area/maintenance/station/eng_lower)
 "asw" = (
@@ -8364,6 +8431,9 @@
 /obj/effect/floor_decal/corner/brown/bordercorner2{
 	dir = 1
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/delivery)
 "atn" = (
@@ -8626,6 +8696,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/hallway)
 "aux" = (
@@ -8823,6 +8896,7 @@
 /area/engineering/engine_eva)
 "avl" = (
 /obj/machinery/light_switch{
+	dir = 1;
 	pixel_x = -12;
 	pixel_y = -24
 	},
@@ -8900,6 +8974,10 @@
 /obj/structure/table/reinforced,
 /obj/item/device/suit_cooling_unit,
 /obj/item/device/suit_cooling_unit,
+/obj/machinery/light_switch{
+	pixel_x = 11;
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engine_eva)
 "avt" = (
@@ -8920,6 +8998,9 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/steeldecal/steel_decals6,
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
 "avw" = (
@@ -9112,7 +9193,7 @@
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "awe" = (
 /obj/machinery/light,
 /obj/structure/dogbed,
@@ -9428,9 +9509,10 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/random/trash_pile,
+/obj/machinery/portable_atmospherics/powered/pump/filled,
+/obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "axb" = (
 /obj/structure/disposalpipe/tagger{
 	dir = 8;
@@ -9586,8 +9668,11 @@
 "axC" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/catwalk,
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "axD" = (
 /obj/structure/disposalpipe/junction{
 	dir = 2;
@@ -9958,7 +10043,7 @@
 /obj/structure/catwalk,
 /obj/random/junk,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "azc" = (
 /turf/simulated/wall,
 /area/quartermaster/office)
@@ -10153,11 +10238,6 @@
 /turf/simulated/floor,
 /area/hallway/station/atrium)
 "azJ" = (
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -10165,6 +10245,9 @@
 	dir = 1
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "azK" = (
@@ -10722,6 +10805,7 @@
 /area/quartermaster/storage)
 "aBH" = (
 /obj/structure/disposalpipe/segment,
+/obj/random/trash_pile,
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "aBI" = (
@@ -10816,14 +10900,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/engineering/gravity_gen)
-"aBR" = (
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'HIGH VOLTAGE'";
-	icon_state = "shock";
-	name = "HIGH VOLTAGE"
-	},
-/turf/simulated/wall/r_wall,
-/area/maintenance/substation/civilian)
 "aBT" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -11097,6 +11173,24 @@
 /turf/simulated/floor/tiled,
 /area/engineering/hallway)
 "aCS" = (
+/obj/structure/table/rack{
+	dir = 1
+	},
+/obj/item/clothing/suit/fire/firefighter,
+/obj/item/weapon/tank/oxygen,
+/obj/item/clothing/mask/gas,
+/obj/item/weapon/extinguisher,
+/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/glasses/meson,
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_y = 24
+	},
+/obj/random/junk,
+/obj/random/tool,
+/obj/random/maintenance/clean,
+/obj/item/weapon/storage/box/lights/mixed,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -11105,11 +11199,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/railing{
-	dir = 8
+/obj/structure/cable/green{
+	d2 = 8;
+	icon_state = "0-8"
 	},
-/turf/simulated/floor,
-/area/maintenance/cargo)
+/turf/simulated/floor/plating,
+/area/storage/emergency_storage/emergency4)
 "aCT" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
@@ -11157,8 +11252,9 @@
 	icon_state = "1-2"
 	},
 /obj/structure/catwalk,
+/obj/effect/floor_decal/rust,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "aDi" = (
 /obj/machinery/alarm{
 	dir = 8;
@@ -11197,18 +11293,19 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "aDM" = (
-/obj/structure/cable/green{
-	d2 = 4;
-	icon_state = "0-4"
+/obj/structure/toilet{
+	dir = 4
 	},
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -28
+/obj/machinery/light/small,
+/obj/machinery/button/remote/airlock{
+	id = "bathroomlock16";
+	name = "Bathroom Lock";
+	pixel_x = 8;
+	pixel_y = 25;
+	specialfunctions = 4
 	},
-/obj/effect/floor_decal/industrial/warning/corner,
-/turf/simulated/floor,
-/area/maintenance/substation/civilian)
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "aDN" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
@@ -11217,30 +11314,16 @@
 /turf/simulated/floor/plating,
 /area/quartermaster/storage)
 "aDP" = (
-/obj/structure/table/rack{
-	dir = 1
+/obj/structure/mirror{
+	dir = 4;
+	pixel_y = 32
 	},
-/obj/item/clothing/suit/fire/firefighter,
-/obj/item/weapon/tank/oxygen,
-/obj/item/clothing/mask/gas,
-/obj/item/weapon/extinguisher,
-/obj/item/clothing/head/hardhat/red,
-/obj/item/clothing/glasses/meson,
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
+/obj/structure/sink{
+	pixel_y = 22
 	},
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "north bump";
-	pixel_y = 24
-	},
-/obj/random/junk,
-/obj/random/tool,
-/obj/random/maintenance/clean,
-/obj/item/weapon/storage/box/lights/mixed,
-/turf/simulated/floor/plating,
-/area/storage/emergency_storage/emergency4)
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "aDR" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
@@ -11568,22 +11651,6 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/substation/cargo)
-"aEX" = (
-/obj/machinery/power/terminal{
-	dir = 4
-	},
-/obj/structure/cable{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/simulated/floor,
-/area/maintenance/substation/civilian)
 "aFb" = (
 /obj/structure/cable/yellow{
 	d1 = 2;
@@ -11599,7 +11666,7 @@
 	})
 "aFe" = (
 /obj/machinery/door/airlock{
-	name = "Emergency Storage"
+	name = "Unisex Bathrooms"
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -11607,8 +11674,17 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/storage/emergency_storage/emergency4)
+/obj/machinery/door/airlock{
+	name = "Unisex Restrooms"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "aFJ" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -11724,11 +11800,6 @@
 /turf/simulated/floor/tiled,
 /area/engineering/hallway)
 "aGy" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -11747,13 +11818,12 @@
 /turf/simulated/wall/r_wall,
 /area/engineering/engineering_airlock)
 "aGP" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/random/trash_pile,
+/obj/effect/floor_decal/rust,
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "aHc" = (
@@ -11921,6 +11991,11 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "aIA" = (
@@ -13477,6 +13552,11 @@
 	pixel_y = -24
 	},
 /obj/random/tech_supply,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -13;
+	pixel_y = -27
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/engineering_monitoring)
 "aVN" = (
@@ -14087,6 +14167,11 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "bdT" = (
@@ -14275,8 +14360,13 @@
 	icon_state = "4-8"
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "bhg" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -14296,6 +14386,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
+"bhG" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor,
+/area/maintenance/station/eng_lower)
 "bhH" = (
 /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller{
 	frequency = 1381;
@@ -14340,6 +14440,11 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -26;
+	pixel_y = -8
+	},
 /turf/simulated/floor/tiled,
 /area/gateway/prep_room)
 "biP" = (
@@ -14565,7 +14670,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "bqK" = (
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 9
@@ -14711,11 +14816,10 @@
 /area/engineering/gravity_gen)
 "bvw" = (
 /obj/structure/railing,
-/obj/structure/railing{
-	dir = 8
-	},
+/obj/machinery/floodlight,
+/obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "bwb" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	frequency = 1379;
@@ -14889,6 +14993,11 @@
 /obj/effect/floor_decal/corner/green/bordercorner2{
 	dir = 6
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 26;
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "bEu" = (
@@ -15078,17 +15187,20 @@
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
 "bJG" = (
-/obj/structure/closet,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/engineering,
-/obj/random/maintenance/medical,
-/obj/random/tool,
-/obj/machinery/light/small{
-	dir = 8
+/obj/machinery/power/smes/buildable{
+	RCon_tag = "Substation - Exploration";
+	output_attempt = 0
+	},
+/obj/structure/cable{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/structure/cable/green,
+/obj/machinery/camera/network/engineering{
+	dir = 4
 	},
 /turf/simulated/floor,
-/area/maintenance/station/eng_lower)
+/area/maintenance/substation/civilian)
 "bKo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/structure/cable/green{
@@ -15294,6 +15406,22 @@
 	temperature = 80
 	},
 /area/tcommsat/chamber)
+"bQc" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/camera/network/command{
+	dir = 9
+	},
+/turf/simulated/floor,
+/area/maintenance/substation/civilian)
 "bQj" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -16512,11 +16640,13 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/excursion/general)
 "cOq" = (
-/obj/structure/catwalk,
-/obj/random/junk,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor,
-/area/maintenance/station/exploration)
+/obj/structure/mopbucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/janitor)
 "cOV" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -16806,7 +16936,6 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
 	},
-/obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/floor_decal/corner/green/border{
 	dir = 8
 	},
@@ -16820,6 +16949,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
+/obj/structure/closet/secure_closet/pilot,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/pilot_office)
 "ddj" = (
@@ -17123,6 +17253,17 @@
 	},
 /turf/simulated/shuttle/floor/yellow,
 /area/shuttle/mining_outpost/shuttle)
+"dqw" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/catwalk,
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/simulated/floor,
+/area/storage/emergency_storage/emergency4)
 "dqY" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -17263,6 +17404,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -26
+	},
 /turf/simulated/floor/tiled/dark,
 /area/ai_server_room)
 "dwX" = (
@@ -17312,6 +17457,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/dark,
 /area/tcommsat/entrance{
 	name = "\improper Telecomms Entrance"
@@ -17590,7 +17739,6 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/excursion/general)
 "dPx" = (
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -17609,6 +17757,12 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 9
 	},
+/obj/structure/disposalpipe/junction{
+	dir = 1
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/atrium)
 "dPS" = (
@@ -17649,6 +17803,7 @@
 /obj/machinery/camera/network/exploration{
 	dir = 5
 	},
+/obj/structure/closet/secure_closet/pilot,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/pilot_office)
 "dSp" = (
@@ -17694,6 +17849,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/foyer)
+"dVD" = (
+/obj/structure/table/steel,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = 9;
+	pixel_y = -24
+	},
+/turf/simulated/floor,
+/area/storage/tech)
 "dVT" = (
 /obj/structure/closet,
 /obj/random/maintenance/clean,
@@ -18347,19 +18511,6 @@
 /obj/machinery/door/firedoor/glass,
 /turf/simulated/floor/plating,
 /area/tether/station/dock_one)
-"eJJ" = (
-/obj/machinery/power/smes/buildable{
-	RCon_tag = "Substation - Asteroid Civilian";
-	cur_coils = 2;
-	output_attempt = 0
-	},
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/structure/cable/green,
-/turf/simulated/floor,
-/area/maintenance/substation/civilian)
 "eJU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/wall/rshull,
@@ -18691,6 +18842,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/tcommsat/chamber)
 "fdw" = (
@@ -18896,7 +19051,6 @@
 	name = "\improper Telecomms Solar Field"
 	})
 "fpX" = (
-/obj/structure/closet/secure_closet/pilot,
 /obj/effect/floor_decal/borderfloor,
 /obj/machinery/firealarm{
 	dir = 1;
@@ -19027,13 +19181,10 @@
 	},
 /area/tcommsat/chamber)
 "fwt" = (
-/obj/structure/railing{
-	dir = 1
-	},
-/obj/random/trash_pile,
+/obj/machinery/light/small,
 /obj/effect/floor_decal/rust,
-/turf/simulated/floor,
-/area/maintenance/station/exploration)
+/turf/simulated/floor/tiled,
+/area/janitor)
 "fwY" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/space;
@@ -19226,6 +19377,18 @@
 /area/tcommsat/entrance{
 	name = "\improper Telecomms Entrance"
 	})
+"fFM" = (
+/obj/structure/disposalpipe/segment,
+/obj/random/junk,
+/obj/random/junk,
+/obj/structure/closet,
+/obj/random/maintenance/medical,
+/obj/random/maintenance/medical,
+/obj/random/tool,
+/obj/random/tool,
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor,
+/area/maintenance/station/eng_lower)
 "fGL" = (
 /obj/machinery/light_construct/small,
 /turf/simulated/floor,
@@ -19612,6 +19775,15 @@
 	},
 /turf/simulated/wall/rshull,
 /area/shuttle/excursion/general)
+"gif" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor,
+/area/maintenance/station/eng_lower)
 "gjd" = (
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -19703,6 +19875,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/atrium)
 "gjZ" = (
@@ -19924,6 +20101,7 @@
 /area/gateway)
 "gDl" = (
 /obj/machinery/light_switch{
+	dir = 1;
 	pixel_x = -12;
 	pixel_y = -24
 	},
@@ -20461,6 +20639,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/gear)
+"heB" = (
+/turf/simulated/wall,
+/area/storage/emergency_storage/emergency4)
 "hfo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
@@ -20872,10 +21053,18 @@
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "hwK" = (
-/obj/random/junk,
-/obj/effect/floor_decal/rust,
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
 /turf/simulated/floor,
-/area/maintenance/station/eng_lower)
+/area/maintenance/substation/civilian)
 "hwX" = (
 /obj/machinery/door/airlock/glass{
 	name = "Telecomms Storage";
@@ -20957,6 +21146,10 @@
 /obj/item/weapon/stock_parts/subspace/treatment,
 /obj/item/weapon/stock_parts/subspace/treatment,
 /obj/item/weapon/stock_parts/subspace/treatment,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -26
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/tcomfoyer{
 	name = "\improper Telecomms Storage"
@@ -21312,6 +21505,9 @@
 	dir = 10
 	},
 /obj/structure/disposalpipe/segment,
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/station/dock_one)
 "hNs" = (
@@ -21421,6 +21617,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/dock_two)
+"hRu" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/wall/r_wall,
+/area/maintenance/substation/civilian)
 "hRF" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -22071,7 +22273,6 @@
 	name = "\improper Telecomms Storage"
 	})
 "iAk" = (
-/obj/structure/closet/secure_closet/pilot,
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
 	},
@@ -22090,6 +22291,7 @@
 /obj/effect/floor_decal/corner/green/bordercorner2{
 	dir = 4
 	},
+/obj/machinery/suit_cycler/pilot,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/pilot_office)
 "iAr" = (
@@ -22957,6 +23159,11 @@
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = 5
+	},
 /turf/simulated/floor/tiled,
 /area/tether/station/dock_two)
 "jEf" = (
@@ -23239,12 +23446,19 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/warehouse)
 "jUt" = (
+/obj/machinery/door/airlock/maintenance/engi{
+	name = "Exploration Substation"
+	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/random/junk,
 /turf/simulated/floor,
-/area/maintenance/station/eng_lower)
+/area/maintenance/substation/civilian)
 "jUS" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -23675,14 +23889,8 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/obj/structure/closet,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/engineering,
-/obj/random/maintenance/medical,
-/obj/random/tool,
-/turf/simulated/floor,
-/area/maintenance/station/eng_lower)
+/turf/simulated/wall/r_wall,
+/area/maintenance/substation/civilian)
 "kmS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -23714,6 +23922,22 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
+"knK" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/power/apc{
+	dir = 1;
+	name = "north bump";
+	pixel_y = 28
+	},
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled,
+/area/janitor)
 "knR" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -23991,6 +24215,13 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
+"kAM" = (
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -28
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "kBZ" = (
 /obj/structure/railing{
 	dir = 8
@@ -24403,9 +24634,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/tcomms)
 "kSd" = (
-/obj/machinery/vending/cola{
-	dir = 4
-	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
 	},
@@ -24421,6 +24649,9 @@
 /obj/machinery/camera/network/tether{
 	dir = 4
 	},
+/obj/machinery/vending/fitness{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/foyer)
 "kSu" = (
@@ -24743,6 +24974,12 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/white,
 /area/tether/station/dock_two)
+"lhm" = (
+/obj/machinery/power/breakerbox/activated{
+	RCon_tag = "Exploration Substation Bypass"
+	},
+/turf/simulated/floor,
+/area/maintenance/substation/civilian)
 "lhz" = (
 /obj/effect/floor_decal/borderfloor/corner{
 	dir = 1
@@ -24843,7 +25080,7 @@
 /obj/random/maintenance/cargo,
 /obj/random/maintenance/cargo,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "llC" = (
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/lightgrey/border,
@@ -25398,6 +25635,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "lIB" = (
@@ -26139,6 +26377,10 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "mto" = (
@@ -26177,6 +26419,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "mvn" = (
@@ -26242,6 +26487,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "myN" = (
@@ -26274,6 +26522,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/tether/exploration/equipment)
 "mzV" = (
@@ -26324,6 +26575,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/foyer)
+"mAl" = (
+/obj/structure/sign/securearea{
+	desc = "A warning sign which reads 'HIGH VOLTAGE'";
+	icon_state = "shock";
+	name = "HIGH VOLTAGE"
+	},
+/turf/simulated/wall/r_wall,
+/area/maintenance/substation/civilian)
 "mBY" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -26348,7 +26607,6 @@
 /turf/simulated/floor/tiled/eris/dark/techfloor_grid,
 /area/shuttle/securiship/cockpit)
 "mCI" = (
-/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 8
 	},
@@ -26360,6 +26618,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/disposalpipe/junction,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/hallway)
 "mEA" = (
@@ -26930,6 +27189,24 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/dock_two)
+"neb" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor,
+/area/maintenance/station/eng_lower)
 "nfp" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/grille,
@@ -27098,8 +27375,9 @@
 /area/tether/station/dock_one)
 "nll" = (
 /obj/random/trash_pile,
+/obj/machinery/light/small,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "nmN" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
@@ -27220,6 +27498,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/delivery)
+"nsH" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/airlock/maintenance/engi{
+	name = "Exploration Substation"
+	},
+/turf/simulated/floor,
+/area/maintenance/substation/civilian)
 "ntd" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -27568,6 +27855,14 @@
 /area/tcomsat{
 	name = "\improper Telecomms Lobby"
 	})
+"nJP" = (
+/obj/machinery/conveyor{
+	dir = 4;
+	id = "QMLoad"
+	},
+/obj/structure/sign/poster,
+/turf/simulated/floor/tiled,
+/area/quartermaster/storage)
 "nKT" = (
 /obj/structure/closet,
 /obj/random/maintenance/clean,
@@ -28177,6 +28472,15 @@
 /obj/random/maintenance/cargo,
 /turf/simulated/floor,
 /area/maintenance/station/cargo)
+"ovQ" = (
+/obj/machinery/firealarm{
+	pixel_y = 25
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor,
+/area/maintenance/substation/civilian)
 "owo" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -28294,6 +28598,23 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/hallway)
+"oEH" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/airlock{
+	name = "Custodial Closet";
+	req_access = list(26)
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/janitor)
 "oFl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -28390,6 +28711,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
+"oRC" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "oRO" = (
 /obj/effect/floor_decal/rust,
 /obj/structure/catwalk,
@@ -28822,6 +29149,9 @@
 	dir = 4
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "pwU" = (
@@ -28853,6 +29183,10 @@
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 9
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "pyE" = (
@@ -28902,26 +29236,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/ai_monitored/storage/eva)
 "pBP" = (
-/obj/machinery/power/sensor{
-	name = "Powernet Sensor - Asteroid Civilian Subgrid";
-	name_tag = "Asteroid Civilian Subgrid"
+/obj/machinery/door/airlock{
+	id_tag = "bathroomlock16";
+	name = "Toilet 2"
 	},
-/obj/structure/cable/green,
-/obj/structure/cable/green{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/structure/cable/green{
-	d2 = 8;
-	icon_state = "0-8"
-	},
-/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/alarm{
-	dir = 8;
-	pixel_x = 25
-	},
-/turf/simulated/floor,
-/area/maintenance/substation/civilian)
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "pCb" = (
 /obj/machinery/light,
 /turf/simulated/shuttle/floor/yellow,
@@ -28988,6 +29308,9 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
+"pKC" = (
+/turf/simulated/wall,
+/area/janitor)
 "pLb" = (
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 4
@@ -29002,6 +29325,11 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 24;
+	pixel_y = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/pilot_office)
 "pMe" = (
@@ -29016,6 +29344,12 @@
 "pMf" = (
 /turf/simulated/floor,
 /area/maintenance/station/exploration)
+"pNV" = (
+/obj/machinery/vending/wallmed1/public{
+	pixel_y = 28
+	},
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "pOc" = (
 /obj/machinery/door/window/westleft{
 	dir = 1
@@ -29350,6 +29684,11 @@
 /area/quartermaster/foyer)
 "qjQ" = (
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -25;
+	pixel_y = 20
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/refinery)
 "qkG" = (
@@ -29533,14 +29872,25 @@
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "qri" = (
-/obj/structure/closet,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/engineering,
-/obj/random/maintenance/medical,
-/obj/random/tool,
+/obj/machinery/power/sensor{
+	name = "Powernet Sensor - Exploration Subgrid";
+	name_tag = "Exploration Subgrid"
+	},
+/obj/structure/cable/green{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/structure/cable/green{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -28
+	},
 /turf/simulated/floor,
-/area/maintenance/station/eng_lower)
+/area/maintenance/substation/civilian)
 "qrr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -30318,12 +30668,18 @@
 	icon_state = "1-2"
 	},
 /obj/structure/railing,
-/obj/random/junk,
-/obj/machinery/light/small{
-	dir = 4
-	},
+/obj/machinery/space_heater,
+/obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
+"rkH" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor,
+/area/storage/emergency_storage/emergency4)
 "rlr" = (
 /obj/structure/table/standard,
 /obj/item/weapon/tape_roll,
@@ -30347,6 +30703,19 @@
 	},
 /turf/simulated/shuttle/floor/yellow/airless,
 /area/shuttle/belter)
+"rot" = (
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/catwalk,
+/obj/random/junk,
+/turf/simulated/floor,
+/area/maintenance/station/eng_lower)
 "rpf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -30508,6 +30877,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/refinery)
+"rxi" = (
+/turf/simulated/wall/r_wall,
+/area/maintenance/substation/civilian)
 "rxE" = (
 /obj/structure/table/steel,
 /obj/item/weapon/cell/high{
@@ -31181,6 +31553,10 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/light_switch{
+	pixel_x = 12;
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/delivery)
 "sme" = (
@@ -31218,6 +31594,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/dock_one)
+"spX" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/brown/border,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -13;
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled,
+/area/quartermaster/belterdock)
 "sqz" = (
 /obj/structure/disposalpipe/trunk,
 /obj/structure/disposaloutlet{
@@ -32309,6 +32695,13 @@
 	},
 /turf/simulated/floor/tiled/eris/dark/techfloor,
 /area/shuttle/medivac/engines)
+"tFR" = (
+/obj/random/junk,
+/obj/random/junk,
+/obj/random/tool,
+/obj/structure/closet/crate,
+/turf/simulated/floor,
+/area/maintenance/station/eng_lower)
 "tGc" = (
 /obj/structure/cable/green{
 	d1 = 2;
@@ -32672,12 +33065,9 @@
 /turf/simulated/floor/tiled/eris/dark/techfloor,
 /area/shuttle/medivac/engines)
 "ucJ" = (
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/random/junk,
+/obj/effect/floor_decal/rust,
 /turf/simulated/floor,
-/area/maintenance/cargo)
+/area/storage/emergency_storage/emergency4)
 "ucL" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -33171,6 +33561,9 @@
 /obj/effect/floor_decal/corner/brown/bordercorner2{
 	dir = 8
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock)
 "uKw" = (
@@ -33368,11 +33761,12 @@
 /turf/simulated/floor/tiled,
 /area/tether/exploration/crew)
 "uTC" = (
-/obj/machinery/power/breakerbox/activated{
-	RCon_tag = "Asteroid Civilian Substation Bypass"
+/obj/machinery/door/airlock{
+	id_tag = "bathroomlock17";
+	name = "Toilet 2"
 	},
-/turf/simulated/floor,
-/area/maintenance/substation/civilian)
+/turf/simulated/floor/tiled/white,
+/area/tether/station/restroom)
 "uTX" = (
 /obj/structure/table/rack,
 /obj/item/weapon/pickaxe,
@@ -33380,6 +33774,7 @@
 /obj/item/weapon/tool/crowbar,
 /obj/item/weapon/shovel,
 /obj/machinery/light_switch{
+	dir = 1;
 	pixel_x = -11;
 	pixel_y = -24
 	},
@@ -33631,6 +34026,14 @@
 "veJ" = (
 /turf/simulated/shuttle/floor/yellow,
 /area/shuttle/mining_outpost/shuttle)
+"vfW" = (
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 31;
+	pixel_y = -6
+	},
+/turf/simulated/floor/tiled,
+/area/quartermaster/warehouse)
 "vga" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/maintenance/common,
@@ -33896,6 +34299,12 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
+"vAk" = (
+/obj/structure/sink{
+	pixel_y = 22
+	},
+/turf/simulated/floor/tiled,
+/area/janitor)
 "vAn" = (
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 9
@@ -34056,6 +34465,10 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
+/obj/machinery/light_switch{
+	pixel_x = -11;
+	pixel_y = 26
+	},
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
 "vMN" = (
@@ -34344,17 +34757,8 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "wku" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/maintenance/engi{
-	name = "Civilian Substation"
-	},
-/turf/simulated/floor,
-/area/maintenance/substation/civilian)
+/turf/simulated/wall,
+/area/tether/station/restroom)
 "wmg" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -34541,15 +34945,10 @@
 /turf/simulated/floor,
 /area/maintenance/station/eng_lower)
 "wDI" = (
-/obj/structure/table/rack/shelf,
-/obj/item/weapon/tank/oxygen,
-/obj/item/device/suit_cooling_unit,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/suit/space/void/pilot,
-/obj/item/clothing/head/helmet/space/void/pilot,
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/green/border,
 /obj/machinery/light,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/pilot_office)
 "wEF" = (
@@ -35156,18 +35555,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/gateway)
 "xnM" = (
-/obj/structure/railing{
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -28
+	},
+/obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/obj/structure/table/rack{
-	dir = 8;
-	layer = 2.9
-	},
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/turf/simulated/floor,
-/area/maintenance/station/exploration)
+/obj/machinery/disposal,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled,
+/area/janitor)
 "xpA" = (
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/eva)
@@ -35212,12 +35610,21 @@
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
 "xuf" = (
-/obj/machinery/light/small,
-/obj/structure/railing{
-	dir = 1
+/obj/item/weapon/storage/box/lights/mixed,
+/obj/item/weapon/storage/box/mousetraps,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/machinery/alarm{
+	breach_detection = 0;
+	dir = 8;
+	pixel_x = 27;
+	rcon_setting = 3;
+	report_danger_level = 0
 	},
-/turf/simulated/floor,
-/area/maintenance/station/exploration)
+/obj/item/weapon/soap/nanotrasen,
+/obj/structure/closet,
+/turf/simulated/floor/tiled,
+/area/janitor)
 "xuh" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -35357,6 +35764,7 @@
 /obj/item/weapon/storage/box/nifsofts_mining,
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/brown/border,
+/obj/structure/sign/poster,
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/gear)
 "xBF" = (
@@ -44006,8 +44414,8 @@ arf
 bhc
 axC
 awc
-rpf
-tUh
+rkH
+heB
 llt
 aDv
 aDv
@@ -44098,7 +44506,7 @@ aln
 hmm
 apC
 cue
-aka
+dVD
 aaN
 uWn
 acz
@@ -44144,13 +44552,13 @@ jou
 mEA
 bVP
 lLY
-tUh
+heB
 aCS
 ucJ
 bvw
-lwh
-tUh
-tUh
+dqw
+heB
+heB
 aDv
 qai
 qmD
@@ -44271,7 +44679,7 @@ als
 aij
 qri
 bJG
-xOY
+lhm
 kmO
 adV
 kAv
@@ -44286,7 +44694,7 @@ jou
 ahb
 aim
 vzc
-tUh
+heB
 awZ
 bqj
 rjf
@@ -44411,11 +44819,11 @@ avL
 awT
 auc
 aij
-ack
+ovQ
 hwK
-ach
+bQc
 jUt
-ack
+gif
 ack
 aMr
 aqt
@@ -44553,10 +44961,10 @@ aij
 aij
 aij
 aij
-ack
-ach
-ack
-azD
+nsH
+mAl
+rxi
+hRu
 adZ
 aUX
 aMx
@@ -44694,8 +45102,8 @@ atT
 dso
 dso
 acM
-dso
-dso
+acr
+neb
 ujK
 dso
 aGy
@@ -44839,9 +45247,9 @@ abC
 anE
 aBH
 aBH
-aBH
+fFM
 aGP
-kkH
+tFR
 aeO
 aeO
 aeO
@@ -44979,11 +45387,11 @@ abC
 abC
 abC
 puz
-alQ
-alQ
-aBR
-ads
-alQ
+wku
+wku
+wku
+wku
+wku
 aeO
 afy
 afy
@@ -45120,12 +45528,12 @@ msn
 anc
 mYJ
 abC
-azD
-aBR
+bhG
+wku
 aDM
-aEX
+wku
 aof
-alQ
+wku
 aeO
 afy
 afy
@@ -45265,9 +45673,9 @@ abC
 azJ
 wku
 pBP
-eJJ
+wku
 uTC
-alQ
+wku
 aeO
 afy
 afy
@@ -45404,12 +45812,12 @@ muY
 mIs
 nay
 abC
-cXs
-alQ
-alQ
-alQ
-alQ
-alQ
+rot
+wku
+pNV
+oRC
+kAM
+wku
 aeO
 afy
 afy
@@ -45547,11 +45955,11 @@ mIs
 nay
 abC
 cXs
-alT
+wku
 aDP
 adj
 adU
-aoO
+wku
 aeO
 aeO
 afy
@@ -45689,11 +46097,11 @@ mJd
 nbQ
 abC
 cXs
-alT
+wku
 amE
 adq
 aoi
-alT
+wku
 aes
 aeP
 aeU
@@ -45831,11 +46239,11 @@ asP
 tfx
 bZv
 azI
-alT
-alT
+wku
+wku
 aFe
-alT
-alT
+wku
+wku
 crl
 nre
 acm
@@ -46153,7 +46561,7 @@ sBs
 nob
 azc
 aah
-azV
+vfW
 aBP
 pmX
 aDS
@@ -46310,7 +46718,7 @@ pyQ
 bwH
 fva
 cVW
-cHV
+spX
 seR
 tBs
 kAo
@@ -46407,8 +46815,8 @@ smz
 smz
 smz
 smz
-bWY
-etY
+oEH
+pKC
 aaD
 aaD
 aaD
@@ -46549,7 +46957,7 @@ dch
 dQR
 eVP
 smz
-bfH
+knK
 xnM
 aaD
 aaH
@@ -46691,7 +47099,7 @@ dge
 lSR
 fpX
 smz
-hrw
+vAk
 fwt
 aaD
 aaI
@@ -46975,8 +47383,8 @@ amm
 dUk
 ybD
 smz
-bfH
-acr
+etY
+etY
 aaD
 aaK
 aaY
@@ -47151,7 +47559,7 @@ aDz
 aDz
 aDy
 aEc
-aEh
+nJP
 awN
 btM
 xur
diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm
index b1e2b53c357..ce4bd5c55af 100644
--- a/maps/tether/tether_areas.dm
+++ b/maps/tether/tether_areas.dm
@@ -951,6 +951,10 @@
 	name = "\improper Dock Three"
 	icon_state = "dk_yellow"
 
+/area/tether/station/restroom
+	name = "\improper Unisex Restroom"
+	icon_state = "dk_yellow"
+
 /area/maintenance/station/abandonedholodeck
 	name = "\improper Old Holodeck"
 	icon_state = "dk_yellow"