From cf61454893a35222d6dd4716b489cccb71b48e9f Mon Sep 17 00:00:00 2001
From: EgorDinamit <egorayn2003@gmail.com>
Date: Tue, 16 May 2023 22:10:55 +0300
Subject: [PATCH] Mapping fixes

---
 maps/intrepid/intrepid1.dmm | 164 +++++++++++++++++++++++++-------
 maps/intrepid/intrepid2.dmm | 184 +++++++++++++++++++++---------------
 2 files changed, 238 insertions(+), 110 deletions(-)

diff --git a/maps/intrepid/intrepid1.dmm b/maps/intrepid/intrepid1.dmm
index 786c879bcf2..67ab59f2bcb 100644
--- a/maps/intrepid/intrepid1.dmm
+++ b/maps/intrepid/intrepid1.dmm
@@ -2821,6 +2821,9 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/atmos,
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/engineering/starboardthruster)
 "cnE" = (
@@ -3005,6 +3008,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/engineering/portthruster)
+"cyk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techfloor,
+/area/intrepid/department/exploration/storage)
 "cyZ" = (
 /obj/effect/floor_decal/corner/brown{
 	dir = 8
@@ -5590,7 +5597,7 @@
 /obj/machinery/button/blast_door{
 	id_tag = "solarcontrol";
 	name = "Solar Control Access button";
-	pixel_x = 9;
+	pixel_x = -6;
 	pixel_y = 22
 	},
 /turf/simulated/floor,
@@ -6613,6 +6620,13 @@
 /obj/machinery/portable_atmospherics/canister/air/airlock,
 /turf/simulated/floor,
 /area/intrepid/misc/maint/internalportside)
+"fvd" = (
+/obj/machinery/door/blast/shutters{
+	id_tag = "explorationstorage"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/intrepid/department/exploration/storage)
 "fvv" = (
 /obj/effect/floor_decal/corner/b_green/border{
 	dir = 6
@@ -7370,6 +7384,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/misc/hallway/center)
+"gdA" = (
+/obj/machinery/door/blast/shutters{
+	id_tag = "explorationstorage"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/intrepid/department/exploration/storage)
 "gdB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -9946,13 +9967,13 @@
 /turf/simulated/floor/tiled/white,
 /area/shuttle/research/cockpit)
 "iAU" = (
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
 /obj/machinery/door/blast/shutters/open{
 	dir = 4;
 	icon_state = "shutter0";
-	id_tag = "solarcontrol2"
-	},
-/obj/structure/cable{
-	icon_state = "4-10"
+	id_tag = "solarcontrol"
 	},
 /turf/simulated/floor,
 /area/intrepid/department/engineering/solarcontrol)
@@ -10580,8 +10601,8 @@
 "iZN" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/chem_disp_cartridge/coffee{
-	pixel_y = 9;
-	pixel_x = 7
+	pixel_x = 7;
+	pixel_y = 9
 	},
 /obj/effect/floor_decal/spline/fancy/black{
 	dir = 8
@@ -11042,6 +11063,16 @@
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/internalstarboard)
+"jBm" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/turf/simulated/floor/tiled/steel_grid,
+/area/intrepid/department/exploration/storage)
 "jBI" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -12749,6 +12780,10 @@
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/aft)
+"laD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techfloor,
+/area/intrepid/department/exploration/storage)
 "lbP" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -15256,6 +15291,9 @@
 	},
 /obj/effect/floor_decal/industrial/warning,
 /obj/structure/ladder/up,
+/obj/machinery/atmospherics/pipe/zpipe/up/fuel{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/engineering/starboardthruster)
 "mWr" = (
@@ -15556,13 +15594,14 @@
 "nhH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/visible/fuel{
-	dir = 6
-	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+	dir = 8;
+	icon_state = "map"
+	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/aft)
 "nim" = (
@@ -18957,9 +18996,6 @@
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/machinery/door/airlock/glass/mining{
 	dir = 4
 	},
@@ -19923,9 +19959,9 @@
 /area/intrepid/department/exploration/storage)
 "qIQ" = (
 /obj/structure/closet/secure_closet/guncabinet{
+	anchored = 1;
 	name = "ammunition cabinet";
-	req_access = list("ACCESS_INTREPID_SQUAD_LEADER");
-	anchored = 1
+	req_access = list("ACCESS_INTREPID_SQUAD_LEADER")
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/item/ammo_magazine/mil_rifle,
@@ -20096,6 +20132,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/visible/fuel{
+	dir = 6
+	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/aft)
 "qOJ" = (
@@ -23703,6 +23742,16 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/department/command/bridgeofficer)
+"tKe" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel_grid,
+/area/intrepid/department/exploration/storage)
 "tKm" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/intrepid/department/command/AI/AICore)
@@ -23755,6 +23804,7 @@
 /obj/effect/floor_decal/corner/paleblue/bordercorner{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/exploration/storage)
 "tMV" = (
@@ -23976,6 +24026,15 @@
 	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/prison)
+"tUZ" = (
+/obj/machinery/door/blast/shutters{
+	id_tag = "explorationstorage"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/intrepid/department/exploration/storage)
 "tVk" = (
 /turf/simulated/floor/tiled,
 /area/intrepid/department/cargo/cargobay)
@@ -24648,6 +24707,18 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/intrepid/misc/hallway/starboard)
+"uAC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/steel_grid,
+/area/intrepid/department/exploration/storage)
 "uCn" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass/command{
@@ -24957,12 +25028,6 @@
 /obj/structure/cable/orange{
 	icon_state = "4-8"
 	},
-/obj/machinery/button/blast_door{
-	id_tag = "solarcontrol";
-	name = "Solar Control Access button";
-	pixel_x = 23;
-	pixel_y = 22
-	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/aft)
 "uMQ" = (
@@ -25501,6 +25566,7 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 4
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/exploration/storage)
 "vmU" = (
@@ -26373,6 +26439,9 @@
 /obj/effect/floor_decal/corner/orange/border{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/exploration/storage)
 "vVq" = (
@@ -26561,6 +26630,7 @@
 /obj/effect/floor_decal/corner/orange/border{
 	dir = 8
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/exploration/storage)
 "wfx" = (
@@ -26676,6 +26746,16 @@
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/aft)
+"wjJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/visible/fuel,
+/turf/simulated/floor,
+/area/intrepid/misc/maint/aft)
 "wjY" = (
 /obj/machinery/camera/network/command{
 	c_tag = "Command - Command Hallway Portside";
@@ -26721,6 +26801,7 @@
 /obj/effect/floor_decal/corner/orange/bordercorner{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/exploration/storage)
 "wmy" = (
@@ -28850,6 +28931,19 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/engineering/monitoring)
+"ygk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/visible/fuel,
+/turf/simulated/floor,
+/area/intrepid/misc/maint/aft)
 "ygV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -55971,9 +56065,9 @@ eDk
 jir
 sUf
 vVf
-inR
-sPq
-rDJ
+tUZ
+ltF
+uAC
 sPq
 yfM
 xWP
@@ -56173,9 +56267,9 @@ bct
 mwJ
 wfs
 wmr
-inR
-sPq
-rJE
+gdA
+cyk
+tKe
 sGt
 yfM
 fNQ
@@ -56577,9 +56671,9 @@ qIQ
 pma
 vmy
 tMO
-inR
-sPq
-rDJ
+fvd
+laD
+jBm
 oVO
 huo
 oVO
@@ -58757,11 +58851,11 @@ gxF
 gxF
 gxF
 qOI
-gxF
-gxF
-gxF
-qGq
-gxF
+wjJ
+wjJ
+wjJ
+ygk
+wjJ
 nhH
 xlR
 jmU
diff --git a/maps/intrepid/intrepid2.dmm b/maps/intrepid/intrepid2.dmm
index 249b24acabe..f6c6fdb14b4 100644
--- a/maps/intrepid/intrepid2.dmm
+++ b/maps/intrepid/intrepid2.dmm
@@ -1030,8 +1030,8 @@
 /area/intrepid/department/engineering/engine_room/aux)
 "dM" = (
 /obj/machinery/door/blast/regular{
-	name = "Starboard Nacelle Access Blast Door";
-	id_tag = "cargostarboardnacelle"
+	id_tag = "cargostarboardnacelle";
+	name = "Starboard Nacelle Access Blast Door"
 	},
 /turf/simulated/floor,
 /area/space)
@@ -1096,8 +1096,8 @@
 /area/intrepid/department/engineering/engine_room)
 "ef" = (
 /obj/machinery/door/blast/regular{
-	name = "Top Deck Superstructure Maintaince Shaft Blast Door";
-	id_tag = "topdeckmaintshaft2"
+	id_tag = "topdeckmaintshaft2";
+	name = "Top Deck Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
@@ -2191,8 +2191,8 @@
 	pixel_x = -26
 	},
 /obj/structure/flora/pottedplant/deskleaf{
-	pixel_y = 6;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 6
 	},
 /obj/item/reagent_containers/food/drinks/glass2/coffeecup/foundation{
 	pixel_x = 7
@@ -2823,9 +2823,9 @@
 /area/intrepid/department/civillian/dockbaysix)
 "kD" = (
 /obj/machinery/computer/ship/helm{
+	dir = 4;
 	icon_state = "computer";
-	req_access = list("ACCESS_EXPLO_HELM");
-	dir = 4
+	req_access = list("ACCESS_EXPLO_HELM")
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/space)
@@ -3178,26 +3178,26 @@
 /obj/machinery/button/blast_door{
 	id_tag = "externaldockblastdoor1";
 	name = "Dock 1 External Blast Door button";
-	pixel_y = 6;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 6
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "internaldockblastdoor1";
 	name = "Dock 1 Internal Blast Door button";
-	pixel_y = -3;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = -3
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "externaldockblastdoor2";
 	name = "Dock 2 External Blast Door button";
-	pixel_y = 6;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 6
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "internaldockblastdoor2";
 	name = "Dock 2 Internal Blast Door button";
-	pixel_y = -3;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = -3
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/security/starboarddockingbaysecurity)
@@ -3644,9 +3644,9 @@
 "nh" = (
 /obj/machinery/button/blast_door{
 	dir = 4;
-	pixel_x = -25;
 	id_tag = "cargoportnacelle";
-	name = "Port Nacelle Access button"
+	name = "Port Nacelle Access button";
+	pixel_x = -25
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/space)
@@ -4158,6 +4158,9 @@
 /obj/structure/cable/orange{
 	icon_state = "0-8"
 	},
+/obj/machinery/light/spot{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/space)
 "pe" = (
@@ -4409,8 +4412,8 @@
 /area/shuttle/pandora/cockpit)
 "qg" = (
 /obj/structure/crematorium{
-	id = "morgue_furnace";
-	dir = 8
+	dir = 8;
+	id = "morgue_furnace"
 	},
 /obj/machinery/light/small/medbay{
 	dir = 4
@@ -4688,8 +4691,8 @@
 /area/intrepid/department/civillian/dockbaythree)
 "rp" = (
 /obj/machinery/door/blast/regular{
-	name = "Top Deck Superstructure Maintaince Shaft Blast Door";
-	id_tag = "topdeckmaintshaft4"
+	id_tag = "topdeckmaintshaft4";
+	name = "Top Deck Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/superstructure)
@@ -5371,6 +5374,15 @@
 /obj/effect/paint_stripe/yellow,
 /turf/simulated/wall/r_wall/prepainted,
 /area/intrepid/department/engineering/engine_room)
+"tG" = (
+/obj/structure/table/standard,
+/obj/structure/railing/mapped{
+	dir = 1;
+	icon_state = "railing0-1"
+	},
+/obj/machinery/light/spot,
+/turf/simulated/floor/tiled/techmaint,
+/area/space)
 "tJ" = (
 /obj/structure/catwalk,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5411,9 +5423,9 @@
 /area/intrepid/misc/maint/upper)
 "tO" = (
 /obj/machinery/door/blast/regular{
-	name = "Hangar Superstructure Maintaince Shaft Blast Door";
+	dir = 4;
 	id_tag = "hangarmaintshaft2";
-	dir = 4
+	name = "Hangar Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/department/exploration/hangar)
@@ -5514,6 +5526,9 @@
 	dir = 8
 	},
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "uc" = (
@@ -6508,6 +6523,7 @@
 /obj/machinery/computer/shuttle_control{
 	dir = 1
 	},
+/obj/machinery/light/spot,
 /turf/simulated/floor/tiled/techmaint,
 /area/space)
 "xg" = (
@@ -6944,9 +6960,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/door/blast/regular{
-	name = "Superstructure Maintaince Shaft Electrical Compartment Blast Door";
+	dir = 4;
 	id_tag = "superstructmaint";
-	dir = 4
+	name = "Superstructure Maintaince Shaft Electrical Compartment Blast Door"
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -7193,6 +7209,9 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "zT" = (
@@ -7542,20 +7561,20 @@
 /obj/machinery/button/blast_door{
 	id_tag = "externaldockblastdoor4";
 	name = "Dock 4 External Blast Door button";
-	pixel_y = 6;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 6
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "internaldockblastdoor4";
 	name = "Dock 4 Internal Blast Door button";
-	pixel_y = -3;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = -3
 	},
 /obj/machinery/button/blast_door{
+	dir = 4;
 	id_tag = "dockshutter";
 	name = "Checkpoint Shutters button";
 	pixel_x = 4;
-	dir = 4;
 	pixel_y = 2
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -7661,6 +7680,13 @@
 /obj/structure/catwalk,
 /turf/simulated/floor,
 /area/intrepid/department/engineering/engine_room/aux)
+"Bz" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/light/spot{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/steel_ridged,
+/area/space)
 "BA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -8267,9 +8293,9 @@
 /area/intrepid/department/engineering/engine_room)
 "DN" = (
 /obj/machinery/door/blast/regular{
-	name = "Supply Hangar Superstructure Maintaince Shaft Blast Door";
+	dir = 4;
 	id_tag = "supplyhangarmaintshaft2";
-	dir = 4
+	name = "Supply Hangar Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/superstructure)
@@ -8426,8 +8452,8 @@
 /area/intrepid/misc/maint/superstructure)
 "Ew" = (
 /obj/machinery/door/blast/regular{
-	name = "Top Deck Superstructure Maintaince Shaft Blast Door";
-	id_tag = "topdeckmaintshaft3"
+	id_tag = "topdeckmaintshaft3";
+	name = "Top Deck Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
@@ -8529,8 +8555,8 @@
 /area/intrepid/misc/maint/upper)
 "EK" = (
 /obj/machinery/door/blast/regular{
-	name = "Top Deck Superstructure Maintaince Shaft Blast Door";
-	id_tag = "topdeckmaintshaft5"
+	id_tag = "topdeckmaintshaft5";
+	name = "Top Deck Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
@@ -9159,9 +9185,9 @@
 /area/intrepid/department/command/commandquarters/psiadvisor)
 "Hi" = (
 /obj/machinery/door/blast/regular{
-	name = "Supply Hangar Superstructure Maintaince Shaft Blast Door";
+	dir = 4;
 	id_tag = "supplyhangarmaintshaft";
-	dir = 4
+	name = "Supply Hangar Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/superstructure)
@@ -9337,8 +9363,8 @@
 /area/shuttle/pandora/cargo)
 "HS" = (
 /obj/machinery/door/blast/regular{
-	name = "Port Nacelle Access Blast Door";
-	id_tag = "cargoportnacelle"
+	id_tag = "cargoportnacelle";
+	name = "Port Nacelle Access Blast Door"
 	},
 /turf/simulated/floor,
 /area/space)
@@ -9480,6 +9506,9 @@
 /area/intrepid/department/engineering/atmos)
 "Iv" = (
 /obj/machinery/computer/ship/engines,
+/obj/machinery/light/spot{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/space)
 "Iw" = (
@@ -9518,20 +9547,20 @@
 /obj/machinery/button/blast_door{
 	id_tag = "externaldockblastdoor3";
 	name = "Dock 3 External Blast Door button";
-	pixel_y = 6;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 6
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "internaldockblastdoor3";
 	name = "Dock 3 Internal Blast Door button";
-	pixel_y = -3;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = -3
 	},
 /obj/machinery/button/blast_door{
+	dir = 4;
 	id_tag = "dockshutter1";
 	name = "Checkpoint Shutters button";
 	pixel_x = 4;
-	dir = 4;
 	pixel_y = 2
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -9978,9 +10007,9 @@
 /area/intrepid/department/engineering/portthruster)
 "Kh" = (
 /obj/machinery/door/blast/regular{
-	name = "Port Nacelle Superstructure Maintaince Shaft Blast Door button";
+	dir = 4;
 	id_tag = "portnacellemaintshaft";
-	dir = 4
+	name = "Port Nacelle Superstructure Maintaince Shaft Blast Door button"
 	},
 /turf/simulated/floor/plating,
 /area/intrepid/department/engineering/portthruster)
@@ -11572,9 +11601,9 @@
 /area/intrepid/department/civillian/dockbayfour)
 "PL" = (
 /obj/machinery/door/blast/regular{
-	name = "Starboard Nacelle Superstructure Maintaince Shaft Blast Door button";
 	dir = 4;
-	id_tag = "starboardnacellemaintshaft"
+	id_tag = "starboardnacellemaintshaft";
+	name = "Starboard Nacelle Superstructure Maintaince Shaft Blast Door button"
 	},
 /turf/simulated/floor,
 /area/intrepid/department/engineering/starboardthruster)
@@ -11686,9 +11715,9 @@
 "Qk" = (
 /obj/machinery/button/blast_door{
 	dir = 4;
-	pixel_x = -25;
 	id_tag = "cargostarboardnacelle";
-	name = "Starboard Nacelle Access button"
+	name = "Starboard Nacelle Access button";
+	pixel_x = -25
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/space)
@@ -12030,8 +12059,8 @@
 /area/intrepid/department/civillian/dockbaysix)
 "RD" = (
 /obj/machinery/door/blast/regular{
-	name = "Hangar Superstructure Maintaince Shaft Blast Door";
-	id_tag = "hangarmaintshaft"
+	id_tag = "hangarmaintshaft";
+	name = "Hangar Superstructure Maintaince Shaft Blast Door"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -12061,8 +12090,8 @@
 /area/intrepid/department/civillian/dockbayone)
 "RK" = (
 /obj/machinery/door/blast/regular{
-	name = "Hangar Superstructure Maintaince Shaft Blast Door";
-	id_tag = "hangarmaintshaft4"
+	id_tag = "hangarmaintshaft4";
+	name = "Hangar Superstructure Maintaince Shaft Blast Door"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -12382,8 +12411,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/ai_status_display{
-	pixel_y = 32;
-	pixel_x = 32
+	pixel_x = 32;
+	pixel_y = 32
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor,
@@ -12582,9 +12611,9 @@
 /area/intrepid/misc/maint/upper)
 "TJ" = (
 /obj/machinery/door/blast/regular{
-	name = "Hangar Superstructure Maintaince Shaft Blast Door";
+	dir = 4;
 	id_tag = "hangarmaintshaft3";
-	dir = 4
+	name = "Hangar Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/superstructure)
@@ -12994,11 +13023,11 @@
 	pixel_y = -33
 	},
 /obj/machinery/button/blast_door{
+	dir = 1;
 	id_tag = "morgue";
 	name = "Morgue Ejection Blast Door button";
-	pixel_y = -30;
 	pixel_x = -4;
-	dir = 1
+	pixel_y = -30
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -13162,26 +13191,26 @@
 /obj/machinery/button/blast_door{
 	id_tag = "externaldockblastdoor5";
 	name = "Dock 5 External Blast Door button";
-	pixel_y = 6;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = 6
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "internaldockblastdoor5";
 	name = "Dock 5 Internal Blast Door button";
-	pixel_y = -3;
-	pixel_x = -7
+	pixel_x = -7;
+	pixel_y = -3
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "externaldockblastdoor6";
 	name = "Dock 6 External Blast Door button";
-	pixel_y = 6;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = 6
 	},
 /obj/machinery/button/blast_door{
 	id_tag = "internaldockblastdoor6";
 	name = "Dock 6 Internal Blast Door button";
-	pixel_y = -3;
-	pixel_x = 4
+	pixel_x = 4;
+	pixel_y = -3
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/security/portdockingbaysecurity)
@@ -13548,6 +13577,11 @@
 	},
 /turf/simulated/wall/r_wall/hull,
 /area/intrepid/misc/maint/superstructure)
+"Xm" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/light/spot,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/space)
 "Xn" = (
 /obj/structure/catwalk,
 /obj/structure/cable/green{
@@ -13922,8 +13956,8 @@
 /area/eva)
 "YA" = (
 /obj/machinery/door/blast/regular{
-	name = "Top Deck Superstructure Maintaince Shaft Blast Door";
-	id_tag = "topdeckmaintshaft"
+	id_tag = "topdeckmaintshaft";
+	name = "Top Deck Superstructure Maintaince Shaft Blast Door"
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/superstructure)
@@ -39880,7 +39914,7 @@ CN
 dS
 II
 Ot
-bD
+tG
 JJ
 Rv
 lJ
@@ -41087,12 +41121,12 @@ uz
 JJ
 Yu
 JJ
-aW
+Bz
 aW
 kb
 xm
 aW
-aW
+Xm
 JJ
 Yu
 JJ