diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index a5ea8f41ba1a2..5b8dbdd27ff53 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -8252,12 +8252,6 @@
 /obj/machinery/status_display/evac,
 /turf/closed/wall,
 /area/quartermaster/office)
-"bct" = (
-/obj/effect/turf_decal/tile/techfloorgrid{
-	dir = 5
-	},
-/turf/open/space/basic,
-/area/space)
 "bcy" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -14409,11 +14403,13 @@
 /obj/machinery/status_display/evac{
 	pixel_x = 32
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/machinery/camera/directional/east{
 	c_tag = "Interrogation room";
 	network = list("interrogation")
 	},
+/obj/structure/chair/foldable{
+	dir = 8
+	},
 /turf/open/floor/iron/dark,
 /area/security/main)
 "bTW" = (
@@ -15937,6 +15933,16 @@
 	},
 /turf/open/floor/iron,
 /area/engine/engineering)
+"cdN" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/iron/dark/smooth_large,
+/area/security/main)
 "cdX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light_switch{
@@ -38609,10 +38615,15 @@
 /turf/open/floor/plating,
 /area/security/checkpoint/medical)
 "gne" = (
-/obj/structure/chair/foldable,
 /obj/machinery/airalarm/directional/north{
 	pixel_y = 23
 	},
+/obj/structure/table/wood,
+/obj/item/taperecorder{
+	layer = 2.9;
+	pixel_x = -1;
+	pixel_y = 4
+	},
 /turf/open/floor/iron/dark,
 /area/security/main)
 "gnF" = (
@@ -38827,12 +38838,6 @@
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
-"gqe" = (
-/obj/machinery/airalarm/directional/south{
-	pixel_y = -22
-	},
-/turf/closed/wall/r_wall,
-/area/security/prison/shielded)
 "gqp" = (
 /obj/machinery/door/poddoor/preopen{
 	id = "brigfront";
@@ -39050,6 +39055,7 @@
 /obj/structure/chair/fancy/bench/right{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/security/prison)
 "gsS" = (
@@ -44259,12 +44265,6 @@
 	},
 /turf/open/floor/catwalk_floor/iron,
 /area/tcommsat/server)
-"hVJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/turf/open/space/basic,
-/area/space)
 "hVM" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
@@ -45647,8 +45647,11 @@
 /turf/open/floor/iron,
 /area/hallway/primary/fore)
 "irK" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
 /turf/open/floor/iron/dark,
 /area/security/main)
@@ -47576,6 +47579,11 @@
 	},
 /turf/open/floor/iron/white,
 /area/science/mixing)
+"jco" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/turf/open/floor/plating,
+/area/security/main)
 "jcs" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/blue/opposingcorners{
@@ -50971,8 +50979,8 @@
 /turf/open/floor/iron/dark,
 /area/medical/morgue)
 "kgi" = (
-/obj/structure/chair/foldable{
-	dir = 1
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
 	},
 /turf/open/floor/iron/dark,
 /area/security/main)
@@ -54812,6 +54820,11 @@
 	dir = 1
 	},
 /area/engine/atmos)
+"lwK" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/departments/minsky/medical/medical2,
+/turf/open/floor/plating,
+/area/medical/medbay/lobby)
 "lwT" = (
 /obj/structure/window/reinforced{
 	dir = 1;
@@ -60897,6 +60910,20 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/security/brig/medbay)
+"nrc" = (
+/obj/effect/turf_decal/tile/red/half/contrasted{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/iron/dark/smooth_edge{
+	dir = 4
+	},
+/area/security/main)
 "nrf" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -65941,20 +65968,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /turf/open/floor/iron,
 /area/crew_quarters/fitness/recreation)
-"oWQ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/red/half/contrasted{
-	dir = 1
-	},
-/turf/open/floor/iron/dark/smooth_edge{
-	dir = 4
-	},
-/area/security/main)
 "oWT" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -66008,16 +66021,6 @@
 	},
 /turf/open/floor/iron,
 /area/medical/chemistry)
-"oXU" = (
-/obj/effect/turf_decal/tile/red/half/contrasted{
-	dir = 1
-	},
-/obj/structure/sign/departments/medbay/alt2{
-	pixel_y = -32;
-	pixel_x = -32
-	},
-/turf/open/floor/iron,
-/area/security/brig)
 "oYi" = (
 /obj/machinery/vending/wardrobe/sec_wardrobe,
 /obj/effect/turf_decal/tile/red/anticorner/contrasted{
@@ -68141,7 +68144,6 @@
 /turf/open/floor/iron/grid/steel,
 /area/medical/virology)
 "pJP" = (
-/obj/structure/chair/foldable,
 /obj/item/radio/intercom{
 	broadcasting = 1;
 	frequency = 1423;
@@ -68149,6 +68151,9 @@
 	name = "Interrogation Intercom";
 	pixel_y = 24
 	},
+/obj/structure/chair/foldable{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/security/main)
 "pJR" = (
@@ -73471,9 +73476,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
 /turf/open/floor/iron/dark,
 /area/security/main)
 "rpS" = (
@@ -73535,12 +73537,10 @@
 /area/crew_quarters/heads/hop)
 "rqy" = (
 /obj/structure/table/wood,
-/obj/item/flashlight/lamp,
-/obj/item/taperecorder{
-	layer = 2.9;
-	pixel_x = -15;
-	pixel_y = 4
+/obj/item/folder/red{
+	pixel_x = 8
 	},
+/obj/item/flashlight/lamp,
 /turf/open/floor/iron/dark,
 /area/security/main)
 "rqA" = (
@@ -74153,6 +74153,14 @@
 	},
 /turf/open/floor/iron,
 /area/construction/mining/aux_base)
+"rAM" = (
+/obj/machinery/holopad,
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/iron/dark,
+/area/security/main)
 "rBd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -77086,10 +77094,6 @@
 	},
 /turf/open/floor/iron,
 /area/hallway/secondary/command)
-"suR" = (
-/obj/effect/spawner/structure/window/reinforced/tinted,
-/turf/closed/wall/r_wall,
-/area/security/brig)
 "suT" = (
 /obj/structure/chair/office,
 /turf/open/floor/carpet/grimy,
@@ -85607,6 +85611,10 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /turf/open/floor/iron/dark,
 /area/science/nanite)
+"vgz" = (
+/obj/structure/sign/departments/minsky/medical/medical2,
+/turf/closed/wall,
+/area/security/brig/medbay)
 "vgB" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -89089,14 +89097,10 @@
 /turf/open/floor/iron/white,
 /area/medical/medbay/aft)
 "wiX" = (
-/obj/machinery/holopad,
-/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/obj/structure/chair/foldable{
+	dir = 8
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/iron/dark,
 /area/security/main)
 "wjC" = (
@@ -89567,12 +89571,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
 /turf/open/floor/iron/dark,
 /area/engine/atmos)
-"wqd" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
-/turf/open/space/basic,
-/area/space)
 "wqg" = (
 /obj/structure/table/reinforced,
 /obj/machinery/newscaster{
@@ -93382,9 +93380,6 @@
 /turf/open/floor/iron,
 /area/security/courtroom)
 "xxT" = (
-/obj/structure/table/wood,
-/obj/item/taperecorder,
-/obj/item/folder/red,
 /obj/machinery/button/door{
 	id = "interrogationacess";
 	name = "Interrogation Access";
@@ -93392,6 +93387,9 @@
 	pixel_y = -6;
 	req_access_txt = "3"
 	},
+/obj/structure/chair/foldable{
+	dir = 4
+	},
 /turf/open/floor/iron/dark,
 /area/security/main)
 "xyD" = (
@@ -135752,7 +135750,7 @@ tLM
 jUF
 nqa
 nsr
-dGo
+lwK
 dYe
 xdx
 tNX
@@ -147296,7 +147294,7 @@ bgZ
 bgZ
 fqd
 oiE
-suR
+bgZ
 bgZ
 clw
 aaX
@@ -147552,7 +147550,7 @@ taC
 pZK
 sdY
 vSX
-oXU
+sdY
 uzA
 sYk
 clw
@@ -148307,7 +148305,7 @@ sQN
 sjv
 sjv
 sjv
-gqe
+sjv
 sjv
 sjv
 nAX
@@ -148316,7 +148314,7 @@ aaz
 tNF
 sMU
 nXU
-tNF
+vgz
 sXL
 lXi
 txd
@@ -149610,7 +149608,7 @@ bhd
 xDW
 vGc
 bLh
-pVV
+jco
 bhd
 bhd
 bhd
@@ -149858,7 +149856,7 @@ tNF
 tNF
 hNU
 igR
-tNF
+vgz
 bpa
 aZx
 oAB
@@ -150620,7 +150618,7 @@ uof
 beh
 gne
 rqy
-kgi
+rAM
 xcB
 kic
 whT
@@ -151133,8 +151131,8 @@ ssg
 wLW
 beh
 beh
-lnP
 beh
+lnP
 beh
 beh
 eWs
@@ -151390,8 +151388,8 @@ ssg
 sEn
 pVV
 oAH
-oWQ
 dzx
+nrc
 dzx
 ozi
 dzx
@@ -151647,8 +151645,8 @@ nyn
 rhW
 rtH
 jYR
+cdN
 oHM
-gYy
 vld
 fNx
 gYy
@@ -157298,7 +157296,7 @@ aaa
 aaa
 aaa
 aaa
-bct
+aaa
 aaa
 aaa
 aaa
@@ -159362,7 +159360,7 @@ aaa
 aaa
 aaa
 aaa
-wqd
+aaa
 aaa
 aaa
 aaa
@@ -159619,7 +159617,7 @@ aaa
 aaa
 aaa
 aaa
-hVJ
+aaa
 aaa
 aaa
 aaa
@@ -159876,7 +159874,7 @@ aaa
 aaa
 aaa
 aaa
-hVJ
+aaa
 aaa
 aaa
 aaa
@@ -160133,7 +160131,7 @@ aaa
 aaa
 aaa
 aaa
-hVJ
+aaa
 aaa
 aaa
 aaa
@@ -160390,7 +160388,7 @@ aaa
 aaa
 aaa
 aaa
-hVJ
+aaa
 aaa
 aaa
 aaa