Soluna Nexus map fix 2.1 (#10575)

modular_chomp/maps/soluna_nexus/soluna_nexus-1.dmm

@@ -651,6 +651,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/hallway/Aft_1_Deck_Stairwell)
+"abu" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/obj/effect/floor_decal/arrivals,
+/turf/simulated/floor/tiled,
+/area/harbor/Dock5)
 "abv" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -2091,26 +2098,23 @@
 /turf/simulated/floor/water/deep/indoors,
 /area/hallway/Star_1Deck_Atrium)
 "adZ" = (
-/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/manifold/hidden{
-/obj/effect/floor_decal/shuttle/blue{
+	dir = 8
-	pixel_x = -1;
-	pixel_y = 1
 	},
-/obj/machinery/airlock_sensor{
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	dir = 4;
+	frequency = 1380;
-	pixel_x = -24
+	id_tag = "sc-D1_L1A1_airlock";
+	pixel_x = -24;
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6
-	},
-/obj/effect/map_helper/airlock/sensor/chamber_sensor,
 /obj/effect/floor_decal/steeldecal/steel_decals_central2{
+	dir = 1;
 	color = "#989898"
 	},
 /obj/structure/cable/white{
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/dark,
 /area/harbor/Dock1)
 "aea" = (
 /obj/effect/floor_decal/steeldecal/steel_decals6{
@@ -2160,6 +2164,15 @@
 /obj/structure/window/basic{
 	dir = 4
 	},
+/obj/structure/sign/directions/bar{
+	pixel_y = 9;
+	layer = 3.5;
+	dir = 1
+	},
+/obj/structure/sign/directions/stairs_up{
+	dir = 1;
+	layer = 3.5
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/Deck1_Star_Corridor)
 "aeg" = (
@@ -2430,6 +2443,96 @@
 	},
 /turf/simulated/floor/glass,
 /area/hallway/Deck1_Transit_Hall)
+"aeP" = (
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/floor_decal/shuttle/blue{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/techmaint,
+/area/harbor/Dock5)
+"aeQ" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/arrivals/right,
+/turf/simulated/floor/tiled,
+/area/harbor/Dock5)
+"aeR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 9
+	},
+/obj/effect/floor_decal/arrivals/right,
+/turf/simulated/floor/tiled,
+/area/harbor/Dock5)
+"aeS" = (
+/obj/effect/floor_decal/shuttle/blue{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/techmaint,
+/area/hallway/Aft_1_Deck_Stairwell)
+"aeT" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/dark,
+/area/harbor/Dock1)
+"aeU" = (
+/obj/machinery/light,
+/turf/simulated/floor/tiled/dark,
+/area/harbor/Dock4)
+"aeV" = (
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/harbor/Dock1)
+"aeW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/cable/white{
+	icon_state = "1-2"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/harbor/Dock4)
+"aeX" = (
+/obj/machinery/hologram/holopad,
+/obj/effect/floor_decal/shuttle/blue{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/machinery/airlock_sensor{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6
+	},
+/obj/effect/map_helper/airlock/sensor/chamber_sensor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central2{
+	color = "#989898"
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/harbor/Dock1)
 "aeY" = (
 /obj/machinery/door/firedoor/glass/hidden/steel{
 	dir = 1
@@ -2467,6 +2570,25 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/Telecomms_Control_Room)
+"afb" = (
+/obj/machinery/hologram/holopad,
+/obj/effect/floor_decal/shuttle/blue{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 10
+	},
+/obj/machinery/airlock_sensor{
+	dir = 8;
+	pixel_x = 24
+	},
+/obj/effect/map_helper/airlock/sensor/chamber_sensor,
+/obj/effect/floor_decal/steeldecal/steel_decals_central2{
+	color = "#989898"
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/harbor/Dock4)
 "afd" = (
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled,
@@ -2669,7 +2791,7 @@
 	desc = "A firewall prevents AIs from interacting with this device.";
 	name = "GravityGen lethal turret control";
 	pixel_y = 29;
-	req_access = list(10);
+	req_access = list(11, 19);
 	check_records = 0;
 	req_one_access = list(17,11,24)
 	},
@@ -6146,18 +6268,6 @@
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/shuttle/echidna)
-"aDh" = (
-/obj/effect/floor_decal/industrial/arrows/blue{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/arrows/blue{
-	dir = 8
-	},
-/obj/machinery/atmospherics/binary/pump{
-	name = "Waste to Scrubbers"
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/hallway/Aft_1_Deck_Stairwell)
 "aDi" = (
 /turf/simulated/wall/r_wall,
 /area/harbor/Port_Docking_Foyer)
@@ -6433,6 +6543,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 9
 	},
+/obj/effect/floor_decal/arrivals,
 /turf/simulated/floor/tiled,
 /area/harbor/Dock5)
 "aFj" = (
@@ -14633,6 +14744,7 @@
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
+/obj/effect/floor_decal/arrivals/right,
 /turf/simulated/floor/tiled,
 /area/hallway/Aft_1_Deck_Stairwell)
 "cXm" = (
@@ -15737,6 +15849,7 @@
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
 	},
+/obj/effect/floor_decal/arrivals,
 /turf/simulated/floor/tiled,
 /area/hallway/Aft_1_Deck_Stairwell)
 "doD" = (
@@ -17144,8 +17257,8 @@
 	},
 /obj/machinery/door/airlock/angled_bay/secure{
 	name = "Telecoms Control Room";
-	req_access = list(61);
+	req_access = list(17);
-	req_one_access = list(61);
+	req_one_access = list(17);
 	dir = 4
 	},
 /obj/structure/cable/green{
@@ -23944,7 +24057,7 @@
 	desc = "A firewall prevents AIs from interacting with this device.";
 	name = "Telecoms Control Room Turret Control";
 	pixel_y = 29;
-	req_access = list(10);
+	req_access = list(11, 19);
 	req_one_access = list(17,11,24)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -34991,6 +35104,10 @@
 "jSg" = (
 /obj/structure/reagent_dispensers/watertank/high,
 /obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/recharger/wallcharger{
+	pixel_y = -4;
+	pixel_x = 32
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/Xenobiology_Lab)
 "jSv" = (
@@ -42199,7 +42316,6 @@
 /turf/simulated/floor/wood/alt/parquet/turfpack/station,
 /area/hallway/Cryostorage_Lounge)
 "mwm" = (
-/obj/machinery/portable_atmospherics/canister/air,
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 4
 	},
@@ -42207,6 +42323,7 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/hatch/blue,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/Public_EVA)
 "mwp" = (
@@ -44422,26 +44539,23 @@
 /turf/simulated/floor/plating,
 /area/maintenance/ab_SportsField)
 "npa" = (
-/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/manifold/hidden{
-/obj/effect/floor_decal/shuttle/blue{
+	dir = 4
-	pixel_x = -1;
-	pixel_y = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	dir = 10
+	frequency = 1380;
+	id_tag = "sc-D1_L4A1_airlock";
+	pixel_x = 24;
+	dir = 8
 	},
-/obj/machinery/airlock_sensor{
-	dir = 8;
-	pixel_x = 24
-	},
-/obj/effect/map_helper/airlock/sensor/chamber_sensor,
 /obj/effect/floor_decal/steeldecal/steel_decals_central2{
+	dir = 1;
 	color = "#989898"
 	},
 /obj/structure/cable/white{
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/dark,
 /area/harbor/Dock4)
 "npi" = (
 /obj/machinery/door/firedoor/multi_tile/glass{
@@ -48369,9 +48483,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/obj/machinery/light{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/harbor/Dock4)
 "oFv" = (
@@ -56362,10 +56473,10 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/security/Exploration_Ship_Bay)
 "roQ" = (
-/obj/machinery/atmospherics/valve/shutoff{
-	name = "Harbor automatic shutoff valve"
-	},
 /obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/atmospherics/valve/open{
+	dir = 2
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/Distro_Harbor)
 "rpf" = (
@@ -62000,25 +62111,6 @@
 /obj/structure/cable,
 /turf/simulated/floor/plating,
 /area/maintenance/Deck1_AftPort_Chamber2)
-"twF" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 8
-	},
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1380;
-	id_tag = "sc-D1_L1A1_airlock";
-	pixel_x = -24;
-	dir = 4
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central2{
-	dir = 1;
-	color = "#989898"
-	},
-/obj/structure/cable/white{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/harbor/Dock1)
 "twM" = (
 /obj/structure/shuttle/engine/heater{
 	dir = 8
@@ -62827,6 +62919,7 @@
 	unlocked = 1;
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/plating,
 /area/maintenance/Distro_Central)
 "tLv" = (
@@ -63128,16 +63221,10 @@
 /obj/machinery/cell_charger{
 	pixel_y = 11
 	},
-/obj/machinery/recharger{
+/obj/item/cell/device,
-	pixel_x = -6;
-	pixel_y = -2
-	},
-/obj/item/cell/device{
-	pixel_x = 8
-	},
 /obj/item/cell/device{
 	pixel_y = -4;
-	pixel_x = 8
+	pixel_x = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/Xenobiology_Lab)
@@ -65720,6 +65807,7 @@
 /obj/machinery/atmospherics/valve/digital/open{
 	dir = 4
 	},
+/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/plating,
 /area/maintenance/Distro_Central)
 "uOA" = (
@@ -66778,6 +66866,10 @@
 "vic" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/reagent_dispensers/foam,
+/obj/machinery/recharger/wallcharger{
+	pixel_y = -4;
+	pixel_x = 32
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/Xenobiology_Lab)
 "vif" = (
@@ -69211,8 +69303,8 @@
 /turf/simulated/floor/tiled,
 /area/hallway/Port_1Deck_Atrium)
 "vUD" = (
-/obj/machinery/atmospherics/valve/shutoff{
+/obj/effect/floor_decal/industrial/outline/blue,
-	name = "Central automatic shutoff valve";
+/obj/machinery/atmospherics/valve/open{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
@@ -70497,6 +70589,9 @@
 	dir = 8;
 	pixel_y = -9
 	},
+/obj/structure/sign/directions/bar{
+	dir = 4
+	},
 /turf/simulated/wall,
 /area/crew_quarters/Public_Gateway)
 "wtj" = (
@@ -74944,25 +75039,6 @@
 /obj/machinery/door/firedoor/glass/hidden,
 /turf/simulated/floor/tiled/dark,
 /area/harbor/Fueling_Storage)
-"yaq" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 4
-	},
-/obj/machinery/embedded_controller/radio/airlock/docking_port{
-	frequency = 1380;
-	id_tag = "sc-D1_L4A1_airlock";
-	pixel_x = 24;
-	dir = 8
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals_central2{
-	dir = 1;
-	color = "#989898"
-	},
-/obj/structure/cable/white{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled/dark,
-/area/harbor/Dock4)
 "yaQ" = (
 /obj/structure/girder/reinforced,
 /obj/structure/cable/green{
@@ -75136,9 +75212,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/simulated/floor/tiled,
 /area/harbor/Dock1)
 "ydH" = (
@@ -88372,9 +88445,9 @@ qIQ
 aaf
 aaa
 aBe
-aVI
-kgv
 cNg
+kgv
+aeT
 aBe
 aaa
 aaa
@@ -88882,11 +88955,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
 cfp
 khE
 gOu
 cfp
+cfp
 xVx
 eZA
 eDP
@@ -89138,14 +89211,14 @@ aaa
 aaa
 aaa
 aaa
-aaa
 yek
 aaa
 com
+aeX
 adZ
-twF
 qOm
 weV
+aeV
 eDh
 aYG
 fWo
@@ -89398,12 +89471,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
 nBE
 rkI
 hPL
 ezu
 ybD
+azD
 aAX
 aAX
 wZu
@@ -89656,12 +89729,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
 cfp
 rbq
 gOu
 cfp
 kwu
+azD
 aAX
 aAX
 bRL
@@ -105179,7 +105252,7 @@ mWi
 abI
 ebd
 mdY
-mdY
+abu
 mdY
 mlW
 sEk
@@ -105403,7 +105476,7 @@ whv
 ese
 cnx
 sSr
-doz
+aeS
 bwK
 bKR
 bKR
@@ -105437,7 +105510,7 @@ sPh
 wpV
 pyv
 pyv
-pyv
+aeP
 pyv
 pyv
 kAW
@@ -105676,7 +105749,7 @@ bKR
 bKR
 pWo
 aJA
-aFh
+aeR
 aaY
 pkh
 aaY
@@ -105695,7 +105768,7 @@ abK
 abJ
 gvO
 fHt
-fHt
+aeQ
 fHt
 aXg
 abG
@@ -106949,7 +107022,7 @@ aeZ
 aKQ
 vNd
 uwl
-aDh
+aeZ
 mAs
 kAF
 aVW
@@ -121132,12 +121205,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
 wOk
 oAw
 gaP
 wOk
 raD
+eKQ
 okm
 okm
 sCl
@@ -121388,7 +121461,6 @@ aaa
 aaa
 aaa
 aaa
-aaa
 lJp
 aaa
 hAm
@@ -121396,6 +121468,7 @@ vsv
 qwQ
 qGN
 qBK
+eKQ
 okm
 okm
 mnS
@@ -121648,12 +121721,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
 dZk
+afb
 npa
-yaq
 gOf
 tWs
+aeW
 qGW
 fmF
 kpI
@@ -121906,11 +121979,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
 wOk
 acQ
 gaP
 wOk
+wOk
 xkT
 cHa
 tGZ
@@ -122428,9 +122501,9 @@ qIQ
 aaf
 aaa
 viE
-aFG
-cMm
 eVQ
+cMm
+aeU
 viE
 aaa
 aaa

modular_chomp/maps/soluna_nexus/soluna_nexus-2.dmm

@@ -199,9 +199,6 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/techmaint,
 /area/security/HoS_Office)
-"aan" = (
-/turf/simulated/wall/r_wall,
-/area/space)
 "aao" = (
 /obj/random/trash,
 /obj/structure/table/standard,
@@ -6085,6 +6082,20 @@
 /obj/structure/disposalpipe/segment{
 	dir = 1
 	},
+/obj/structure/sign/directions/medical{
+	dir = 4;
+	layer = 3.5
+	},
+/obj/structure/sign/directions/science{
+	dir = 4;
+	layer = 3.5;
+	pixel_y = 9
+	},
+/obj/structure/sign/directions/security{
+	pixel_y = -9;
+	dir = 1;
+	layer = 3.5
+	},
 /turf/simulated/floor/plating,
 /area/hallway/Central_2_Deck_Hall)
 "ajS" = (
@@ -6110,6 +6121,18 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/plating,
 /area/maintenance/Engineering_Substation)
+"ajU" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/effect/floor_decal/industrial/hatch,
+/obj/structure/grille,
+/obj/structure/window/titanium{
+	dir = 4
+	},
+/obj/structure/window/titanium{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/Deck2_Civilian_AftPortCorridor1)
 "ajV" = (
 /obj/machinery/door/firedoor/glass,
 /obj/effect/floor_decal/industrial/arrows/blue{
@@ -6478,6 +6501,13 @@
 /obj/effect/catwalk_plated/techmaint,
 /turf/simulated/floor/plating,
 /area/maintenance/Deck2_Port_Corridor)
+"akz" = (
+/obj/random/junk,
+/obj/random/trash,
+/obj/random/tech_supply,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/tiled/techmaint,
+/area/maintenance/Deck2_Civilian_StarChamber2)
 "akA" = (
 /obj/machinery/firealarm{
 	dir = 8;
@@ -6492,6 +6522,11 @@
 /obj/machinery/vending/emergencyfood/filled,
 /turf/simulated/floor/tiled,
 /area/quartermaster/Breakroom)
+"akB" = (
+/obj/random/junk,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/maintenance/Deck2_Civilian_StarChamber2)
 "akC" = (
 /obj/effect/floor_decal/steeldecal/steel_decals4{
 	dir = 10
@@ -6513,11 +6548,6 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/obj/structure/sign/directions/command{
-	pixel_y = -9;
-	dir = 1;
-	layer = 3.5
-	},
 /obj/structure/sign/directions/bar{
 	pixel_y = 9;
 	layer = 3.5;
@@ -7950,6 +7980,16 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/Chomp_Kitchen)
+"ani" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/Toxins_Viewing_Port)
 "anj" = (
 /obj/effect/floor_decal/milspec/box,
 /turf/simulated/floor/tiled/steel_ridged,
@@ -8533,12 +8573,30 @@
 	},
 /turf/simulated/floor/plating,
 /area/crew_quarters/Midnight_Kitchen)
+"aor" = (
+/obj/effect/catwalk_plated,
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+	dir = 6;
+	pixel_x = -1
+	},
+/turf/simulated/floor/plating/turfpack/airless,
+/area/harbor/Port_Shuttlebay)
 "aos" = (
 /obj/structure/cable/white{
 	icon_state = "1-4"
 	},
 /turf/simulated/wall/r_wall,
 /area/crew_quarters/Emergency_EVA)
+"aot" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/catwalk_plated,
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+	dir = 5
+	},
+/turf/simulated/floor/plating/turfpack/airless,
+/area/harbor/Port_Shuttlebay)
 "aou" = (
 /obj/structure/reagent_dispensers/cookingoil,
 /obj/machinery/light/small{
@@ -9323,11 +9381,6 @@
 /obj/random/tank,
 /turf/simulated/floor/plating,
 /area/maintenance/Deck2_Civilian_AftPortCorridor1)
-"apT" = (
-/obj/random/trash_pile,
-/obj/random/trash,
-/turf/simulated/floor/plating,
-/area/maintenance/Deck2_Civilian_AftPortCorridor1)
 "apU" = (
 /obj/structure/loot_pile/maint/technical,
 /obj/random/trash,
@@ -10440,6 +10493,21 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/plating,
 /area/maintenance/Deck2_Security_AftStarCorridor2)
+"ash" = (
+/obj/effect/catwalk_plated,
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+	dir = 9
+	},
+/turf/simulated/floor/plating/turfpack/airless,
+/area/harbor/Port_Shuttlebay)
+"asi" = (
+/obj/effect/catwalk_plated,
+/obj/machinery/shield_diffuser,
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+	dir = 10
+	},
+/turf/simulated/floor/plating/turfpack/airless,
+/area/harbor/Port_Shuttlebay)
 "ask" = (
 /obj/machinery/door/firedoor/glass/hidden/steel,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -23669,11 +23737,11 @@
 /area/hallway/AftStar_2_Deck_Observatory)
 "bmb" = (
 /obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/alarm{
 	dir = 1;
 	pixel_y = -22
 	},
+/obj/effect/floor_decal/industrial/hatch/blue,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/Emergency_EVA)
 "bmd" = (
@@ -24694,7 +24762,7 @@
 "bqr" = (
 /obj/machinery/air_sensor{
 	frequency = 1430;
-	id_tag = "SC-toxins_mixing_exterior";
+	id_tag = "toxins_mixing_exterior";
 	output = 63
 	},
 /turf/simulated/floor/reinforced/airless,
@@ -24937,8 +25005,8 @@
 /area/crew_quarters/Emergency_EVA)
 "brG" = (
 /obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/light,
+/obj/effect/floor_decal/industrial/hatch/blue,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/Emergency_EVA)
 "brH" = (
@@ -27517,7 +27585,7 @@
 /area/hallway/AftPort_2_Deck_Observatory)
 "bAj" = (
 /obj/structure/dispenser/oxygen,
-/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/effect/floor_decal/industrial/hatch/blue,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/Emergency_EVA)
 "bAk" = (
@@ -30822,12 +30890,12 @@
 /area/crew_quarters/Emergency_EVA)
 "bOr" = (
 /obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/effect/floor_decal/industrial/hatch/blue,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/Emergency_EVA)
 "bOt" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/effect/floor_decal/industrial/hatch/blue,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/Emergency_EVA)
 "bOx" = (
@@ -46973,6 +47041,7 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/plating,
 /area/maintenance/Medical_Substation)
 "dIY" = (
@@ -50985,7 +51054,6 @@
 	dir = 8;
 	layer = 2.6
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/item/tank/emergency/oxygen{
 	pixel_y = 11;
 	pixel_x = 7
@@ -51032,6 +51100,7 @@
 	name = "1S-requests console";
 	department = "EVA"
 	},
+/obj/effect/floor_decal/industrial/hatch/blue,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/Emergency_EVA)
 "eMA" = (
@@ -54508,6 +54577,9 @@
 "fGb" = (
 /obj/machinery/r_n_d/circuit_imprinter,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/reagent_dispensers/acid{
+	pixel_y = 28
+	},
 /turf/simulated/floor/plating,
 /area/engineering/Technical_Storage)
 "fGl" = (
@@ -54551,6 +54623,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
+/obj/effect/map_helper/airlock/button/int_button{
+	pixel_y = -14
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/rnd/Toxins_Viewing_Port)
 "fGS" = (
@@ -59790,11 +59865,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/Deck2_Security_AftStarCorridor2)
 "gTi" = (
-/obj/machinery/atmospherics/valve/shutoff{
+/obj/effect/floor_decal/industrial/outline/blue,
-	name = "Security automatic shutoff valve";
+/obj/machinery/atmospherics/valve/open{
 	dir = 4
 	},
-/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/plating,
 /area/maintenance/Security_Substation)
 "gTx" = (
@@ -61492,7 +61566,9 @@
 	autoclose = 0;
 	frequency = 1379;
 	id_tag = "SC-tox_airlock_exterior";
-	locked = 1
+	locked = 1;
+	req_access = list(7);
+	req_one_access = list(47)
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/rnd/Toxins_Mixing_Room)
@@ -66454,9 +66530,7 @@
 /turf/simulated/open,
 /area/maintenance/Deck2_Civilian_PortChamber2)
 "iHv" = (
-/obj/random/junk,
+/obj/random/maintenance/clean,
-/obj/random/trash,
-/obj/random/tech_supply,
 /turf/simulated/floor/tiled/techmaint,
 /area/maintenance/Deck2_Civilian_StarChamber2)
 "iHz" = (
@@ -67180,10 +67254,10 @@
 /area/quartermaster/Recycling)
 "iQL" = (
 /obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/newscaster{
 	pixel_y = -30
 	},
+/obj/effect/floor_decal/industrial/hatch/blue,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/Emergency_EVA)
 "iRm" = (
@@ -68367,6 +68441,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/valve/digital/open,
+/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/plating,
 /area/maintenance/Research_Substation)
 "jiD" = (
@@ -79738,11 +79813,6 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/obj/structure/sign/directions/security{
-	pixel_y = -9;
-	dir = 1;
-	layer = 3.5
-	},
 /obj/structure/sign/directions/kitchen{
 	pixel_y = 9;
 	layer = 3.5;
@@ -93853,6 +93923,7 @@
 	regulate_mode = 0;
 	unlocked = 1
 	},
+/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/plating,
 /area/maintenance/Research_Substation)
 "qBO" = (
@@ -94366,10 +94437,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/Deck2_Science_StarCorridor2)
 "qKI" = (
-/obj/machinery/atmospherics/valve/shutoff{
-	name = "Domicile automatic shutoff valve"
-	},
 /obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/atmospherics/valve/open{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/Distro_Civilian)
 "qKQ" = (
@@ -98126,7 +98197,7 @@
 "rHy" = (
 /obj/machinery/air_sensor{
 	frequency = 1430;
-	id_tag = "SC-toxins_mixing_interior";
+	id_tag = "toxins_mixing_interior";
 	output = 63
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -98326,6 +98397,9 @@
 	dir = 1
 	},
 /obj/effect/map_helper/airlock/door/ext_door,
+/obj/effect/map_helper/airlock/button/ext_button{
+	pixel_y = -14
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/rnd/Toxins_Viewing_Port)
 "rIN" = (
@@ -108659,10 +108733,10 @@
 /turf/simulated/floor/grass2/turfpack/station,
 /area/hallway/Aft_2_Deck_Central_Corridor_1)
 "uHv" = (
-/obj/machinery/atmospherics/valve/shutoff{
-	name = "Cargo automatic shutoff valve"
-	},
 /obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/atmospherics/valve/open{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/Cargo_Substation)
 "uHU" = (
@@ -110808,6 +110882,7 @@
 /area/crew_quarters/Library)
 "vpe" = (
 /obj/machinery/atmospherics/valve/digital/open,
+/obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/plating,
 /area/maintenance/Medical_Substation)
 "vpj" = (
@@ -112572,6 +112647,20 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/structure/sign/directions/cargo{
+	dir = 8;
+	layer = 3.5
+	},
+/obj/structure/sign/directions/engineering{
+	dir = 8;
+	layer = 3.5;
+	pixel_y = 9
+	},
+/obj/structure/sign/directions/command{
+	pixel_y = -9;
+	dir = 1;
+	layer = 3.5
+	},
 /turf/simulated/floor/plating,
 /area/hallway/Central_2_Deck_Hall)
 "vTu" = (
@@ -114376,8 +114465,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/Processing_Room)
 "woW" = (
-/obj/machinery/atmospherics/valve/shutoff{
+/obj/effect/floor_decal/industrial/outline/blue,
-	name = "Science automatic shutoff valve"
+/obj/machinery/atmospherics/valve/open{
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/Research_Substation)
@@ -119036,7 +119126,9 @@
 	autoclose = 0;
 	frequency = 1379;
 	id_tag = "SC-tox_airlock_exterior";
-	locked = 1
+	locked = 1;
+	req_access = list(7);
+	req_one_access = list(47)
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/rnd/Toxins_Mixing_Room)
@@ -120532,8 +120624,9 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/valve/shutoff{
+/obj/effect/floor_decal/industrial/outline/blue,
-	name = "Medical automatic shutoff valve"
+/obj/machinery/atmospherics/valve/open{
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/Medical_Substation)
@@ -133337,6 +133430,9 @@ aaa
 aaa
 aaa
 aaa
+aaf
+onO
+aaf
 aaa
 aaa
 aaa
@@ -133354,12 +133450,9 @@ aaa
 aaa
 aaa
 aaa
-aaa
+aaf
-aaa
+onO
-aaa
+aaf
-aaa
-aaa
-aaa
 aaa
 aaa
 aaa
@@ -133587,6 +133680,17 @@ aaa
 aaa
 aaa
 aaa
+cCw
+mAT
+iiP
+lVS
+cCw
+aaa
+aaa
+aaa
+dqa
+bCe
+dqa
 aaa
 aaa
 aaa
@@ -133594,10 +133698,9 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
-aaf
+ctj
-onO
+ctj
-aaf
 aaa
 aaa
 aaa
@@ -133605,19 +133708,9 @@ aaa
 aaa
 aaa
 aaa
-aaa
+dqa
-aaa
+bCe
-aaa
+dqa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-onO
-aaf
 aaa
 aaa
 aaa
@@ -133846,16 +133939,16 @@ onO
 aaf
 aaa
 cCw
-mAT
+aYr
-iiP
+oht
-lVS
+oht
 cCw
 aaa
 aaa
 aaa
-dqa
+ctj
-bCe
+sOr
-dqa
+ctj
 aaa
 aaa
 aaa
@@ -133873,9 +133966,9 @@ aaa
 aaa
 aaa
 aaa
-dqa
+ctj
-bCe
+sOr
-dqa
+ctj
 aaa
 aaa
 aaa
@@ -134104,7 +134197,7 @@ bCe
 onO
 aaa
 cCw
-aYr
+oht
 oht
 oht
 cCw
@@ -134112,7 +134205,7 @@ aaa
 aaa
 aaa
 ctj
-sOr
+key
 ctj
 aaa
 aaa
@@ -134132,7 +134225,7 @@ aaa
 aaa
 aaa
 ctj
-sOr
+key
 ctj
 aaa
 aaa
@@ -134614,7 +134707,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
 cCw
 uKl
 cCw
@@ -134872,7 +134965,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
 qmn
 vZd
 fsb
@@ -135040,8 +135133,8 @@ aop
 oGx
 uhW
 bNF
-klj
+ash
-klj
+aor
 klj
 paJ
 amH
@@ -135130,7 +135223,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
 rCD
 ocV
 oht
@@ -135388,7 +135481,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
 tAR
 jbZ
 wLS
@@ -136697,17 +136790,17 @@ aaa
 aaa
 aaa
 aaa
+ctj
+ctj
+ctj
+ctj
 aaa
 aaa
 aaa
-aaa
+ctj
-aaa
+ctj
-aaa
+ctj
-aaa
+ctj
-aaa
-aaa
-aaa
-aaa
 aaa
 aaa
 aaa
@@ -137104,8 +137197,8 @@ foi
 foi
 foi
 foi
-foi
+asi
-wFO
+aot
 klj
 gKx
 lVo
@@ -139793,17 +139886,17 @@ aaa
 aaa
 aaa
 aaa
+ctj
+ctj
+ctj
+ctj
 aaa
 aaa
 aaa
-aaa
+ctj
-aaa
+ctj
-aaa
+ctj
-aaa
+ctj
-aaa
-aaa
-aaa
-aaa
 aaa
 aaa
 aaa
@@ -143138,7 +143231,7 @@ bFD
 bFD
 bFD
 bFD
-aan
+aaa
 aaa
 aaa
 aaa
@@ -143395,9 +143488,9 @@ aqf
 aqc
 scW
 apX
-apT
 wZn
 oEW
+ajU
 jnk
 wZn
 aaa
@@ -166864,7 +166957,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
 eBy
 pin
 pwn
@@ -167122,7 +167215,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
 gFx
 kfm
 sQq
@@ -167380,7 +167473,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
 qcZ
 fWy
 apw
@@ -167638,7 +167731,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
 qcZ
 pUY
 qcZ
@@ -167902,7 +167995,7 @@ aqp
 aaf
 aaa
 qcZ
-xss
+akB
 iHv
 sQq
 qcZ
@@ -168160,15 +168253,15 @@ xBF
 onO
 aaa
 qcZ
-qJo
+xss
-kUm
+akz
-wyG
+lGm
 qcZ
 aaa
 aaa
 aaa
 ctj
-sOr
+key
 ctj
 aaa
 aaa
@@ -168188,7 +168281,7 @@ aaa
 aaa
 aaa
 ctj
-sOr
+key
 ctj
 aaa
 aaa
@@ -168418,16 +168511,16 @@ onO
 aaf
 aaa
 qcZ
-sbk
+qJo
-tKS
+kUm
-gky
+wyG
 qcZ
 aaa
 aaa
 aaa
-dqa
+ctj
-oBS
+sOr
-dqa
+ctj
 aaa
 aaa
 aaa
@@ -168445,9 +168538,9 @@ aaa
 aaa
 aaa
 aaa
-dqa
+ctj
-oBS
+sOr
-dqa
+ctj
 aaa
 aaa
 aaa
@@ -168675,6 +168768,17 @@ aaa
 aaa
 aaa
 aaa
+qcZ
+sbk
+tKS
+gky
+qcZ
+aaa
+aaa
+aaa
+dqa
+oBS
+dqa
 aaa
 aaa
 aaa
@@ -168682,10 +168786,9 @@ aaa
 aaa
 aaa
 aaa
-aaa
+ctj
-aaf
+ctj
-gWp
+ctj
-aaf
 aaa
 aaa
 aaa
@@ -168693,19 +168796,9 @@ aaa
 aaa
 aaa
 aaa
-aaa
+dqa
-aaa
+oBS
-aaa
+dqa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaf
-gWp
-aaf
 aaa
 aaa
 aaa
@@ -168941,6 +169034,9 @@ aaa
 aaa
 aaa
 aaa
+aaf
+gWp
+aaf
 aaa
 aaa
 aaa
@@ -168958,12 +169054,9 @@ aaa
 aaa
 aaa
 aaa
-aaa
+aaf
-aaa
+gWp
-aaa
+aaf
-aaa
-aaa
-aaa
 aaa
 aaa
 aaa
@@ -172713,7 +172806,7 @@ wWX
 wWX
 cAy
 tZJ
-moa
+ani
 uRn
 moa
 hcl