From e23639974ea03d814d0abdf10ad84a2b7c78f8bf Mon Sep 17 00:00:00 2001
From: DarnTheMarn <117550914+DarnTheMarn@users.noreply.github.com>
Date: Wed, 7 Aug 2024 06:04:49 -0500
Subject: [PATCH] Moves techfab (#11301)

---
 _maps/map_files/BoxStation/BoxStation.dmm     | 15 ++--------
 _maps/map_files/CorgStation/CorgStation.dmm   |  6 ++--
 .../map_files/Deltastation/DeltaStation2.dmm  | 18 ++++-------
 _maps/map_files/EchoStation/EchoStation.dmm   |  5 ++--
 _maps/map_files/FlandStation/FlandStation.dmm |  3 +-
 _maps/map_files/KiloStation/KiloStation.dmm   | 10 +++----
 _maps/map_files/MetaStation/MetaStation.dmm   | 13 ++------
 _maps/map_files/RadStation/RadStation.dmm     | 30 ++++++++-----------
 8 files changed, 33 insertions(+), 67 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index a81e2ea7b6462..e9e8ef43fb35c 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -27907,8 +27907,6 @@
 /turf/open/floor/iron,
 /area/security/brig)
 "hRz" = (
-/obj/effect/turf_decal/stripes/box,
-/obj/machinery/rnd/production/techfab/department/security,
 /obj/effect/turf_decal/tile/red/fourcorners/contrasted,
 /obj/item/radio/intercom{
 	pixel_x = 28
@@ -38210,12 +38208,6 @@
 	},
 /turf/open/floor/plating,
 /area/quartermaster/exploration_dock)
-"mnG" = (
-/obj/effect/turf_decal/loading_area{
-	dir = 8
-	},
-/turf/open/floor/iron/dark,
-/area/security/main)
 "mnP" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -38340,11 +38332,10 @@
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
 "mrB" = (
-/obj/machinery/photocopier{
-	pixel_y = 3
-	},
 /obj/machinery/light,
 /obj/machinery/airalarm/directional/south,
+/obj/machinery/rnd/production/techfab/department/security,
+/obj/effect/turf_decal/stripes/box,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "mso" = (
@@ -96071,7 +96062,7 @@ gos
 tzr
 aEU
 aEU
-mnG
+aEU
 aEU
 eQj
 xTq
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index be60d7623450e..83fec45370945 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -56389,13 +56389,11 @@
 /turf/open/floor/iron,
 /area/ai_monitored/turret_protected/aisat/foyer)
 "sim" = (
-/obj/structure/table,
-/obj/item/melee/baton/loaded,
-/obj/item/restraints/handcuffs,
 /obj/machinery/light{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/red/half/contrasted,
+/obj/machinery/rnd/production/techfab/department/security,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "siu" = (
@@ -59287,6 +59285,7 @@
 	dir = 1;
 	pixel_y = 24
 	},
+/obj/item/melee/baton/loaded,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "tgl" = (
@@ -70507,7 +70506,6 @@
 /area/maintenance/starboard/secondary)
 "wKV" = (
 /obj/effect/turf_decal/tile/red/opposingcorners,
-/obj/machinery/rnd/production/techfab/department/security,
 /obj/machinery/light,
 /obj/machinery/light_switch{
 	pixel_x = -8;
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 767bed677030b..5438d4cc34303 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -35689,11 +35689,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
 	},
-/obj/effect/turf_decal/stripes/box,
-/obj/machinery/rnd/production/techfab/department/security,
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 4
 	},
+/obj/structure/table/reinforced,
 /turf/open/floor/iron,
 /area/security/main)
 "eQK" = (
@@ -63084,11 +63083,6 @@
 	},
 /turf/open/floor/prison,
 /area/security/prison)
-"nWG" = (
-/obj/effect/turf_decal/loading_area,
-/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/turf/open/floor/iron,
-/area/security/main)
 "nWQ" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -74714,20 +74708,17 @@
 /turf/open/floor/iron/dark,
 /area/chapel/office)
 "rUM" = (
-/obj/structure/table/reinforced,
 /obj/machinery/airalarm/directional/west{
 	pixel_x = -23
 	},
-/obj/item/clipboard,
-/obj/item/toy/figure/warden,
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/mask/gas/sechailer,
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 1
 	},
+/obj/machinery/rnd/production/techfab/department/security,
+/obj/effect/turf_decal/stripes/box,
 /turf/open/floor/iron,
 /area/security/warden)
 "rUZ" = (
@@ -89051,6 +89042,7 @@
 	dir = 4;
 	name = "Warden's Desk"
 	},
+/obj/item/toy/figure/warden,
 /turf/open/floor/iron,
 /area/security/warden)
 "wKK" = (
@@ -147072,7 +147064,7 @@ bgZ
 aaa
 bhe
 eQF
-nWG
+frY
 frY
 jjc
 kRr
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
index 595709c2ee0eb..c39a1ef28cded 100644
--- a/_maps/map_files/EchoStation/EchoStation.dmm
+++ b/_maps/map_files/EchoStation/EchoStation.dmm
@@ -3621,10 +3621,10 @@
 	dir = 6
 	},
 /obj/structure/window/reinforced,
-/obj/machinery/rnd/production/techfab/department/security,
 /obj/machinery/camera/autoname/directional/west{
 	network = list("ss13","security")
 	},
+/obj/structure/table,
 /turf/open/floor/iron,
 /area/security/brig)
 "btw" = (
@@ -24752,14 +24752,13 @@
 	alpha = 180;
 	dir = 4
 	},
-/obj/machinery/photocopier,
-/obj/effect/turf_decal/bot,
 /obj/machinery/newscaster{
 	pixel_y = 33
 	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/rnd/production/techfab/department/security,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "mtK" = (
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index bd2445201d768..8c43bdb0c18f2 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -30726,6 +30726,7 @@
 	id = "BrigFlashAft";
 	pixel_y = 25
 	},
+/obj/machinery/rnd/production/techfab/department/security,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "hPW" = (
@@ -46744,10 +46745,10 @@
 /turf/open/floor/plating,
 /area/maintenance/solars/port/aft)
 "lOm" = (
-/obj/machinery/rnd/production/techfab/department/security,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/structure/table/reinforced,
 /turf/open/floor/iron/techmaint,
 /area/security/brig)
 "lOq" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index e4e303f797c9b..954dcb3ff1c8c 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -62330,6 +62330,7 @@
 	pixel_x = 4;
 	pixel_y = 2
 	},
+/obj/item/storage/box/deputy,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "oxq" = (
@@ -67502,8 +67503,6 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
 	},
-/obj/machinery/rnd/production/techfab/department/security,
-/obj/effect/turf_decal/stripes/box,
 /turf/open/floor/iron/dark,
 /area/security/main)
 "qgm" = (
@@ -71485,10 +71484,6 @@
 /turf/open/floor/iron/dark,
 /area/security/execution/transfer)
 "rwa" = (
-/obj/structure/table,
-/obj/item/storage/box/deputy,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
 /obj/structure/reagent_dispensers/peppertank{
 	pixel_x = -30
 	},
@@ -71499,6 +71494,8 @@
 /obj/machinery/camera/autoname/directional/west{
 	network = list("ss13", "security")
 	},
+/obj/machinery/rnd/production/techfab/department/security,
+/obj/effect/turf_decal/stripes/box,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "rws" = (
@@ -76046,6 +76043,7 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
+/obj/item/hand_labeler,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "sZF" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 21bb09ac5c111..45bf37166dc86 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -1758,9 +1758,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/machinery/photocopier{
-	pixel_y = 3
-	},
+/obj/machinery/rnd/production/techfab/department/security,
 /turf/open/floor/iron/showroomfloor,
 /area/security/warden)
 "aqa" = (
@@ -28923,13 +28921,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/medical/medbay/aft)
-"fPI" = (
-/obj/machinery/rnd/production/techfab/department/security,
-/obj/effect/turf_decal/tile/red/anticorner,
-/turf/open/floor/iron/dark/smooth_corner{
-	dir = 1
-	},
-/area/security/main)
 "fPP" = (
 /obj/machinery/door/airlock/maintenance{
 	req_one_access_txt = "12;27;37"
@@ -111362,7 +111353,7 @@ hPH
 kqh
 jgG
 kqh
-fPI
+itu
 aqa
 ajm
 dEQ
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index db54e1201b566..e868e2ba67069 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -16617,21 +16617,10 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 8
 	},
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -5;
-	pixel_y = 4
-	},
-/obj/item/pen/red{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/folder/red{
-	pixel_x = 8
-	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/machinery/rnd/production/techfab/department/security,
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "fkr" = (
@@ -20964,8 +20953,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/machinery/rnd/production/techfab/department/security,
-/obj/effect/turf_decal/bot,
+/obj/structure/table,
 /turf/open/floor/iron/dark,
 /area/security/main{
 	name = "Security Locker Room"
@@ -32449,9 +32437,6 @@
 /obj/effect/turf_decal/tile/neutral/half/contrasted{
 	dir = 1
 	},
-/obj/effect/turf_decal/loading_area{
-	dir = 4
-	},
 /turf/open/floor/iron/dark,
 /area/security/main{
 	name = "Security Locker Room"
@@ -50744,6 +50729,17 @@
 /obj/item/firing_pin/off_station{
 	pixel_y = 11
 	},
+/obj/item/folder/red{
+	pixel_x = 8
+	},
+/obj/item/paper_bin{
+	pixel_x = -5;
+	pixel_y = 4
+	},
+/obj/item/pen/red{
+	pixel_x = -5;
+	pixel_y = 5
+	},
 /turf/open/floor/iron/dark,
 /area/security/warden)
 "pVF" = (