From faada1a9ffd5d11d7b7406295a23a154a73d79a2 Mon Sep 17 00:00:00 2001
From: Avery Marie <98699252+Eyeveri@users.noreply.github.com>
Date: Sat, 6 Apr 2024 18:56:40 -0400
Subject: [PATCH] Machinist Remap (#18734)

The current machinist bay is extremely tight and hard to maneuver in.
It's shape is odd, and players generally do not like using it.
So, with some creative insight from @NobleRow, I remapped the entire
workshop to replace where RnD and Exploratory chemistry were.

I moved exploratory chemistry and RnD to where the old machinist shop
was. Xenoarch's artifact storage and equipment room has been merged, and
telescience is where the old artifact storage room was.

New Workshop - We do lose some maintenance space, but it is made up for
by the improved playability of an extremely popular role.
I also put the water tank in maintenance because most players do this
already.
![StrongDMM-2024-03-23 14 49
57](https://github.com/Aurorastation/Aurora.3/assets/98699252/b80a45ce-b6a3-4f6f-886d-ba73fc9560a4)



Modified xeno storage - The storage area is entirely independent from
the equipment area. Nothing really changes, aside from layout and
location. I might revisit this and give dedicated lockers instead of the
racks for the suits, however.
![Modified Xenoequipment and
storage](https://github.com/Aurorastation/Aurora.3/assets/98699252/fded1180-c1e5-441d-b0f4-121a7fffeeb2)

New RnD/Chemlab - I tried a different layout to have RnD be visible to
the hall again, but it was very bad due to the 3x3 requirement for the
machinery to optimize QOL. There is less seating in this area, but I
added folding chairs to the science storage area incase they needed more
chairs. This map change does, however, make it so science is more
'consolidated'. RnD is now directly across from the RD's office, and
much closer to the meeting room and storage area.

![ADJUSTEDSCI](https://github.com/Aurorastation/Aurora.3/assets/98699252/e69ff311-6564-4fcc-aa5c-a4d19262809b)


New telescience location - Honestly I just moved it to where it is now
because it is barely played, but would still benefit xeno-arch the most,
I think.

![TelescienceNew](https://github.com/Aurorastation/Aurora.3/assets/98699252/61d1a105-a356-4bd2-9500-749427373a22)
---
 html/changelogs/changelog.yml                |   44 +
 icons/obj/structures.dmi                     |  Bin 171643 -> 172055 bytes
 maps/sccv_horizon/code/sccv_horizon_areas.dm |    6 +
 maps/sccv_horizon/sccv_horizon-1_deck_1.dmm  |  780 ++--
 maps/sccv_horizon/sccv_horizon-2_deck_2.dmm  | 3847 ++++++++++--------
 5 files changed, 2564 insertions(+), 2113 deletions(-)
 create mode 100644 html/changelogs/changelog.yml

diff --git a/html/changelogs/changelog.yml b/html/changelogs/changelog.yml
new file mode 100644
index 00000000000..f38ddef4bd0
--- /dev/null
+++ b/html/changelogs/changelog.yml
@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: ReadThisNamePlz
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - maptweak: "Remapped the Machinist workshop to be swapped with RnD and Exploratory Chemistry"
+  - maptweak: "Added a mecha-gantry, along with a random spawning mismatched exosuit"
+  - maptweak: "Moved Telescience to the xenoarcheology section of the ship"
+  - maptweak: "Combined xeno-archeology equipment storage with artifact storage"
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index db26a53b71d33e3c6be4f90148ac0a9cb3d4b71f..fe5ecd0fa7f0c3c49785a48165a6f64de738ce9d 100644
GIT binary patch
delta 4900
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
OmXf@hT*Y(Kpnn17_MH>}

delta 4485
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
KX}{BQjQAgz;;st-

diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm
index e4c6398ea75..478ca3f5ba8 100644
--- a/maps/sccv_horizon/code/sccv_horizon_areas.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm
@@ -173,6 +173,12 @@
 	area_blurb = "The scents of oil and mechanical lubricants fill the air in this workshop."
 	area_blurb_category = "robotics"
 
+/area/operations/lower/machinist/surgicalbay
+	name = "Machinist Surgical Bay"
+	icon_state = "machinist_workshop"
+	area_blurb = "The scent of sterilized equipment fill the air in this surgical bay."
+	area_blurb_category = "robotics"
+
 /area/operations/lobby
 	name = "Operations Lobby"
 
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index d3277a965c1..6beeaa2927e 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -119,6 +119,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/hangar/intrepid)
+"adE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/xenoarch_storage)
 "adX" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -905,7 +914,6 @@
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "aKo" = (
@@ -1015,8 +1023,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/closet/walllocker/firecloset{
+	pixel_x = -32
+	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
@@ -1304,11 +1313,8 @@
 /turf/simulated/wall,
 /area/hangar/control)
 "aWZ" = (
-/obj/structure/window/reinforced,
-/obj/structure/table/reinforced/steel,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/turf/simulated/wall/r_wall,
+/area/rnd/xenoarch_storage)
 "aXe" = (
 /obj/structure/tank_wall{
 	icon_state = "m-4"
@@ -1620,12 +1626,10 @@
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/crew_compartment)
 "bkV" = (
-/obj/effect/floor_decal/corner/purple{
-	dir = 5
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "bli" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -1733,11 +1737,12 @@
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
 "bpb" = (
-/obj/effect/floor_decal/corner/purple{
-	dir = 5
+/obj/machinery/camera/network/research{
+	c_tag = "Research - Xenoarchaeology Suits";
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "bpl" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /turf/simulated/floor/grass,
@@ -2667,11 +2672,19 @@
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
 "bRr" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/corner_wide/purple/diagonal,
+/obj/structure/bed/stool/chair/office/light{
+	dir = 1
+	},
 /obj/machinery/firealarm/west,
-/turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/obj/machinery/requests_console/west{
+	department = "Telescience Lab";
+	departmentType = 2;
+	name = "Telescience Requests Console";
+	pixel_y = -28
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/telesci)
 "bRU" = (
 /obj/machinery/light{
 	dir = 1
@@ -3629,12 +3642,6 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
 /obj/machinery/camera/network/research{
 	c_tag = "Research - Xenoarchaeology 3";
 	dir = 4
@@ -3644,6 +3651,12 @@
 	departmentType = 2;
 	name = "Xenoarchaeology Requests Console"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "czo" = (
@@ -3846,13 +3859,15 @@
 /turf/simulated/floor/plating,
 /area/rnd/xenoarch_atrium)
 "cIY" = (
-/obj/structure/anomaly_container,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/effect/floor_decal/corner_wide/purple/diagonal,
+/obj/machinery/computer/telescience{
+	starting_crystals = 4
 	},
-/turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/telesci)
 "cJx" = (
 /turf/simulated/wall/shuttle/unique/scc/research{
 	icon_state = "6,8"
@@ -3940,9 +3955,10 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "cLC" = (
-/obj/machinery/space_heater,
+/obj/structure/window/reinforced,
+/obj/structure/anomaly_container,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "cLQ" = (
 /obj/structure/bed/stool/chair/office/bridge/pilot{
 	dir = 4
@@ -4282,15 +4298,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
 /obj/structure/platform_deco,
 /obj/structure/cable/green{
-	icon_state = "1-8"
+	icon_state = "1-4"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
@@ -4406,6 +4419,8 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "dbS" = (
@@ -4421,10 +4436,13 @@
 /turf/simulated/floor/tiled,
 /area/horizon/custodial)
 "dcs" = (
-/obj/machinery/washing_machine,
-/obj/machinery/alarm/north,
+/obj/structure/table/reinforced/steel,
+/obj/machinery/power/apc/north,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "ddJ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4510,14 +4528,17 @@
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
 "dgW" = (
-/obj/effect/floor_decal/corner/purple{
-	dir = 5
-	},
-/obj/machinery/light{
-	dir = 8
-	},
+/obj/structure/table/rack,
+/obj/item/clothing/suit/hazmat/anomaly,
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/glasses/science,
+/obj/item/tank/oxygen,
+/obj/item/clothing/head/hazmat/anomaly,
+/obj/item/storage/box/gloves,
+/obj/item/storage/box/gloves,
+/obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "dhi" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -5868,8 +5889,6 @@
 	dir = 9
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "edO" = (
@@ -6097,25 +6116,12 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/test_range)
 "eog" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/hazmat/anomaly,
-/obj/item/clothing/mask/gas/alt,
-/obj/item/clothing/glasses/science,
-/obj/item/tank/oxygen,
-/obj/item/clothing/head/hazmat/anomaly,
-/obj/machinery/door/window/southleft{
-	name = "Anomaly Suit";
-	req_access = list(65)
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
+/obj/machinery/suspension_gen,
+/obj/machinery/light{
 	dir = 4
 	},
-/obj/item/storage/box/gloves,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "epb" = (
 /turf/simulated/wall/shuttle/unique/scc/research{
 	icon_state = "7,7"
@@ -6248,6 +6254,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "esK" = (
@@ -7179,25 +7188,10 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "eWA" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/hazmat/anomaly,
-/obj/item/clothing/mask/gas/alt,
-/obj/item/clothing/glasses/science,
-/obj/item/tank/oxygen,
-/obj/item/clothing/head/hazmat/anomaly,
-/obj/machinery/door/window/southleft{
-	name = "Anomaly Suit";
-	req_access = list(65)
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/item/storage/box/gloves,
+/obj/structure/dispenser,
+/obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "eWB" = (
 /turf/simulated/wall/shuttle/unique/scc/research{
 	icon_state = "11,17"
@@ -7465,6 +7459,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/mining)
+"fdr" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/outpost/research/anomaly_storage)
 "fdA" = (
 /obj/structure/tank_wall{
 	icon_state = "m-2"
@@ -7978,13 +7981,14 @@
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid/interstitial)
 "fuU" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/light/small{
-	dir = 8
+/obj/structure/table/rack,
+/obj/item/tank/oxygen,
+/obj/effect/floor_decal/corner_wide/purple/diagonal,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/turf/simulated/floor/tiled/white,
+/area/rnd/telesci)
 "fvn" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
@@ -9438,15 +9442,22 @@
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
 "gsc" = (
-/obj/machinery/door/window/southleft{
-	name = "Artifact Storage";
-	req_access = list(47)
+/obj/machinery/door/airlock/glass_research{
+	dir = 1;
+	name = "Telescience";
+	req_access = list(7)
 	},
+/obj/effect/map_effect/door_helper/unres{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/area/rnd/telesci)
 "gsd" = (
 /obj/machinery/light{
 	dir = 4
@@ -10117,6 +10128,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hangar/auxiliary)
+"gQg" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/telesci)
 "gQh" = (
 /obj/machinery/light/small{
 	dir = 8;
@@ -10853,23 +10873,9 @@
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
 "hqE" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/research{
-	dir = 4;
-	name = "Supplies Storage";
-	req_access = list(65)
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "hqH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
@@ -11063,11 +11069,8 @@
 /turf/simulated/floor/reinforced/nitrogen,
 /area/engineering/atmos/air)
 "hza" = (
-/obj/structure/window/reinforced,
-/obj/structure/table/reinforced/steel,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/turf/simulated/wall/r_wall,
+/area/rnd/telesci)
 "hzv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -11199,14 +11202,38 @@
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/crew_compartment)
 "hCV" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/requests_console/west{
+	department = "Telescience Lab";
+	departmentType = 2;
+	name = "Telescience Requests Console"
+	},
+/obj/structure/table/standard,
+/obj/item/paper_scanner{
+	pixel_x = -7
+	},
+/obj/effect/floor_decal/corner/mauve/full{
 	dir = 8
 	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/item/pen/black,
+/obj/item/device/gps/science{
+	pixel_x = 10;
+	pixel_y = 11
 	},
-/turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/obj/item/device/gps/science{
+	pixel_x = 10;
+	pixel_y = 7
+	},
+/obj/item/device/gps/science{
+	pixel_x = 10;
+	pixel_y = 3
+	},
+/obj/item/device/gps/science{
+	pixel_x = 10;
+	pixel_y = -1
+	},
+/obj/item/paper_bin,
+/turf/simulated/floor/tiled/white,
+/area/rnd/telesci)
 "hDd" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 4
@@ -12521,15 +12548,8 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/starboard/deck1)
 "iJi" = (
-/obj/effect/floor_decal/corner_wide/purple{
-	dir = 5
-	},
-/obj/effect/floor_decal/corner_wide/purple{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/white,
-/area/rnd/xenoarch_atrium)
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
+/area/rnd/telesci)
 "iJt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -12562,11 +12582,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/supply)
 "iJV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/machinery/alarm/north{
+	pixel_y = 51
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "iKo" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -12753,17 +12776,12 @@
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/atmos/propulsion)
 "iPz" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/structure/table/reinforced/steel,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "iPO" = (
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 6
@@ -13367,7 +13385,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "jmi" = (
@@ -13395,25 +13415,9 @@
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid)
 "jof" = (
-/obj/structure/table/rack,
-/obj/item/storage/box/monkeycubes{
-	pixel_x = 5;
-	pixel_y = -2
-	},
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes{
-	pixel_x = -5;
-	pixel_y = 2
-	},
-/obj/item/reagent_containers/spray/cleaner{
-	pixel_x = -4;
-	pixel_y = -3
-	},
-/obj/machinery/light{
-	dir = 8
-	},
+/obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "joF" = (
 /obj/effect/landmark/entry_point/port{
 	name = "port, deck 1 maintenance"
@@ -13772,7 +13776,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
-/obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "jyX" = (
@@ -14038,10 +14041,23 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian_west)
 "jGW" = (
+/obj/structure/table/rack,
+/obj/item/storage/box/monkeycubes{
+	pixel_x = 5;
+	pixel_y = -2
+	},
+/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/monkeycubes{
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = -4;
+	pixel_y = -3
+	},
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/structure/table/reinforced/steel,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "jHp" = (
@@ -14720,16 +14736,16 @@
 /area/hangar/operations)
 "kjH" = (
 /obj/structure/cable/green{
-	icon_state = "1-4"
+	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "kka" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/industrial/hatch/red,
@@ -14767,6 +14783,14 @@
 /obj/effect/floor_decal/corner/brown/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/outpost/mining_main/eva)
+"kkY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/xenoarch_storage)
 "klR" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -15028,6 +15052,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/test_range)
+"ksH" = (
+/obj/machinery/telepad,
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/reinforced,
+/area/rnd/telesci)
 "ksN" = (
 /obj/structure/shuttle_part/scc/research{
 	density = 0;
@@ -15166,7 +15195,7 @@
 	req_access = list(65)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "kyK" = (
 /obj/structure/shuttle_part/scc/research{
 	icon_state = "9,2";
@@ -15492,8 +15521,11 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "kHo" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -16714,10 +16746,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos)
 "lEN" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/alarm/east,
+/obj/machinery/power/apc/east,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/area/rnd/telesci)
 "lEQ" = (
 /obj/machinery/button/remote/blast_door{
 	id = "shutters_deck1_morgue2";
@@ -17726,11 +17760,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/hangar/canary)
 "mjd" = (
+/obj/effect/floor_decal/corner_wide/purple/diagonal,
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/tiled/white,
+/area/rnd/telesci)
 "mjG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -18134,6 +18170,7 @@
 /obj/machinery/cell_charger,
 /obj/item/storage/bag/inflatable,
 /obj/item/storage/bag/inflatable,
+/obj/item/device/camera,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "mwO" = (
@@ -18582,8 +18619,12 @@
 /obj/machinery/power/emitter{
 	dir = 8
 	},
+/obj/machinery/alarm/west,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "mOv" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -19530,15 +19571,17 @@
 /turf/simulated/floor/plating,
 /area/maintenance/research_port)
 "nsS" = (
-/obj/structure/closet/secure_closet/xenoarchaeologist{
-	req_access = null;
-	req_one_access = list(7,47)
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
+/obj/machinery/door/window/southleft{
+	name = "Artifact Storage";
+	req_access = list(47)
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "ntf" = (
 /obj/structure/tank_wall/nitrous_oxide{
 	density = 0;
@@ -20695,8 +20738,11 @@
 	name = "Suit Storage";
 	req_access = list(65)
 	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "oeq" = (
 /obj/structure/shuttle_part/scc/research{
 	icon_state = "6,6";
@@ -21082,10 +21128,17 @@
 /turf/simulated/floor/plating,
 /area/maintenance/operations)
 "oxp" = (
-/obj/machinery/suspension_gen,
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/door/airlock/glass_research{
+	dir = 1;
+	name = "Telescience";
+	req_access = list(7)
+	},
+/obj/effect/map_effect/door_helper/unres{
+	dir = 1
+	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/telesci)
 "oxw" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 4
@@ -22667,14 +22720,18 @@
 /turf/simulated/floor/plating,
 /area/shuttle/intrepid/crew_compartment)
 "pEb" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/obj/effect/floor_decal/corner_wide/purple/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
 	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/turf/simulated/floor/tiled/white,
+/area/rnd/telesci)
 "pEi" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -22700,12 +22757,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/storage/eva)
 "pEF" = (
-/obj/structure/closet/secure_closet/xenoarchaeologist{
-	req_access = null;
-	req_one_access = list(7,47)
-	},
+/obj/structure/window/reinforced,
+/obj/structure/table/reinforced/steel,
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "pEH" = (
 /obj/structure/shuttle_part/scc/scout{
 	icon_state = "7,7"
@@ -22986,6 +23041,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid)
+"pMO" = (
+/obj/structure/anomaly_container,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/outpost/research/anomaly_storage)
 "pMP" = (
 /obj/effect/shuttle_landmark/distress/blue,
 /turf/simulated/floor/plating,
@@ -23257,9 +23319,6 @@
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/firealarm/west,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
@@ -23711,12 +23770,17 @@
 /turf/simulated/floor/reinforced,
 /area/engineering/gravity_gen)
 "qmb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "qmi" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -24122,6 +24186,15 @@
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
+"qzj" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/telesci)
 "qzl" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -25157,7 +25230,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/outpost/research/anomaly_storage)
 "rmB" = (
 /obj/structure/shuttle/engine/propulsion/burst/right{
 	dir = 8
@@ -25644,6 +25717,18 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/aft)
+"rCE" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/xenoarch_storage)
 "rCK" = (
 /turf/simulated/wall/shuttle/unique/scc/research{
 	icon_state = "2,19"
@@ -26321,7 +26406,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "scW" = (
@@ -27045,11 +27132,21 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "sId" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/obj/structure/table/rack,
+/obj/item/clothing/suit/hazmat/anomaly,
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/glasses/science,
+/obj/item/tank/oxygen,
+/obj/item/clothing/head/hazmat/anomaly,
+/obj/item/storage/box/gloves,
+/obj/structure/cable/green{
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "sIp" = (
 /obj/structure/window/shuttle/unique/scc/scout{
 	icon_state = "3,3"
@@ -28274,10 +28371,27 @@
 /turf/simulated/floor/plating,
 /area/maintenance/operations)
 "txT" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/structure/dispenser,
+/obj/structure/table/rack,
+/obj/item/clothing/suit/hazmat/anomaly,
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/glasses/science,
+/obj/item/tank/oxygen,
+/obj/item/clothing/head/hazmat/anomaly,
+/obj/item/storage/box/gloves,
+/obj/item/clothing/head/hazmat/anomaly,
+/obj/item/tank/oxygen,
+/obj/item/clothing/glasses/science,
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/suit/hazmat/anomaly,
+/obj/item/storage/box/gloves,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "tyw" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /obj/machinery/door/blast/shutters/open{
@@ -28744,8 +28858,12 @@
 	pixel_x = 5;
 	pixel_y = -2
 	},
+/obj/machinery/power/apc/west,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "tPG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -30051,12 +30169,8 @@
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 4
 	},
-/obj/structure/closet/walllocker/firecloset{
-	pixel_x = -32
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "uIN" = (
@@ -30205,8 +30319,11 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/table/reinforced/steel,
-/obj/item/device/camera,
+/obj/structure/closet/secure_closet/xenoarchaeologist{
+	req_access = null;
+	req_one_access = list(7,47)
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "uPx" = (
@@ -31070,12 +31187,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
@@ -31083,6 +31194,8 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "vpa" = (
@@ -31342,6 +31455,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/deck1)
+"vxE" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 10
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/telesci)
 "vys" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/door/window/northleft{
@@ -31379,6 +31498,7 @@
 /obj/structure/noticeboard/anomaly{
 	pixel_y = 30
 	},
+/obj/machinery/space_heater,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "vBb" = (
@@ -31944,6 +32064,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
+"vXu" = (
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/telesci)
 "vYV" = (
 /obj/structure/tank_wall/air{
 	density = 0;
@@ -32051,15 +32175,9 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/atmos)
 "wbX" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/machinery/power/apc/north,
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
+/obj/machinery/alarm/east,
 /turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/area/rnd/telesci)
 "wce" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/railing/mapped{
@@ -32140,7 +32258,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/firealarm/north,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -32289,12 +32406,18 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Xenoarchaeology Suits";
-	dir = 8
+/obj/structure/table/rack,
+/obj/item/clothing/suit/hazmat/anomaly,
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/glasses/science,
+/obj/item/tank/oxygen,
+/obj/item/clothing/head/hazmat/anomaly,
+/obj/item/storage/box/gloves,
+/obj/machinery/light{
+	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/area/rnd/xenoarch_storage)
 "wjY" = (
 /turf/space/dynamic,
 /area/engineering/atmos/propulsion)
@@ -32897,6 +33020,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/engineering)
+"wGp" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/xenoarch_storage)
 "wHJ" = (
 /obj/effect/landmark/entry_point/fore{
 	name = "fore, d1 airlock"
@@ -33282,15 +33411,6 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "wVd" = (
@@ -33328,13 +33448,15 @@
 /turf/simulated/wall,
 /area/maintenance/wing/starboard/deck1)
 "wVW" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/effect/floor_decal/spline/plain{
+	dir = 6
 	},
-/obj/structure/table/reinforced/steel,
-/obj/item/device/flashlight/lamp,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/xenoarch_atrium)
+/obj/structure/sign/electricshock{
+	name = "\improper WARNING: HIGH VOLTAGE ELECTROMAGNETIC FIELDS IN USE sign";
+	pixel_x = 32
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/telesci)
 "wWe" = (
 /obj/machinery/atmospherics/pipe/simple/visible/purple{
 	dir = 4
@@ -33353,10 +33475,9 @@
 /turf/simulated/floor/tiled/white,
 /area/storage/eva)
 "wWV" = (
-/obj/structure/anomaly_container,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/area/rnd/telesci)
 "wWY" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -34904,15 +35025,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/hangar/intrepid)
 "xOC" = (
-/obj/structure/table/reinforced/steel,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/light/small{
-	dir = 4
+/obj/machinery/suit_cycler/science/prepared,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/outpost/research/anomaly_storage)
+/area/rnd/telesci)
 "xOV" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -61030,15 +61148,15 @@ mDt
 rPJ
 jAg
 kJG
-xtK
-xtK
-xtK
-xtK
-xtK
-xtK
-xtK
-xtK
-xtK
+oJe
+oJe
+oJe
+oJe
+aWZ
+aWZ
+aWZ
+aWZ
+aWZ
 fsf
 xtK
 xtK
@@ -61233,15 +61351,15 @@ mDt
 pom
 ggH
 pom
-xtK
-tPx
+oJe
+pMO
 jof
+cLC
 mOf
-xtK
-eog
+tPx
 dgW
 txT
-xtK
+aWZ
 xko
 eVY
 xtK
@@ -61436,12 +61554,12 @@ xAr
 bek
 hWY
 idq
-xtK
-oxp
+oJe
+dRh
 iJV
 cLC
-xtK
-eWA
+adE
+kkY
 bkV
 qmb
 oek
@@ -61640,14 +61758,14 @@ ccZ
 eXb
 jqc
 rlW
-kHg
+fdr
 kjH
 nsS
-xtK
-eWA
-bpb
+rCE
+kHg
+wGp
 sId
-xtK
+aWZ
 wfo
 xsS
 nKB
@@ -61842,15 +61960,15 @@ jNq
 vDT
 hEx
 wQv
-xtK
+oJe
 dcs
 iPz
 pEF
-xtK
+eog
 eWA
 bpb
 wjW
-xtK
+aWZ
 jEG
 cLh
 xtK
@@ -62045,15 +62163,15 @@ sfh
 sfh
 sfh
 sfh
-xtK
-xtK
+oJe
 hqE
-xtK
-xtK
-xtK
+hqE
+hqE
+aWZ
+aWZ
 kyq
-xtK
-xtK
+aWZ
+aWZ
 jRE
 syE
 xtK
@@ -62662,7 +62780,7 @@ lBH
 qYo
 wAk
 kEk
-wVW
+uPk
 uPk
 nwQ
 kLo
@@ -62866,7 +62984,7 @@ jrJ
 kJp
 sFA
 jrJ
-hSX
+jrJ
 mwu
 kLo
 gba
@@ -63069,7 +63187,7 @@ jrJ
 kVv
 qbu
 icl
-jrJ
+hSX
 hLq
 kLo
 uCw
@@ -64271,14 +64389,14 @@ eSV
 eSV
 eSV
 eSV
-rsL
-lCv
-lCv
-xtK
-xtK
-xtK
-xtK
-xtK
+iJi
+hza
+hza
+hza
+hza
+hza
+hza
+hza
 qWB
 lbr
 xtK
@@ -64474,15 +64592,15 @@ eSV
 eSV
 eSV
 eSV
-rsL
-rsL
-oJe
+iJi
+gQg
+vxE
 wWV
 cIY
 bRr
 fuU
 hza
-iJi
+qWB
 scq
 xtK
 vKP
@@ -64677,10 +64795,10 @@ eSV
 eSV
 eSV
 eSV
-eSV
-hob
-oJe
-wbX
+iJi
+ksH
+vXu
+wWV
 hCV
 mjd
 pEb
@@ -64880,14 +64998,14 @@ eSV
 eSV
 eSV
 eSV
-eSV
-hob
-oJe
-dRh
-dRh
+iJi
+qzj
+wVW
+oxp
+wbX
 lEN
 xOC
-aWZ
+hza
 aKn
 jlo
 xtK
@@ -65083,14 +65201,14 @@ eSV
 eSV
 eSV
 eSV
-eSV
-hob
-oVl
-oVl
-oVl
-oVl
-oVl
-oVl
+iJi
+hza
+hza
+hza
+hza
+hza
+hza
+hza
 xGs
 fQB
 oVl
@@ -65286,8 +65404,8 @@ eSV
 eSV
 eSV
 eSV
-eSV
-hob
+ozE
+ozE
 ozE
 uIL
 hHY
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index f8c30168a8b..9d976acb919 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -271,15 +271,6 @@
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/horizon/kitchen)
-"afD" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 9
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
 "agG" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d2-1-f"
@@ -1050,11 +1041,11 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room)
 "avz" = (
-/obj/effect/floor_decal/corner/mauve{
+/obj/effect/floor_decal/corner/black{
 	dir = 5
 	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
+/obj/effect/floor_decal/corner/brown{
+	dir = 5
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
@@ -1194,12 +1185,12 @@
 /turf/simulated/floor/tiled,
 /area/horizon/custodial/auxiliary)
 "ayA" = (
-/obj/machinery/firealarm/south,
-/obj/machinery/alarm/east{
-	req_one_access = list(24,11,55)
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/telesci)
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "ayF" = (
 /turf/simulated/wall,
 /area/hallway/primary/central_one)
@@ -1338,12 +1329,6 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_one)
-"aBr" = (
-/obj/effect/floor_decal/corner/mauve{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
 "aBx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -1385,22 +1370,25 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room/rust)
 "aCP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/effect/floor_decal/corner/mauve{
 	dir = 9
 	},
+/obj/structure/disposalpipe/sortjunction/flipped{
+	dir = 4;
+	name = "Research and Development";
+	sortType = "Research and Development"
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
 	},
 /obj/structure/cable/green{
-	icon_state = "1-2"
+	icon_state = "2-8"
 	},
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "aCS" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/machinery/mass_driver{
@@ -1659,6 +1647,9 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/dark_green,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "aKv" = (
@@ -2073,12 +2064,13 @@
 /turf/simulated/floor/tiled,
 /area/medical/first_responder)
 "aTp" = (
-/obj/machinery/optable,
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
+/obj/structure/bed/stool/chair/office/dark,
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "aTt" = (
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/machinery/light,
@@ -2168,11 +2160,18 @@
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
 "aUB" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 5
+/obj/machinery/conveyor{
+	id = "Robocompo"
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/obj/structure/platform{
+	dir = 4
+	},
+/obj/machinery/camera/network/supply{
+	c_tag = "Operations -  Machinist Workshop Starboard";
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "aUG" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -2255,16 +2254,17 @@
 /turf/simulated/floor/tiled,
 /area/engineering/storage_eva)
 "aWy" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 4
+/obj/machinery/door/blast/shutters{
+	id = "shutters_deck2_workshopdesk";
+	name = "Machinist Workshop Desk Shutter"
 	},
-/obj/structure/platform{
-	dir = 4
+/obj/structure/table/reinforced/steel,
+/obj/machinery/door/window/desk/northright{
+	name = "Machinist Workshop Desk";
+	req_access = list(29)
 	},
-/obj/machinery/suit_cycler/science/prepared,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/telesci)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "aWA" = (
 /obj/structure/table/standard,
 /obj/item/folder/purple,
@@ -2285,16 +2285,6 @@
 /obj/structure/lattice/catwalk/indoor/grate/damaged,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
-"aWN" = (
-/obj/effect/floor_decal/corner/black{
-	dir = 10
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/alarm/south,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
 "aXf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2871,13 +2861,9 @@
 /turf/simulated/floor/tiled,
 /area/turret_protected/ai_upload)
 "bmq" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/corner/mauve{
+/obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
@@ -3020,6 +3006,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
+"boB" = (
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/machinery/door/blast/shutters/open{
+	id = "mech_bay_shutter";
+	name = "Mech Bay Shutters";
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "boE" = (
 /obj/structure/closet/crate,
 /obj/random/loot,
@@ -3495,22 +3490,19 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_two/fore/starboard)
 "byI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/structure/table/standard,
+/obj/item/roller{
+	pixel_x = 2;
+	pixel_y = 3
 	},
-/obj/effect/floor_decal/corner/mauve/full,
-/obj/machinery/power/apc/west,
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -21;
-	pixel_y = -12
+/obj/item/mirror{
+	pixel_x = 7;
+	pixel_y = 4
 	},
+/obj/machinery/firealarm/west,
+/obj/item/storage/box/bodybags,
 /turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/area/operations/lower/machinist/surgicalbay)
 "byX" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -3606,11 +3598,16 @@
 /turf/simulated/floor/wood,
 /area/horizon/library)
 "bAZ" = (
-/obj/machinery/recharge_station,
-/obj/effect/floor_decal/corner/black/full,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/effect/floor_decal/corner/mauve{
+	dir = 9
+	},
+/obj/machinery/power/apc/west,
+/obj/structure/cable/green,
+/obj/structure/closet/secure_closet/scientist,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "bBh" = (
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 8
@@ -3867,18 +3864,16 @@
 /turf/simulated/floor/wood,
 /area/horizon/crew_quarters/lounge/bar)
 "bGh" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/telesci)
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
 "bGj" = (
-/obj/effect/floor_decal/corner/mauve{
+/obj/effect/floor_decal/corner/black{
 	dir = 10
 	},
-/obj/structure/bed/stool/chair/office/light{
-	dir = 8
-	},
-/obj/structure/extinguisher_cabinet/south,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "bGk" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 4
@@ -4014,13 +4009,14 @@
 /turf/simulated/open,
 /area/hallway/primary/central_one)
 "bJA" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/machinery/conveyor_switch/oneway{
+	desc = "A conveyor control switch. It appears to only go in one direction. Controls the components conveyor belt.";
+	id = "Robocompo";
+	pixel_x = 19;
+	pixel_y = 27
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "bJM" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/brown{
@@ -4356,10 +4352,19 @@
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
 "bQx" = (
-/obj/structure/disposalpipe/segment,
 /obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/railing/mapped{
+	dir = 1
+	},
+/obj/item/storage/toolbox/mechanical,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/plating,
-/area/maintenance/aft)
+/area/operations/lower/machinist)
 "bQB" = (
 /obj/structure/bed/stool/chair/sofa/pew/left{
 	dir = 8
@@ -4370,18 +4375,10 @@
 /turf/simulated/floor/wood,
 /area/chapel/main)
 "bQE" = (
-/obj/machinery/door/firedoor,
-/obj/structure/table/reinforced/steel,
-/obj/machinery/door/blast/shutters{
-	dir = 8;
-	id = "shutters_deck2_workshopdesk";
-	name = "Machinist Workshop Desk Shutter"
+/obj/effect/floor_decal/corner/black{
+	dir = 8
 	},
-/obj/machinery/door/window/desk/eastright{
-	name = "Machinist Workshop Desk";
-	req_access = list(29)
-	},
-/turf/simulated/floor/tiled/dark/full,
+/turf/simulated/floor/tiled,
 /area/operations/lower/machinist)
 "bQT" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -4637,16 +4634,15 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/smes/rust)
 "bWT" = (
-/obj/machinery/r_n_d/circuit_imprinter,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/spline/plain{
-	dir = 9
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 8
 	},
-/obj/structure/sign/nosmoking_1{
-	pixel_y = 32
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/alarm/north,
+/obj/structure/closet/hazmat/research,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled,
+/area/rnd/research)
 "bXB" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -5154,6 +5150,14 @@
 "cjD" = (
 /turf/simulated/wall/r_wall,
 /area/rnd/xenobiology/xenoflora_hazard)
+"cjJ" = (
+/obj/structure/sign/staff_only{
+	pixel_x = -31
+	},
+/obj/item/storage/box/fancy/tray/machinist,
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/white,
+/area/operations/lower/machinist/surgicalbay)
 "cjX" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 4
@@ -5185,12 +5189,21 @@
 	},
 /area/horizon/kitchen/freezer)
 "clb" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
 	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/effect/floor_decal/corner/black{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "cle" = (
 /obj/machinery/door/firedoor/multi_tile{
 	dir = 1
@@ -5278,23 +5291,16 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/kitchen)
 "cnQ" = (
-/obj/structure/table/steel,
-/obj/item/stack/material/glass/full,
-/obj/item/stack/material/steel/full,
-/obj/item/reagent_containers/glass/beaker/sulphuric{
-	pixel_y = 3
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 9
+/obj/machinery/r_n_d/circuit_imprinter,
+/obj/item/reagent_containers/glass/beaker{
+	pixel_y = 8
 	},
 /obj/structure/railing/mapped{
-	dir = 8
-	},
-/obj/structure/reagent_dispensers/acid{
-	pixel_y = 32
+	dir = 4
 	},
+/obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
+/area/operations/lower/machinist)
 "coa" = (
 /obj/structure/table/standard,
 /obj/machinery/light{
@@ -5589,6 +5595,13 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/turbolift/scc_ship/morgue_lift)
+"cyn" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
+	},
+/obj/structure/railing/mapped,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "cyG" = (
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
@@ -5624,6 +5637,12 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora)
+"czx" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "czJ" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/plating,
@@ -5663,16 +5682,12 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "cAp" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/reagent_dispensers/acid{
+	pixel_y = 32;
+	pixel_x = -32
 	},
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "cAt" = (
 /obj/structure/bed/stool/bar/padded/red{
 	dir = 4
@@ -5816,14 +5831,15 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/rnd/xenobiology)
 "cHz" = (
+/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance{
 	dir = 1;
-	name = "Machinist Workshop Maintenance";
-	req_access = list(29)
+	name = "Research and Development Maintenance";
+	req_access = list(7)
 	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/full,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/maintenance/wing/port)
 "cHC" = (
 /obj/structure/bed/stool/chair/sofa/right/orange,
 /turf/simulated/floor/carpet/red,
@@ -5842,9 +5858,6 @@
 /turf/simulated/floor/tiled,
 /area/engineering/rust_office)
 "cIr" = (
-/obj/machinery/light{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/dark_green/full{
 	dir = 4
 	},
@@ -6650,6 +6663,11 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
 /area/turret_protected/ai_upload)
+"cZL" = (
+/obj/random/junk,
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
 "cZT" = (
 /obj/effect/floor_decal/corner/mauve{
 	dir = 6
@@ -6752,6 +6770,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/aft_airlock)
+"dds" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "ddH" = (
 /obj/machinery/alarm/south,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -6813,18 +6843,13 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/gen_treatment)
 "dfO" = (
-/obj/machinery/requests_console/west{
-	department = "Telescience Lab";
-	departmentType = 2;
-	name = "Telescience Requests Console"
-	},
-/obj/structure/table/standard,
-/obj/item/paper_scanner,
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 8
+/obj/structure/sink{
+	pixel_y = 1;
+	dir = 8;
+	pixel_x = -15
 	},
 /turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/area/operations/lower/machinist/surgicalbay)
 "dfP" = (
 /obj/machinery/button/remote/airlock{
 	dir = 8;
@@ -6978,12 +7003,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/wing/port)
 "dki" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
-/obj/item/storage/box/fancy/vials,
-/obj/item/reagent_containers/dropper/electronic_pipette,
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/item/storage/bag/circuits/basic{
+	pixel_y = 5;
+	pixel_x = -11
+	},
+/obj/structure/platform{
+	dir = 1
+	},
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "dkp" = (
 /obj/structure/table/reinforced/steel,
 /obj/machinery/door/firedoor,
@@ -7056,6 +7086,14 @@
 /obj/structure/lattice/catwalk,
 /turf/simulated/open/airless,
 /area/horizon/exterior)
+"dlo" = (
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "dlG" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -7094,46 +7132,29 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
 "dlT" = (
-/obj/structure/table/standard,
-/obj/item/device/flash/synthetic{
-	pixel_x = -5;
-	pixel_y = 6
+/obj/machinery/alarm/south,
+/obj/structure/closet/crate,
+/obj/item/device/assembly/timer,
+/obj/item/device/assembly/timer,
+/obj/item/device/assembly/timer,
+/obj/item/device/assembly/timer,
+/obj/item/device/assembly/igniter,
+/obj/item/device/assembly/igniter,
+/obj/item/device/assembly/igniter,
+/obj/item/device/assembly/igniter,
+/obj/item/grenade/chem_grenade,
+/obj/item/grenade/chem_grenade,
+/obj/item/grenade/chem_grenade,
+/obj/item/grenade/chem_grenade,
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/item/device/flash/synthetic{
-	pixel_x = -5;
-	pixel_y = 2
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 4
 	},
-/obj/item/device/flash/synthetic{
-	pixel_x = -3;
-	pixel_y = 6
-	},
-/obj/item/device/flash/synthetic{
-	pixel_x = -3;
-	pixel_y = 2
-	},
-/obj/item/storage/firstaid/empty{
-	pixel_x = 7
-	},
-/obj/item/storage/firstaid/empty{
-	pixel_x = 7
-	},
-/obj/item/device/healthanalyzer{
-	pixel_x = 8
-	},
-/obj/item/device/healthanalyzer{
-	pixel_x = 8
-	},
-/obj/item/device/assembly/prox_sensor{
-	pixel_x = 8
-	},
-/obj/item/device/assembly/prox_sensor{
-	pixel_x = 8
-	},
-/obj/effect/floor_decal/corner/black{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "dmD" = (
 /obj/machinery/light{
 	dir = 4
@@ -7229,12 +7250,9 @@
 /area/template_noop)
 "dpv" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/effect/floor_decal/corner/dark_green{
+/obj/effect/floor_decal/corner/black{
 	dir = 5
 	},
-/obj/effect/floor_decal/industrial/warning/corner{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "dpE" = (
@@ -7287,16 +7305,18 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/office)
 "drw" = (
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "Robocompo"
-	},
-/obj/structure/plasticflaps,
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/computer/rdconsole/core{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "drB" = (
 /obj/effect/floor_decal/corner/mauve/full{
 	dir = 8
@@ -7321,7 +7341,8 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/obj/random/junk,
+/obj/structure/closet,
+/obj/random/loot,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
 "dsj" = (
@@ -7347,6 +7368,21 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
+"dsq" = (
+/obj/machinery/door/airlock/glass_research{
+	name = "Research and Development";
+	req_access = list(7)
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/rnd/research)
 "dsw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -7619,20 +7655,11 @@
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
 "dzI" = (
-/obj/machinery/mecha_part_fabricator{
-	dir = 4
-	},
 /obj/effect/floor_decal/spline/plain{
-	dir = 9
-	},
-/obj/structure/railing/mapped{
-	dir = 4
-	},
-/obj/structure/railing/mapped{
 	dir = 1
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "dzL" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d3-1-f"
@@ -7740,10 +7767,10 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_two/fore/starboard)
 "dCK" = (
-/obj/effect/floor_decal/corner/mauve{
+/obj/structure/extinguisher_cabinet/north,
+/obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/structure/extinguisher_cabinet/north,
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "dCW" = (
@@ -7951,6 +7978,14 @@
 "dIZ" = (
 /turf/simulated/wall,
 /area/medical/ors)
+"dJh" = (
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/machinery/door/blast/shutters/open{
+	id = "mech_bay_shutter";
+	name = "Mech Bay Shutters"
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "dJx" = (
 /obj/structure/table/rack,
 /obj/item/trap/animal/large,
@@ -8175,8 +8210,12 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/starboard/far)
 "dNz" = (
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/obj/structure/platform/ledge,
+/obj/structure/sign/poster{
+	pixel_y = 32
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "dNF" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 10
@@ -8274,6 +8313,26 @@
 	},
 /turf/simulated/floor/lino,
 /area/horizon/crew_quarters/lounge/bar)
+"dRa" = (
+/obj/effect/floor_decal/corner/dark_green{
+	dir = 5
+	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner/black{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled,
+/area/hallway/primary/central_one)
+"dRh" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
 "dRk" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/effect/floor_decal/corner/dark_green{
@@ -8286,13 +8345,29 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
 "dRN" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/machinery/chem_heater,
-/obj/structure/sign/nosmoking_2{
-	pixel_x = -32
+/obj/structure/table/standard,
+/obj/structure/platform{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/structure/platform{
+	dir = 1
+	},
+/obj/structure/platform_deco/ledge{
+	dir = 10
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 10
+	},
+/obj/item/device/integrated_electronics/wirer{
+	pixel_x = -3;
+	pixel_y = 10
+	},
+/obj/item/device/integrated_electronics/debugger{
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "dRO" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -8530,11 +8605,24 @@
 /turf/template_noop,
 /area/template_noop)
 "dYe" = (
-/obj/effect/floor_decal/corner/black{
+/obj/structure/table/steel,
+/obj/item/stack/material/glass/full,
+/obj/item/stack/material/steel/full,
+/obj/item/reagent_containers/glass/beaker/sulphuric{
+	pixel_y = 3
+	},
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/acid{
+	pixel_y = -32
+	},
+/obj/effect/floor_decal/spline/plain{
 	dir = 10
 	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/lab)
 "dYg" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 4
@@ -8574,6 +8662,19 @@
 /obj/structure/table/steel,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
+"dYz" = (
+/obj/effect/floor_decal/corner/black{
+	dir = 5
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "dYR" = (
 /obj/machinery/door/airlock{
 	dir = 1;
@@ -8648,6 +8749,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
+"ebk" = (
+/obj/effect/floor_decal/corner/black{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/full,
+/area/hallway/primary/central_one)
 "ebm" = (
 /obj/structure/extinguisher_cabinet/east{
 	layer = 3.3
@@ -8933,21 +9040,11 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room/rust)
 "ejw" = (
-/obj/machinery/telepad,
-/obj/effect/floor_decal/industrial/warning/full,
-/turf/simulated/floor/reinforced,
-/area/rnd/telesci)
-"ejU" = (
-/obj/effect/floor_decal/corner/dark_green{
-	dir = 6
-	},
-/obj/machinery/ringer_button{
-	id = "robo_ringer";
-	pixel_x = 25;
-	pixel_y = -7
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/central_one)
+/obj/structure/closet/secure_closet/machinist,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist/surgicalbay)
 "eks" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
@@ -9073,6 +9170,13 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port/far)
+"ena" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
+	},
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "ens" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -9081,16 +9185,11 @@
 /turf/simulated/floor/tiled/full,
 /area/operations/qm)
 "env" = (
-/obj/structure/table/standard,
-/obj/item/storage/bag/circuits/basic,
-/obj/item/device/integrated_electronics/debugger{
-	pixel_x = 6
+/obj/effect/floor_decal/corner/mauve{
+	dir = 9
 	},
-/obj/item/device/integrated_electronics/wirer{
-	pixel_x = -6
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "enw" = (
 /obj/structure/disposalpipe/sortjunction/flipped{
 	name = "Library Office";
@@ -9345,17 +9444,11 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/smes/rust)
 "etv" = (
-/obj/machinery/autolathe,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/spline/plain{
-	dir = 10
+/obj/effect/floor_decal/corner/brown{
+	dir = 5
 	},
-/obj/structure/railing/mapped,
-/obj/structure/railing/mapped{
-	dir = 8
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/hallway/primary/central_one)
 "etS" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -10258,6 +10351,7 @@
 /obj/structure/platform_deco/ledge{
 	dir = 6
 	},
+/obj/machinery/light,
 /turf/simulated/open,
 /area/hallway/primary/central_one)
 "eQD" = (
@@ -10307,6 +10401,32 @@
 	},
 /turf/simulated/floor/lino,
 /area/horizon/bar)
+"eSn" = (
+/obj/machinery/shower{
+	dir = 8;
+	pixel_x = 1;
+	pixel_y = 1
+	},
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 12
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/mauve{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
+"eSU" = (
+/obj/structure/platform{
+	dir = 8
+	},
+/obj/structure/closet/crate,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "eTf" = (
 /obj/structure/ladder/up{
 	pixel_y = 13
@@ -10345,24 +10465,14 @@
 /turf/simulated/floor/tiled,
 /area/storage/primary)
 "eUj" = (
-/obj/effect/floor_decal/corner/mauve/full{
+/obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/structure/bed/stool/chair/sofa/right/black{
 	dir = 8
 	},
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 12
-	},
-/obj/machinery/shower{
-	dir = 8;
-	pixel_x = 1;
-	pixel_y = 1
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/wood,
+/area/rnd/hallway)
 "eUp" = (
 /obj/random/junk,
 /obj/machinery/light/small/emergency,
@@ -10382,6 +10492,17 @@
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
+"eUS" = (
+/obj/structure/platform_deco{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "eUT" = (
 /obj/structure/bed/stool/chair/padded/black{
 	dir = 4
@@ -10420,10 +10541,24 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "eVf" = (
-/obj/structure/closet/crate,
-/obj/random/loot,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/obj/structure/platform/ledge,
+/obj/structure/platform{
+	dir = 4
+	},
+/obj/structure/platform_deco/ledge{
+	dir = 5
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/structure/window/reinforced,
+/obj/machinery/door/window{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/hatch/red,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "eVm" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -10500,14 +10635,26 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
+"eWv" = (
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/chemistry)
 "eWz" = (
-/obj/machinery/r_n_d/protolathe,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/spline/plain{
-	dir = 10
+/obj/effect/floor_decal/corner/mauve{
+	dir = 9
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/rnd/research)
 "eWX" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 5
@@ -10969,6 +11116,12 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
+"feE" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 7
+	},
+/turf/simulated/floor/wood,
+/area/rnd/hallway)
 "feM" = (
 /obj/machinery/door/blast/regular{
 	dir = 4;
@@ -11053,9 +11206,9 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "fgZ" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor/tiled/dark/full,
-/area/rnd/telesci)
+/obj/machinery/optable,
+/turf/simulated/floor/tiled/white,
+/area/operations/lower/machinist/surgicalbay)
 "fha" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11133,17 +11286,9 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
 "fjc" = (
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "RnDShutters";
-	name = "Research and Development";
-	opacity = 0
-	},
-/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
-/area/rnd/chemistry)
+/area/rnd/lab)
 "fjg" = (
 /obj/effect/floor_decal/corner/brown/full,
 /obj/structure/bed/stool/chair/office/dark{
@@ -11157,9 +11302,13 @@
 /turf/simulated/floor/tiled,
 /area/operations/office)
 "fjl" = (
-/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/structure/platform{
+	dir = 8
+	},
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark/full,
-/area/rnd/chemistry)
+/area/operations/lower/machinist)
 "fjI" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -11419,15 +11568,14 @@
 /turf/simulated/floor/carpet/red,
 /area/horizon/library)
 "fqq" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/machinery/power/apc/north,
-/obj/structure/closet/hazmat/research,
-/obj/structure/cable/green{
-	icon_state = "0-2"
+/obj/machinery/mecha_part_fabricator{
+	dir = 8
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "fqr" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
@@ -11538,14 +11686,15 @@
 /turf/simulated/floor/tiled/full,
 /area/hallway/engineering/rust)
 "fsL" = (
-/obj/machinery/light/small{
-	dir = 4
+/obj/machinery/door/airlock/maintenance{
+	dir = 1;
+	name = "Machinist Workshop Maintenance";
+	req_access = list(29)
 	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 5
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "fsZ" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -11745,6 +11894,9 @@
 /obj/random/loot,
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/aux_atmospherics/deck_2/starboard)
+"fxK" = (
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "fyi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11800,13 +11952,18 @@
 /turf/simulated/floor/lino,
 /area/chapel/main)
 "fzb" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/table/standard,
-/obj/item/clothing/glasses/science,
-/obj/item/device/firing_pin/test_range,
-/obj/item/device/firing_pin/test_range,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/black{
+	dir = 5
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "fzF" = (
 /turf/simulated/floor/tiled,
 /area/horizon/security/equipment)
@@ -11996,18 +12153,18 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room)
 "fEa" = (
-/obj/structure/table/standard,
-/obj/machinery/conveyor_switch/oneway{
-	id = "rnd";
-	pixel_x = 12;
-	pixel_y = 22
+/obj/structure/bed/stool/chair/office/dark{
+	dir = 8
 	},
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 4
+/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
 	},
-/obj/machinery/recharger,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/effect/landmark/start{
+	name = "Machinist"
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "fEE" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 10
@@ -12036,14 +12193,17 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "fFx" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/effect/floor_decal/spline/plain{
+/obj/effect/floor_decal/corner/mauve{
 	dir = 10
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/multi_tile{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "fGi" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 5
@@ -12169,23 +12329,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/grauwolf)
 "fIi" = (
-/obj/structure/bed/stool/chair/office/light{
-	dir = 1
-	},
 /turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/area/operations/lower/machinist/surgicalbay)
 "fIE" = (
 /obj/structure/railing/mapped{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 1
+/obj/structure/bed/stool/chair/office/dark{
+	dir = 8
 	},
-/obj/structure/table/standard,
-/obj/item/paper_bin,
-/obj/item/pen/black,
 /turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/area/operations/lower/machinist/surgicalbay)
 "fJc" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
@@ -12270,9 +12424,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/mauve{
 	dir = 1
 	},
@@ -12282,6 +12433,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/disposalpipe/junction{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "fKn" = (
@@ -12503,6 +12657,18 @@
 /obj/effect/floor_decal/corner_wide/lime/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
+"fOI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/black{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "fOX" = (
 /obj/structure/bed/stool/padded/red{
 	dir = 4
@@ -12672,12 +12838,15 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room/rust)
 "fSG" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/machinery/mecha_part_fabricator{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/structure/railing/mapped,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "fSK" = (
 /turf/simulated/floor/carpet,
 /area/hallway/primary/central_two)
@@ -12786,18 +12955,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
 "fVX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "fWh" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -13186,13 +13348,13 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 10
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/obj/machinery/computer/guestpass{
-	pixel_y = -32
-	},
 /obj/machinery/firealarm/south,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "gfj" = (
@@ -13387,12 +13549,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/turret_protected/ai_upload)
-"gio" = (
-/obj/effect/floor_decal/corner/black{
-	dir = 6
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/central_one)
 "gis" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
@@ -13548,6 +13704,7 @@
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 5
 	},
+/obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "gmo" = (
@@ -13628,25 +13785,23 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/office)
 "gnA" = (
+/obj/structure/table/standard,
 /obj/machinery/light{
-	dir = 1
-	},
-/obj/effect/floor_decal/corner/black/full{
-	dir = 1
-	},
-/obj/structure/reagent_dispensers/fueltank,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/machinery/door/window/southright{
-	name = "Welding Fuel Tank Storage"
+/obj/machinery/cell_charger,
+/obj/machinery/camera/network/research{
+	c_tag = "Research - Research & Development";
+	pixel_y = 9
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 1
+	},
+/obj/item/stack/material/phoron{
+	amount = 15
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "gnD" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
@@ -13713,14 +13868,13 @@
 /turf/simulated/floor/reinforced,
 /area/horizon/zta)
 "goQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/machinery/disposal/small/east,
+/obj/structure/disposalpipe/trunk,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "gps" = (
 /obj/effect/floor_decal/corner/mauve/full{
 	dir = 1
@@ -14206,6 +14360,17 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 5
 	},
+/obj/effect/floor_decal/corner/black{
+	dir = 5
+	},
+/obj/machinery/ringer_button{
+	id = "robo_ringer";
+	pixel_x = -2;
+	pixel_y = 32
+	},
+/obj/effect/floor_decal/corner/brown{
+	dir = 5
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "gzU" = (
@@ -14880,13 +15045,16 @@
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
 "gNn" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 9
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/airlock/maintenance{
+	dir = 1;
+	name = "Machinist Workshop Maintenance";
+	req_access = list(29)
 	},
-/obj/machinery/power/apc/east,
-/obj/structure/cable,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "gNq" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -14993,40 +15161,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
-"gPM" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
 "gQj" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/mauve{
-	dir = 5
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 10
 	},
-/obj/machinery/cell_charger,
-/obj/machinery/requests_console/north{
-	department = "Research and Development";
-	departmentType = 2;
-	name = "Research and Development Requests Console"
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/item/stack/material/phoron{
-	amount = 15
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal/small/east,
+/turf/simulated/floor/wood,
+/area/rnd/hallway)
 "gQD" = (
 /obj/machinery/smartfridge/drying_rack,
 /obj/machinery/door/firedoor,
@@ -15274,11 +15419,11 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_monitoring)
 "gWW" = (
-/obj/effect/floor_decal/corner/mauve{
-	dir = 9
+/obj/machinery/light{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/area/operations/lower/machinist/surgicalbay)
 "gXb" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/machinery/camera/network/service{
@@ -15414,6 +15559,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_one)
 "hcT" = (
@@ -15478,25 +15626,20 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/main_storage)
 "heg" = (
-/obj/structure/table/standard,
-/obj/item/device/mmi{
-	pixel_y = -4
+/obj/structure/closet/bombcloset,
+/obj/machinery/power/apc/south,
+/obj/structure/sign/nosmoking_1{
+	pixel_y = -29
 	},
-/obj/item/device/mmi{
-	pixel_y = 4
-	},
-/obj/item/device/mmi/digital/posibrain{
-	pixel_y = -4
-	},
-/obj/item/device/mmi/digital/posibrain{
-	pixel_y = 4
-	},
-/obj/effect/floor_decal/corner/black{
+/obj/effect/floor_decal/corner/mauve{
 	dir = 10
 	},
-/obj/machinery/light,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/corner/mauve{
+	dir = 1
+	},
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "hep" = (
 /obj/effect/floor_decal/corner/lime{
 	dir = 10
@@ -16197,15 +16340,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/stairwell/bridge)
 "hte" = (
-/obj/machinery/computer/telescience{
-	starting_crystals = 4
+/obj/structure/morgue{
+	dir = 2
 	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 5
+/obj/machinery/light{
+	dir = 8
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist/surgicalbay)
 "htp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -16353,12 +16496,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/operations/office)
-"hyL" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/telesci)
 "hzC" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -16608,8 +16745,17 @@
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
 "hDr" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/chemistry)
+/obj/machinery/conveyor{
+	id = "Robocompo"
+	},
+/obj/structure/platform{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "hDE" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
@@ -16649,35 +16795,16 @@
 /turf/simulated/floor/tiled/dark/cooled,
 /area/turret_protected/ai)
 "hEx" = (
+/obj/machinery/smartfridge/secure/medbay{
+	pixel_y = 1;
+	req_one_access = list(5,33,47)
+	},
+/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/machinery/light{
-	dir = 1
-	},
-/obj/item/paper_bin,
-/obj/item/pen/black,
-/obj/structure/table/standard,
-/obj/machinery/button/remote/blast_door{
-	dir = 8;
-	id = "shutters_deck2_workshopdesk";
-	name = "Machinist Workshop Desk Shutters";
-	pixel_x = -25;
-	pixel_y = -7
-	},
-/obj/machinery/requests_console/north{
-	department = "Machinist Workshop";
-	departmentType = 2;
-	name = "Machinist Workshop"
-	},
-/obj/effect/floor_decal/corner/black/full{
 	dir = 8
 	},
-/obj/machinery/button/switch/windowtint{
-	dir = 8;
-	id = "polarized_deck2_workshop";
-	pixel_x = -25;
-	pixel_y = 6
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "hEz" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
@@ -16947,6 +17074,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/security/armoury)
+"hJb" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
+/area/hallway/primary/central_one)
 "hJr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -16964,6 +17101,12 @@
 	},
 /turf/simulated/open,
 /area/operations/office)
+"hKB" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "hLh" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	name = "Weaponry (Shotguns)"
@@ -17061,13 +17204,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology)
-"hOa" = (
-/obj/effect/floor_decal/spline/plain/corner,
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
 "hOU" = (
 /turf/simulated/wall,
 /area/medical/psych)
@@ -17274,15 +17410,8 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/aux_atmospherics/deck_2/starboard/wing)
 "hUB" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/machinery/smartfridge/secure/medbay{
-	density = 0;
-	pixel_y = 16;
-	req_one_access = list(5,33,47)
-	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "hUC" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -17718,20 +17847,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
-"ihe" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
-	},
-/obj/effect/floor_decal/spline/plain,
-/obj/structure/sign/electricshock{
-	name = "\improper WARNING: HIGH VOLTAGE ELECTROMAGNETIC FIELDS IN USE sign";
-	pixel_y = 32
-	},
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Telescience Test Chamber A"
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
 "ihg" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -17772,12 +17887,15 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/aux_atmospherics/deck_2/starboard/wing)
 "iid" = (
-/obj/effect/floor_decal/spline/plain,
-/obj/effect/floor_decal/spline/plain{
+/obj/structure/platform{
 	dir = 1
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/structure/railing/mapped,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "ijb" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/food/drinks/cans/root_beer{
@@ -17933,15 +18051,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/operations/office)
 "ikB" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/structure/platform_stairs/full/east_west_cap{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/obj/structure/platform/cutout,
+/obj/structure/platform{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "ikJ" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 10
@@ -17987,6 +18105,10 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_monitoring/rust)
+"ilf" = (
+/obj/structure/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
 "ilm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18137,6 +18259,9 @@
 /obj/item/modular_computer/console/preset/engineering,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_monitoring)
+"ioQ" = (
+/turf/simulated/wall,
+/area/rnd/lab)
 "ioS" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 6
@@ -18329,6 +18454,13 @@
 "itX" = (
 /turf/simulated/floor/wood,
 /area/chapel/main)
+"iuA" = (
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "iuP" = (
 /turf/simulated/wall,
 /area/operations/mail_room)
@@ -18652,12 +18784,20 @@
 /turf/simulated/floor/tiled/full,
 /area/horizon/hydroponics/garden)
 "iCz" = (
-/obj/structure/bed/stool/chair/office/dark,
-/obj/effect/floor_decal/corner/mauve{
-	dir = 10
+/obj/item/modular_computer/console/preset/supply/machinist{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/effect/floor_decal/spline/plain/cee{
+	dir = 8
+	},
+/obj/machinery/ringer/south{
+	department = "Machinist Workshop";
+	id = "robo_ringer";
+	req_access = list(29)
+	},
+/obj/machinery/light,
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "iDj" = (
 /obj/machinery/alarm/north,
 /obj/effect/floor_decal/corner/brown{
@@ -18754,14 +18894,21 @@
 /turf/simulated/floor/lino,
 /area/horizon/bar)
 "iFw" = (
-/obj/machinery/r_n_d/destructive_analyzer,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/spline/plain{
+/obj/item/device/radio/intercom/east,
+/obj/effect/floor_decal/corner/black{
 	dir = 6
 	},
-/obj/structure/railing/mapped,
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "iFD" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -18807,6 +18954,12 @@
 /obj/structure/stairs/north,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/stairwell/bridge)
+"iGU" = (
+/obj/effect/floor_decal/corner/brown{
+	dir = 5
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "iGY" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -19043,23 +19196,6 @@
 /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room/rust)
-"iLC" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
-	dir = 1;
-	name = "Telescience";
-	req_access = list(7)
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/map_effect/door_helper/unres{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/full,
-/area/rnd/telesci)
 "iLD" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 9
@@ -19243,6 +19379,19 @@
 /obj/random/junk,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
+"iQI" = (
+/obj/structure/railing/mapped{
+	dir = 1
+	},
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/structure/coatrack,
+/obj/effect/floor_decal/corner/black/full{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "iQK" = (
 /obj/structure/table/rack,
 /obj/effect/floor_decal/industrial/outline/security,
@@ -19299,14 +19448,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/stairwell/central)
-"iRN" = (
-/obj/structure/table/rack,
-/obj/item/tank/oxygen,
-/obj/structure/platform{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/telesci)
 "iRS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
@@ -19321,6 +19462,21 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/icu)
+"iSf" = (
+/obj/effect/floor_decal/spline/plain{
+	dir = 8
+	},
+/obj/machinery/r_n_d/protolathe,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 8;
+	layer = 2.41
+	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/lab)
 "iSi" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/floor_decal/industrial/warning{
@@ -19776,10 +19932,15 @@
 /turf/simulated/open,
 /area/horizon/hydroponics)
 "jdH" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/machinery/firealarm/west,
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/machinery/conveyor{
+	id = "Robocompo"
+	},
+/obj/structure/platform{
+	dir = 4
+	},
+/obj/machinery/alarm/west,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "jeb" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -19882,6 +20043,18 @@
 /obj/structure/trash_pile,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port/far)
+"jgh" = (
+/obj/structure/plasticflaps/mining,
+/obj/machinery/door/blast/shutters{
+	dir = 2;
+	id = "shutters_deck2_rescon";
+	name = "Conveyor Shutter"
+	},
+/obj/machinery/conveyor{
+	id = "rnd"
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/lab)
 "jgj" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/structure/window/reinforced{
@@ -19961,6 +20134,10 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/security/brig)
+"jim" = (
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "jjl" = (
 /obj/structure/bed/stool/chair/office/light,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -20760,14 +20937,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
 "jAT" = (
-/obj/effect/floor_decal/corner/mauve{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/area/operations/lower/machinist/surgicalbay)
 "jAZ" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 4
@@ -21447,14 +21621,11 @@
 /turf/simulated/floor/wood,
 /area/horizon/crew_quarters/lounge/bar)
 "jPr" = (
-/obj/effect/floor_decal/corner/black{
-	dir = 10
-	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/area/rnd/research)
 "jPS" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 9
@@ -21586,8 +21757,10 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/pharmacy)
 "jTQ" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/research)
+/obj/structure/disposalpipe/segment,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
+/area/operations/lower/machinist)
 "jTS" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -21862,12 +22035,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/horizon/security/hallway)
-"kaz" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
 "kaP" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -21925,14 +22092,18 @@
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/zta)
 "kbF" = (
-/obj/effect/floor_decal/spline/plain{
+/obj/effect/floor_decal/corner/mauve/full{
 	dir = 1
 	},
-/obj/machinery/light{
-	dir = 1
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/obj/machinery/firealarm/east,
+/turf/simulated/floor/tiled,
+/area/rnd/research)
 "kbL" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -22081,10 +22252,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/security/holding_cell_b)
-"kfE" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
 "kfZ" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle/scc_space_ship,
@@ -22335,17 +22502,43 @@
 /turf/simulated/floor/tiled/full,
 /area/horizon/hallway/deck_two/fore)
 "knA" = (
-/obj/effect/floor_decal/corner/black{
+/obj/effect/floor_decal/corner/mauve{
 	dir = 9
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/machinery/requests_console/west,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/table/standard,
+/obj/item/stock_parts/matter_bin,
+/obj/item/stock_parts/matter_bin,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 6
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "knH" = (
 /obj/structure/dispenser/oxygen,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
 /area/engineering/storage_eva)
+"kok" = (
+/obj/structure/table/standard,
+/obj/item/toy/comic/inspector{
+	pixel_x = -4
+	},
+/obj/item/toy/comic/inspector,
+/obj/item/toy/comic/stormman{
+	pixel_x = 4
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/operations/lower/machinist/surgicalbay)
 "koq" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -22533,15 +22726,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
 "ktC" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
-	dir = 1;
-	name = "Research and Development Maintenance";
-	req_access = list(7)
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/railing/mapped{
+	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
+/mob/living/heavy_vehicle/premade/random/boring,
 /turf/simulated/floor/plating,
-/area/rnd/research)
+/area/operations/lower/machinist)
 "ktM" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -22576,14 +22768,27 @@
 /turf/simulated/open/airless,
 /area/template_noop)
 "kur" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/machinery/door/airlock/glass_research{
+	dir = 4;
+	name = "Research and Development";
+	req_access = list(7)
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 8
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "kuG" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -22880,6 +23085,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
+"kCs" = (
+/obj/structure/table/rack,
+/obj/random/loot,
+/obj/random/loot,
+/obj/random/loot,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
 "kCV" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
@@ -22931,9 +23143,20 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "kEh" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/telesci)
+/obj/machinery/door/firedoor,
+/obj/structure/table/reinforced/steel,
+/obj/machinery/door/blast/shutters{
+	density = 0;
+	id = "RnDDesk";
+	name = "Research and Development";
+	opacity = 0
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/window/desk/southright{
+	desc = "Research Desk"
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/lab)
 "kEK" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -23078,17 +23301,11 @@
 /turf/simulated/floor/tiled/full,
 /area/medical/pharmacy)
 "kHu" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/table/standard,
-/obj/item/stock_parts/manipulator,
-/obj/item/stock_parts/manipulator,
-/obj/item/stack/cable_coil/random,
-/obj/item/stock_parts/capacitor,
-/obj/item/stock_parts/capacitor,
-/obj/item/stock_parts/micro_laser,
-/obj/item/stock_parts/micro_laser,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/structure/disposalpipe/segment,
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/extinguisher_cabinet/east,
+/turf/simulated/floor/plating,
+/area/operations/lower/machinist)
 "kHv" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor,
@@ -23360,15 +23577,12 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/kitchen)
 "kPA" = (
-/obj/machinery/light/small{
-	dir = 4
+/obj/structure/bed/stool/chair{
+	dir = 8
 	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 6
-	},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
+/obj/effect/floor_decal/spline/fancy/wood/cee,
+/turf/simulated/floor/wood,
+/area/operations/lower/machinist/surgicalbay)
 "kQz" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -23387,6 +23601,22 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/engineering)
+"kQV" = (
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/obj/structure/table/standard,
+/obj/item/storage/box/gloves{
+	pixel_x = -5
+	},
+/obj/item/storage/box/masks{
+	pixel_x = -5
+	},
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = 5
+	},
+/turf/simulated/floor/tiled/white,
+/area/operations/lower/machinist/surgicalbay)
 "kQY" = (
 /obj/machinery/atmospherics/unary/outlet_injector{
 	dir = 4;
@@ -23444,13 +23674,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora)
-"kRA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
 "kRB" = (
 /obj/structure/bed/stool/chair/padded/red{
 	dir = 8
@@ -23855,15 +24078,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "lbv" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/mauve{
-	dir = 5
+/obj/structure/railing/mapped{
+	dir = 8
 	},
-/obj/item/stock_parts/matter_bin,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/device/radio/intercom/north,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/machinery/autolathe,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "lbN" = (
 /obj/machinery/door/airlock/medical{
 	dir = 1;
@@ -23939,26 +24162,10 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_two)
 "ldk" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/machinery/vending/overloaders,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/hallway)
 "ldu" = (
 /obj/effect/floor_decal/corner/mauve{
 	dir = 9
@@ -24136,13 +24343,21 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
 "ljp" = (
-/obj/machinery/r_n_d/circuit_imprinter,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
+/obj/structure/table/standard,
+/obj/item/device/mmi{
+	pixel_y = 4
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
+/obj/item/device/mmi{
+	pixel_y = 11
+	},
+/obj/item/device/mmi/digital/posibrain{
+	pixel_y = 2
+	},
+/obj/item/device/mmi/digital/posibrain{
+	pixel_y = 8
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "ljv" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -24534,11 +24749,12 @@
 /turf/simulated/open,
 /area/operations/office)
 "luY" = (
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 1
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/structure/cable/green{
+	icon_state = "2-4"
 	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "lvl" = (
 /obj/effect/floor_decal/corner/mauve/full{
 	dir = 1
@@ -24893,14 +25109,10 @@
 /turf/simulated/floor/tiled,
 /area/hallway/engineering/rust)
 "lFE" = (
-/obj/effect/floor_decal/corner/mauve/full,
-/obj/structure/table/standard,
-/obj/item/storage/bag/circuits/basic,
-/obj/item/device/integrated_electronics/debugger,
-/obj/item/device/integrated_electronics/wirer,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/effect/floor_decal/corner/black/full,
+/obj/machinery/firealarm/south,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "lFG" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -25663,22 +25875,6 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/hallway/engineering)
-"lWQ" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
 "lXo" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance_hatch{
@@ -25705,6 +25901,22 @@
 	},
 /turf/simulated/floor/wood,
 /area/chapel/main)
+"lXP" = (
+/obj/machinery/door/airlock/mining{
+	dir = 1;
+	name = "Surgical Bay";
+	req_access = list(29);
+	desc = "It opens and closes"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "lYP" = (
 /obj/structure/window/borosilicate/reinforced/skrell{
 	dir = 8
@@ -25829,27 +26041,23 @@
 	},
 /area/horizon/kitchen/freezer)
 "maP" = (
+/obj/machinery/firealarm/north{
+	pixel_y = 64
+	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
-	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 9
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+	dir = 6
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/effect/floor_decal/corner/mauve{
+	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/area/rnd/chemistry)
 "maV" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -25920,12 +26128,16 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
 "mbH" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/bed/stool/chair/office/light{
+/obj/machinery/computer/rdconsole/robotics{
+	dir = 4
+	},
+/obj/structure/railing/mapped{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "mch" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/structure/window/reinforced{
@@ -26749,6 +26961,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_one)
 "mwv" = (
@@ -26797,14 +27012,28 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "mxm" = (
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 1
+/obj/structure/table/standard,
+/obj/effect/floor_decal/corner/black{
+	dir = 6
 	},
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal/small/west,
-/obj/machinery/firealarm/east,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/requests_console/east{
+	name = "Machinist Request Console";
+	department = "Machinist Workshop"
+	},
+/obj/item/paper_bin{
+	pixel_x = 5
+	},
+/obj/item/pen/black{
+	pixel_x = 7
+	},
+/obj/item/folder/yellow{
+	pixel_x = -6
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "mxs" = (
 /obj/machinery/button/remote/driver{
 	dir = 1;
@@ -26925,11 +27154,12 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/hallway/engineering)
 "mAQ" = (
-/obj/effect/floor_decal/corner/black{
-	dir = 9
+/obj/machinery/chemical_dispenser/full{
+	dir = 8
 	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/spline/plain/cee,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/chemistry)
 "mBb" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
@@ -27257,6 +27487,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/medical/gen_treatment)
+"mIi" = (
+/obj/effect/floor_decal/corner/mauve,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "mIk" = (
 /obj/structure/bed/stool/chair/office/light{
 	dir = 4
@@ -27940,9 +28177,6 @@
 /area/crew_quarters/heads/chief)
 "mVO" = (
 /obj/machinery/alarm/north,
-/obj/effect/floor_decal/corner/dark_green{
-	dir = 5
-	},
 /obj/machinery/light/floor{
 	dir = 1
 	},
@@ -27969,6 +28203,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_two)
+"mWQ" = (
+/turf/simulated/wall/r_wall,
+/area/rnd/lab)
 "mWT" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /obj/structure/cable/green{
@@ -28496,7 +28733,8 @@
 	},
 /obj/structure/sign/directions/prop{
 	dir = 4;
-	pixel_y = -22
+	pixel_x = 32;
+	pixel_y = 24
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/aft)
@@ -28536,14 +28774,20 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_two/fore)
 "nio" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
+/obj/effect/floor_decal/corner/black/full{
+	dir = 1
 	},
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
+/obj/machinery/power/apc/east,
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "nir" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -28982,13 +29226,19 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
 "ntg" = (
-/obj/structure/closet/secure_closet/machinist,
-/obj/effect/floor_decal/corner/black{
-	dir = 5
+/obj/structure/table/standard,
+/obj/machinery/reagentgrinder{
+	pixel_y = 11
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/item/stack/material/phoron{
+	amount = 5
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "ntn" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 6
@@ -29075,12 +29325,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/medical/psych)
-"nvv" = (
-/obj/effect/floor_decal/corner/mauve,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
 "nvF" = (
 /obj/machinery/power/apc/east,
 /obj/structure/cable,
@@ -29513,7 +29757,6 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/smes/rust)
 "nGI" = (
-/obj/machinery/firealarm/north,
 /obj/effect/floor_decal/corner/dark_green/full{
 	dir = 8
 	},
@@ -29531,23 +29774,6 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/engineering/storage_hard)
-"nHq" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
 "nHY" = (
 /obj/effect/floor_decal/corner/yellow/full{
 	dir = 4
@@ -29830,27 +30056,16 @@
 /turf/simulated/wall,
 /area/maintenance/substation/medical)
 "nRx" = (
-/obj/machinery/ringer_button{
-	id = "sci_ringer";
-	pixel_x = 7;
-	pixel_y = -2
+/obj/structure/platform{
+	dir = 4
 	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "RnDShutters";
-	name = "Research and Development";
-	opacity = 0
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/desk/northright{
-	name = "Research Desk";
-	req_access = list(7)
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/rnd/research)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "nSO" = (
 /obj/effect/floor_decal/corner/lime{
 	dir = 4
@@ -30876,16 +31091,28 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "opW" = (
-/obj/structure/extinguisher_cabinet/east,
-/obj/machinery/disposal/small/west,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
+/obj/structure/table/standard,
+/obj/item/stock_parts/manipulator,
+/obj/item/stock_parts/manipulator,
+/obj/item/stack/cable_coil/random,
+/obj/item/stock_parts/capacitor,
+/obj/item/stock_parts/capacitor,
+/obj/item/stock_parts/micro_laser{
+	pixel_y = 7
 	},
-/obj/effect/floor_decal/corner/black{
-	dir = 6
+/obj/item/stock_parts/micro_laser{
+	pixel_y = 6
 	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/item/device/firing_pin/test_range,
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 4
+	},
+/obj/item/clothing/glasses/science{
+	pixel_y = 10
+	},
+/obj/machinery/firealarm/east,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "oqv" = (
 /obj/machinery/door/airlock/hatch{
 	dir = 1;
@@ -31336,18 +31563,6 @@
 	},
 /turf/simulated/open,
 /area/engineering/atmos/storage)
-"oAR" = (
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 4;
-	icon_state = "shutter0";
-	id = "RnDShutters";
-	name = "Research and Development";
-	opacity = 0
-	},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor/tiled/dark/full,
-/area/rnd/research)
 "oAX" = (
 /obj/effect/floor_decal/industrial/warning/cee{
 	dir = 1
@@ -31374,25 +31589,56 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "oBl" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/table/standard,
+/obj/item/device/flash/synthetic{
+	pixel_x = -5;
+	pixel_y = 6
 	},
-/obj/effect/floor_decal/corner/mauve{
+/obj/item/device/flash/synthetic{
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/obj/item/device/flash/synthetic{
+	pixel_x = -3;
+	pixel_y = 6
+	},
+/obj/item/device/flash/synthetic{
+	pixel_x = -3;
+	pixel_y = 2
+	},
+/obj/item/storage/firstaid/empty{
+	pixel_x = 7
+	},
+/obj/item/storage/firstaid/empty{
+	pixel_x = 7
+	},
+/obj/item/device/healthanalyzer{
+	pixel_x = 8
+	},
+/obj/item/device/healthanalyzer{
+	pixel_x = 8
+	},
+/obj/item/device/assembly/prox_sensor{
+	pixel_x = 8
+	},
+/obj/item/device/assembly/prox_sensor{
+	pixel_x = 8
+	},
+/obj/effect/floor_decal/corner/black{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/sortjunction/flipped{
-	dir = 4;
-	name = "Research and Development";
-	sortType = "Research and Development"
+/obj/machinery/camera/network/supply{
+	c_tag = "Operations -  Machinist Workshop Port";
+	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "oBv" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -31579,25 +31825,6 @@
 /obj/effect/floor_decal/corner_wide/yellow,
 /turf/simulated/floor/tiled,
 /area/hallway/engineering/rust)
-"oGK" = (
-/obj/machinery/mecha_part_fabricator{
-	dir = 4
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 10
-	},
-/obj/structure/railing/mapped{
-	dir = 4
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
-"oGR" = (
-/obj/machinery/r_n_d/protolathe,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/spline/plain,
-/obj/structure/railing/mapped,
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
 "oHI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -31860,6 +32087,25 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/rnd/hallway)
+"oOk" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 6
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/research)
 "oPh" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -32066,13 +32312,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/horizon/crew_quarters/lounge/bar)
-"oUZ" = (
-/obj/effect/landmark/start{
-	name = "Machinist"
-	},
-/obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
 "oVe" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -32419,11 +32658,11 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/smes/rust)
 "pbS" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
+/obj/structure/closet/secure_closet/machinist,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist/surgicalbay)
 "pch" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/machinery/anti_bluespace,
@@ -32597,11 +32836,14 @@
 /turf/simulated/floor/tiled/full,
 /area/hallway/engineering)
 "pgD" = (
-/obj/effect/floor_decal/corner/mauve{
+/obj/effect/floor_decal/corner/black{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -32635,22 +32877,11 @@
 /turf/simulated/floor/carpet,
 /area/hallway/primary/central_two)
 "pib" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "pin" = (
 /obj/item/device/radio/intercom/north,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -32881,6 +33112,9 @@
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/chief)
+"pmT" = (
+/turf/simulated/wall/r_wall,
+/area/operations/lower/machinist/surgicalbay)
 "pmU" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -32913,16 +33147,12 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/conference)
 "poe" = (
-/obj/effect/floor_decal/corner/mauve/full{
+/obj/structure/railing/mapped{
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/alarm/west,
-/obj/machinery/light/floor{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
+/area/operations/lower/machinist)
 "pof" = (
 /obj/effect/floor_decal/corner/mauve{
 	dir = 5
@@ -33082,15 +33312,25 @@
 /turf/simulated/open,
 /area/hallway/primary/central_one)
 "ptV" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
-/obj/item/storage/box/beakers{
-	pixel_x = 5;
-	pixel_y = 5
+/obj/effect/floor_decal/corner/black{
+	dir = 10
 	},
-/obj/item/storage/box/syringes,
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/structure/platform{
+	dir = 8
+	},
+/obj/structure/platform{
+	dir = 1
+	},
+/obj/structure/platform_deco/ledge{
+	dir = 6
+	},
+/obj/effect/floor_decal/spline/plain{
+	dir = 6
+	},
+/obj/machinery/cell_charger,
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "puj" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/structure/platform{
@@ -33098,6 +33338,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
+"puN" = (
+/obj/structure/table/rack,
+/obj/random/loot,
+/obj/random/loot,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
 "puO" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
@@ -33127,6 +33373,15 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
+"pvc" = (
+/obj/structure/bed/stool/chair/office/light{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/mauve{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "pvt" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -33339,13 +33594,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
-"pDW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
 "pEh" = (
 /obj/machinery/light{
 	dir = 8
@@ -33469,15 +33717,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_two/fore/starboard)
-"pGn" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining{
-	dir = 4;
-	name = "Machinist Workshop";
-	req_access = list(29)
-	},
-/turf/simulated/floor/tiled/full,
-/area/operations/lower/machinist)
 "pGp" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/light/small/emergency{
@@ -33674,6 +33913,12 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
+"pLf" = (
+/obj/effect/floor_decal/corner/black/full{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "pLv" = (
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/engine_room/rust)
@@ -34179,10 +34424,10 @@
 /turf/simulated/floor/tiled,
 /area/engineering/lobby)
 "pXP" = (
-/obj/structure/table/rack,
-/obj/random/loot,
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/obj/structure/platform/ledge,
+/obj/effect/decal/cleanable/blood/oil,
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "pXV" = (
 /obj/machinery/portable_atmospherics/canister/empty,
 /turf/simulated/floor/plating,
@@ -34364,13 +34609,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/stairwell/bridge)
 "qdf" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 10
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/conveyor_switch/oneway{
+	desc = "A conveyor control switch. It appears to only go in one direction. Controls the components conveyor belt.";
+	id = "rnd";
+	pixel_x = -13;
+	pixel_y = 27
+	},
+/obj/effect/floor_decal/corner/mauve{
+	dir = 5
 	},
-/obj/structure/table/standard,
-/obj/item/reagent_containers/spray/cleaner,
 /turf/simulated/floor/tiled/white,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "qdq" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
@@ -34463,6 +34713,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/effect/floor_decal/corner/black{
+	dir = 9
+	},
 /turf/simulated/floor/tiled,
 /area/operations/lower/machinist)
 "qfR" = (
@@ -34609,15 +34862,15 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 5
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "qhF" = (
@@ -34841,6 +35094,60 @@
 	},
 /turf/simulated/floor/lino,
 /area/horizon/crew_quarters/lounge/bar)
+"qpg" = (
+/obj/structure/table/rack,
+/obj/item/stack/material/plasteel{
+	amount = 20;
+	pixel_y = 4;
+	randpixel = 0
+	},
+/obj/item/stack/material/glass{
+	amount = 50;
+	pixel_x = -1;
+	pixel_y = 2;
+	randpixel = 0
+	},
+/obj/item/stack/material/steel{
+	amount = 50;
+	pixel_x = 1;
+	pixel_y = -2;
+	randpixel = 0
+	},
+/obj/item/stack/material/steel{
+	amount = 50;
+	pixel_x = 1;
+	pixel_y = -2;
+	randpixel = 0
+	},
+/obj/item/stack/material/steel{
+	amount = 50;
+	pixel_x = 1;
+	pixel_y = -2;
+	randpixel = 0
+	},
+/obj/item/reagent_containers/weldpack,
+/obj/machinery/camera/network/supply{
+	c_tag = "Operations -  Machinist Workshop Starboard";
+	dir = 1
+	},
+/obj/item/stack/material/glass{
+	amount = 50;
+	pixel_x = -1;
+	pixel_y = 2;
+	randpixel = 0
+	},
+/obj/item/stack/material/steel{
+	amount = 50;
+	pixel_x = 1;
+	pixel_y = -2;
+	randpixel = 0
+	},
+/obj/item/device/paint_sprayer,
+/obj/structure/platform{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "qpB" = (
 /obj/structure/platform/ledge{
 	dir = 4
@@ -34951,20 +35258,20 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 10
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/sign/science{
+	pixel_y = -32
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "qsv" = (
-/obj/structure/table/standard,
-/obj/item/stack/wrapping_paper,
-/obj/item/stack/packageWrap{
-	pixel_y = 8
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 8
 	},
-/obj/item/device/hand_labeler,
-/obj/effect/floor_decal/corner/black{
-	dir = 5
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "qsw" = (
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology)
@@ -35270,12 +35577,17 @@
 /turf/simulated/floor/tiled/full,
 /area/operations/qm)
 "qyh" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/bed/stool/chair/office/light{
+/obj/structure/bed/stool/chair/office/dark{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/effect/floor_decal/spline/plain{
+	dir = 1
+	},
+/obj/effect/landmark/start{
+	name = "Machinist"
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "qyA" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -35292,11 +35604,26 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/crew_quarters/washroom/central)
 "qyF" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
+/obj/machinery/shower{
+	dir = 4;
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = -12
+	},
+/obj/effect/floor_decal/corner/mauve{
+	dir = 9
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/area/rnd/research)
 "qyQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -35359,20 +35686,9 @@
 /turf/simulated/floor/plating,
 /area/medical/cryo)
 "qAF" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/obj/effect/floor_decal/corner/mauve/full{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/brown/full{
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
@@ -35401,12 +35717,17 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
 "qBt" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/effect/floor_decal/corner/black{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "qBz" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -35567,17 +35888,17 @@
 /turf/simulated/floor/tiled/full,
 /area/engineering/lobby)
 "qFg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/table/standard,
+/obj/machinery/recharger{
+	pixel_x = 8;
+	pixel_y = 10
 	},
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/corner/black{
-	dir = 5
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/machinery/requests_console/west,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "qFl" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 9
@@ -35772,6 +36093,14 @@
 /obj/machinery/light/floor{
 	dir = 4
 	},
+/obj/machinery/camera/network/second_deck{
+	c_tag = "Second Deck - Hallway 1";
+	dir = 8
+	},
+/obj/structure/sign/science{
+	pixel_x = 32;
+	pixel_y = -2
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "qJf" = (
@@ -35791,15 +36120,21 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room/rust)
 "qJr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
+/obj/structure/platform{
+	dir = 4
 	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/machinery/chem_master{
-	dir = 8
+/obj/structure/sign/fire{
+	desc = "A warning sign which reads 'DANGER: SHUTTLE THRUSTERS IN USE' and 'MIND THE DISTANCE'.";
+	layer = 2.1;
+	name = "\improper DANGER: THRUSTERS sign";
+	pixel_x = -32
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/obj/machinery/disposal/small/east,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "qKi" = (
 /obj/machinery/button/remote/airlock{
 	dir = 1;
@@ -35818,6 +36153,17 @@
 /obj/random/contraband,
 /turf/simulated/floor/tiled/freezer,
 /area/operations/break_room)
+"qKx" = (
+/obj/machinery/autolathe,
+/obj/effect/floor_decal/spline/plain{
+	dir = 9
+	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/lab)
 "qKK" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
@@ -36170,15 +36516,26 @@
 /turf/simulated/floor/tiled/full,
 /area/horizon/security/armoury)
 "qTB" = (
-/obj/effect/floor_decal/industrial/loading/yellow{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/standard,
 /obj/effect/floor_decal/spline/plain/cee{
-	dir = 1
+	dir = 4
+	},
+/obj/machinery/button/remote/blast_door{
+	dir = 5;
+	id = "shutters_deck2_workshopdesk";
+	name = "Machinist Workshop Desk Shutters";
+	pixel_x = -7;
+	pixel_y = 3
+	},
+/obj/machinery/button/remote/blast_door{
+	dir = 5;
+	id = "mech_bay_shutter";
+	name = "Machinist Bay Shutters";
+	pixel_x = 3;
+	pixel_y = 3
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
+/area/operations/lower/machinist)
 "qTC" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/brown,
@@ -36469,13 +36826,18 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "rbf" = (
-/obj/structure/table/rack,
-/obj/random/loot,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 4
+/obj/structure/platform/ledge,
+/obj/structure/platform{
+	dir = 8
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/aft)
+/obj/structure/closet/crate,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/platform_deco/ledge{
+	dir = 9
+	},
+/obj/random/loot,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "rbr" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/hatch{
@@ -36765,18 +37127,12 @@
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
 "rhC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/platform_deco,
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "rhT" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -36894,22 +37250,12 @@
 /turf/simulated/floor/carpet/rubber,
 /area/engineering/engine_room/rust)
 "rlp" = (
-/obj/structure/cable/green{
-	icon_state = "1-4"
+/obj/machinery/door/blast/shutters/open{
+	id = "RnDShutters"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/chemistry)
 "rls" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -37047,25 +37393,11 @@
 /turf/simulated/floor/wood,
 /area/chapel/office)
 "roX" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
 	},
-/obj/structure/cable/green{
-	icon_state = "2-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "rpj" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 6
@@ -37189,11 +37521,9 @@
 /obj/structure/railing/mapped{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 6
-	},
+/obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/white,
-/area/rnd/telesci)
+/area/operations/lower/machinist/surgicalbay)
 "rtu" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -37309,6 +37639,9 @@
 /obj/machinery/door/firedoor/multi_tile{
 	dir = 2
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_one)
 "rvJ" = (
@@ -37582,18 +37915,16 @@
 /turf/simulated/floor/plating,
 /area/hallway/primary/central_two)
 "rCd" = (
-/obj/machinery/light{
-	dir = 8
+/obj/structure/platform{
+	dir = 4
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/structure/table/standard,
+/obj/effect/floor_decal/spline/plain{
+	dir = 9
 	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/machinery/chemical_dispenser/full{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/item/storage/toolbox/mechanical,
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "rCf" = (
 /obj/effect/floor_decal/corner_wide/green/full,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -37622,17 +37953,14 @@
 /turf/simulated/wall,
 /area/operations/lobby)
 "rDh" = (
-/obj/effect/landmark/start{
-	name = "Machinist"
-	},
-/obj/structure/bed/stool/chair/office/dark{
+/obj/machinery/chem_master{
 	dir = 8
 	},
-/obj/effect/floor_decal/corner/black{
-	dir = 9
+/obj/effect/floor_decal/spline/plain/cee{
+	dir = 1
 	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/chemistry)
 "rDE" = (
 /obj/effect/floor_decal/corner/dark_blue,
 /obj/machinery/flasher{
@@ -37674,18 +38002,22 @@
 /turf/simulated/wall/r_wall,
 /area/rnd/xenobiology/xenoflora)
 "rFF" = (
-/obj/structure/table/standard,
-/obj/machinery/power/apc/west,
-/obj/structure/cable/green,
-/obj/effect/floor_decal/corner/mauve{
-	dir = 9
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
 	},
-/obj/item/folder/purple,
-/obj/item/folder/purple,
-/obj/item/paper_bin,
-/obj/item/pen/black,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/effect/floor_decal/corner/black{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/black,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "rFR" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/structure/table/wood,
@@ -37939,9 +38271,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/aft_airlock)
 "rLw" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor/tiled/dark/full,
-/area/rnd/research)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining{
+	dir = 4;
+	name = "Machinist Workshop";
+	req_access = list(29)
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "rMf" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 5
@@ -38008,8 +38349,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/cable,
+/obj/machinery/power/apc/east,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
@@ -38340,21 +38684,6 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room)
-"rUh" = (
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "rnd"
-	},
-/obj/machinery/door/firedoor,
-/obj/effect/floor_decal/spline/plain/cee,
-/obj/structure/plasticflaps/mining,
-/obj/machinery/door/blast/shutters{
-	dir = 2;
-	id = "shutters_deck2_rescon";
-	name = "Conveyor Shutter"
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
 "rUu" = (
 /obj/effect/floor_decal/corner/mauve{
 	dir = 9
@@ -38603,22 +38932,14 @@
 /turf/simulated/floor/tiled,
 /area/storage/primary)
 "rZU" = (
-/obj/effect/floor_decal/corner/mauve/full,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 9
 	},
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = -12
+/obj/structure/cable/green{
+	icon_state = "2-8"
 	},
-/obj/machinery/shower{
-	dir = 4;
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/wood,
+/area/rnd/hallway)
 "saJ" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/firedoor,
@@ -38854,6 +39175,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
+"sgS" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
+	},
+/obj/machinery/light,
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "shi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -39110,23 +39441,10 @@
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/engine_room/rust)
 "soW" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/machinery/recharge_station,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/hallway)
 "sph" = (
 /obj/effect/shuttle_landmark/horizon/exterior/deck_2/starboard_aft,
 /turf/template_noop,
@@ -39458,14 +39776,27 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
 "sxQ" = (
-/obj/effect/floor_decal/corner/mauve{
-	dir = 10
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/turf/simulated/floor/wood,
+/area/rnd/hallway)
+"syj" = (
+/obj/structure/platform/cutout{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/structure/platform_stairs/full/east_west_cap,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
+"sym" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/black/full{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "syI" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -39612,11 +39943,16 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/atmos/storage)
 "sDQ" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 4
+/obj/structure/table/standard,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 13
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
+/obj/structure/sign/poster{
+	pixel_y = 32
+	},
+/obj/item/storage/box/fancy/donut,
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist/surgicalbay)
 "sEu" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/random/junk,
@@ -39674,12 +40010,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/bar/backroom)
 "sGG" = (
-/obj/effect/floor_decal/corner/black{
+/obj/machinery/chem_heater,
+/obj/effect/floor_decal/corner/mauve{
 	dir = 5
 	},
-/obj/item/modular_computer/console/preset/supply/machinist,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/corner/mauve,
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "sGR" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 1
@@ -39838,6 +40175,15 @@
 "sMn" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/locker_room)
+"sMq" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 6
+	},
+/obj/structure/bed/stool/chair/sofa/left/black{
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/rnd/hallway)
 "sMv" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -40049,15 +40395,10 @@
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_one)
 "sRC" = (
-/obj/effect/floor_decal/spline/plain,
-/obj/machinery/button/switch/windowtint{
-	dir = 1;
-	id = "polarized_deck2_workshop";
-	pixel_x = -25;
-	pixel_y = 1
-	},
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "sSE" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
@@ -40510,6 +40851,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/wing/starboard)
+"tbA" = (
+/turf/simulated/wall,
+/area/rnd/research)
 "tbQ" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -40522,19 +40866,18 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
 "tci" = (
-/obj/structure/plasticflaps/airtight,
-/obj/machinery/door/airlock/glass_research{
-	dir = 1;
-	name = "Telescience";
-	req_access = list(7)
+/obj/structure/bed/stool/chair{
+	dir = 8
 	},
-/obj/machinery/door/firedoor,
-/obj/structure/sign/electricshock{
-	name = "\improper WARNING: HIGH VOLTAGE ELECTROMAGNETIC FIELDS IN USE sign";
-	pixel_x = 32
+/obj/effect/floor_decal/spline/fancy/wood/cee{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/full,
-/area/rnd/telesci)
+/obj/machinery/camera/network/supply{
+	c_tag = "Operations -  Machinist Surgical Bay";
+	dir = 8
+	},
+/turf/simulated/floor/wood,
+/area/operations/lower/machinist/surgicalbay)
 "tcE" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 6
@@ -40963,19 +41306,6 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/maintenance/substation/wing_port)
-"tld" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 5
-	},
-/obj/structure/table/standard,
-/obj/item/reagent_containers/glass/beaker{
-	pixel_y = 8
-	},
-/obj/structure/reagent_dispensers/acid{
-	pixel_y = 32
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
 "tlh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -41163,6 +41493,25 @@
 	},
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
+"trE" = (
+/obj/machinery/door/airlock/glass_research{
+	dir = 4;
+	name = "Exploratory Chemistry";
+	req_access = list(7)
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/rnd/chemistry)
 "tsf" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -41262,19 +41611,35 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
 	},
+/obj/item/material/stool/chair/folding{
+	pixel_y = 17
+	},
+/obj/item/material/stool/chair/folding{
+	pixel_y = 17
+	},
+/obj/item/material/stool/chair/folding{
+	pixel_y = 17
+	},
+/obj/item/material/stool/chair/folding{
+	pixel_y = 17
+	},
+/obj/item/material/stool/chair/folding{
+	pixel_y = 17
+	},
+/obj/item/material/stool/chair/folding{
+	pixel_y = 17
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/strongroom)
 "twc" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
 /obj/effect/floor_decal/spline/plain{
 	dir = 5
 	},
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "Robocompo"
-	},
-/obj/structure/plasticflaps,
+/obj/machinery/r_n_d/destructive_analyzer,
+/obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "two" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 9
@@ -41470,12 +41835,14 @@
 /turf/simulated/floor/plating,
 /area/security/checkpoint2)
 "tAS" = (
-/obj/effect/floor_decal/corner/mauve{
-	dir = 9
+/obj/structure/railing/mapped{
+	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/structure/railing/mapped,
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/plating,
+/area/operations/lower/machinist)
 "tAX" = (
 /obj/machinery/camera/network/second_deck{
 	c_tag = "Second Deck - Tech Storage Entrance";
@@ -41565,9 +41932,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
-"tDc" = (
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
 "tDl" = (
 /obj/machinery/door/airlock/service{
 	dir = 1;
@@ -41826,15 +42190,14 @@
 /turf/simulated/floor/reinforced,
 /area/horizon/grauwolf)
 "tHv" = (
-/obj/structure/platform_stairs/full/east_west_cap{
-	dir = 8
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
 	},
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Telescience";
-	dir = 1
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/telesci)
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "tHA" = (
 /obj/effect/floor_decal/corner/beige/full,
 /obj/effect/floor_decal/industrial/loading/yellow{
@@ -41947,30 +42310,6 @@
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/storage)
-"tJP" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
-	dir = 4;
-	name = "Research and Development";
-	req_access = list(7)
-	},
-/obj/effect/map_effect/door_helper/unres{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/rnd/research)
 "tKs" = (
 /obj/machinery/firealarm/north,
 /obj/effect/floor_decal/spline/plain/yellow{
@@ -42193,14 +42532,15 @@
 /turf/simulated/floor/wood,
 /area/horizon/library)
 "tPL" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/floor_decal/corner/black{
+/obj/structure/table/standard,
+/obj/effect/floor_decal/corner/mauve{
 	dir = 6
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/firealarm/east,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/item/storage/bag/circuits/basic,
+/obj/item/device/integrated_electronics/wirer,
+/obj/item/device/integrated_electronics/debugger,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "tPU" = (
 /obj/machinery/power/apc/super/critical/west,
 /obj/structure/cable{
@@ -42329,16 +42669,10 @@
 	},
 /area/medical/surgery)
 "tSJ" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 6
-	},
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 12;
-	pixel_y = 8
-	},
+/obj/effect/floor_decal/corner/mauve/diagonal,
+/obj/structure/bed/stool/chair/office/dark,
 /turf/simulated/floor/tiled/white,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "tSL" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/vending/coffee,
@@ -42532,33 +42866,16 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
 "tYa" = (
-/obj/machinery/light,
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "Robocompo"
-	},
-/obj/structure/plasticflaps,
+/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/spline/plain{
 	dir = 6
 	},
+/obj/machinery/r_n_d/circuit_imprinter,
 /turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "tYj" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/engine_monitoring)
-"tYs" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
 "tYB" = (
 /obj/machinery/door/blast/regular{
 	dir = 2;
@@ -43143,11 +43460,24 @@
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
 "ukT" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 6
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 5
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/area/rnd/research)
 "ukV" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -43216,17 +43546,18 @@
 /turf/simulated/floor,
 /area/maintenance/wing/port/far)
 "ulB" = (
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "RnDShutters";
-	name = "Research and Development";
-	opacity = 0
+/obj/machinery/door/airlock/mining{
+	dir = 1;
+	name = "Machinist Workshop";
+	req_access = list(29)
 	},
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor/tiled/dark/full,
-/area/rnd/research)
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "ulS" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 5
@@ -43269,19 +43600,14 @@
 /obj/effect/floor_decal/corner/mauve{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/structure/disposalpipe/sortjunction{
-	dir = 4;
-	name = "Machinist Workshop";
-	sortType = "Machinist Workshop"
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -43337,13 +43663,11 @@
 /turf/simulated/floor/reinforced/reactor,
 /area/engineering/engine_room)
 "uon" = (
-/obj/machinery/light,
-/obj/machinery/vending/robotics,
-/obj/effect/floor_decal/corner/black/full,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/firealarm/west,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/structure/table/standard,
+/obj/item/storage/box/fancy/vials,
+/obj/item/reagent_containers/dropper/electronic_pipette,
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "uoq" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -43361,13 +43685,18 @@
 /turf/simulated/floor/plating,
 /area/maintenance/substation/research)
 "uoA" = (
-/obj/effect/floor_decal/spline/plain/corner{
-	dir = 4
+/obj/structure/platform_deco/ledge{
+	dir = 1
 	},
-/obj/effect/floor_decal/spline/plain,
-/obj/effect/floor_decal/industrial/warning/corner,
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "uoU" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
@@ -43555,6 +43884,14 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/storage_hard)
+"urG" = (
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/door/blast/shutters/open{
+	id = "RnDShutters";
+	name = "RnD Shutters"
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/chemistry)
 "urP" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -43671,16 +44008,17 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_two/fore)
 "utF" = (
-/obj/machinery/computer/rdconsole/core,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/spline/plain{
-	dir = 5
+/obj/structure/platform_stairs,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Research & Development"
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "uuI" = (
 /obj/machinery/atmospherics/valve/digital/open{
 	dir = 4;
@@ -43766,17 +44104,8 @@
 /turf/simulated/floor/tiled/full,
 /area/horizon/bar)
 "uxf" = (
-/obj/machinery/mecha_part_fabricator{
-	dir = 4
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
-	},
-/obj/structure/railing/mapped{
-	dir = 4
-	},
 /turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "uxn" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -43865,15 +44194,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/hallway/primary/central_one)
-"uzh" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/closet/bombcloset,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
 "uzr" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass{
@@ -44058,13 +44378,10 @@
 /turf/simulated/floor/plating,
 /area/engineering/rust_office)
 "uFc" = (
-/obj/machinery/firealarm/north,
-/obj/effect/floor_decal/corner/dark_green{
-	dir = 5
-	},
 /obj/machinery/light/floor{
 	dir = 1
 	},
+/obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "uFk" = (
@@ -44126,26 +44443,16 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology)
 "uFM" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/table/standard,
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 5
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
 	},
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Research and Development Entrance"
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/obj/random/pottedplant_small,
+/turf/simulated/floor/wood,
+/area/rnd/hallway)
 "uGv" = (
 /obj/effect/floor_decal/corner/dark_green{
 	dir = 10
@@ -44337,26 +44644,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/wing/starboard)
 "uKB" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
-	dir = 4;
-	name = "Exploratory Chemistry";
-	req_access = list(7)
-	},
-/obj/effect/map_effect/door_helper/unres{
+/obj/structure/platform_stairs/full{
 	dir = 8
 	},
+/obj/structure/platform{
+	dir = 1
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark/full,
-/area/rnd/chemistry)
+/area/operations/lower/machinist)
 "uKJ" = (
 /obj/effect/floor_decal/corner/dark_green/full,
 /obj/structure/extinguisher_cabinet/south,
@@ -44617,6 +44915,9 @@
 	dir = 10
 	},
 /obj/machinery/light,
+/obj/structure/sign/science{
+	pixel_y = -31
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "uPP" = (
@@ -44779,7 +45080,7 @@
 /area/horizon/hydroponics/garden)
 "uTr" = (
 /turf/simulated/wall,
-/area/operations/lower/machinist)
+/area/rnd/chemistry)
 "uTw" = (
 /obj/effect/floor_decal/corner/mauve{
 	dir = 10
@@ -45280,6 +45581,24 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_two/fore/starboard)
+"vhw" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
+	},
+/obj/machinery/light,
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "vhI" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -45420,18 +45739,14 @@
 /turf/simulated/floor/tiled,
 /area/engineering/lobby)
 "vpk" = (
-/obj/structure/table/standard,
-/obj/machinery/light{
+/obj/effect/floor_decal/corner/black/full{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/mauve/full{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "1-4"
 	},
-/obj/item/device/hand_labeler,
-/obj/item/stack/packageWrap,
-/obj/item/stack/wrapping_paper,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "vqe" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -45487,16 +45802,6 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/medical/exam)
-"vrd" = (
-/obj/effect/floor_decal/corner/dark_green{
-	dir = 6
-	},
-/obj/machinery/camera/network/second_deck{
-	c_tag = "Second Deck - Hallway 1";
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/primary/central_one)
 "vrf" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -45557,6 +45862,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/gen_treatment)
+"vsE" = (
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/door/blast/shutters/open{
+	dir = 8;
+	id = "RnDShutters"
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/chemistry)
 "vsI" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/dark,
@@ -45817,12 +46130,12 @@
 /turf/simulated/floor/carpet/brown,
 /area/horizon/library)
 "vzv" = (
-/obj/effect/floor_decal/spline/plain/corner{
+/obj/structure/platform{
 	dir = 1
 	},
-/obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
+/obj/structure/railing/mapped,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "vzE" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -45927,15 +46240,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
-"vBy" = (
-/obj/effect/floor_decal/spline/plain/corner{
-	dir = 8
-	},
-/obj/effect/floor_decal/spline/plain{
-	dir = 1
-	},
-/turf/simulated/floor/carpet/rubber,
-/area/rnd/telesci)
 "vBE" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -46093,6 +46397,11 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/wing/port/far)
+"vFa" = (
+/obj/structure/closet/crate,
+/obj/random/loot,
+/turf/simulated/floor/plating,
+/area/maintenance/aft)
 "vFr" = (
 /obj/machinery/power/terminal{
 	dir = 4
@@ -46596,16 +46905,16 @@
 /turf/simulated/floor/tiled/full,
 /area/engineering/engine_airlock)
 "vPg" = (
-/obj/machinery/mech_recharger,
-/obj/effect/floor_decal/corner/black{
+/obj/effect/floor_decal/corner/mauve{
 	dir = 9
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/light{
-	dir = 8
+/obj/structure/cable/green{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/structure/closet/secure_closet/scientist,
+/obj/machinery/alarm/west,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "vPj" = (
 /turf/simulated/floor/tiled,
 /area/horizon/security/lobby)
@@ -46644,6 +46953,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/turret_protected/ai_upload_foyer)
+"vQe" = (
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/machinery/light,
+/obj/machinery/vending/robotics,
+/obj/effect/floor_decal/corner/black/full,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "vQl" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -47002,6 +47320,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology)
+"vXT" = (
+/obj/structure/extinguisher_cabinet/south,
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "vXX" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -47236,6 +47561,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/security/brig)
+"wbh" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "wbC" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
@@ -47893,6 +48224,14 @@
 /obj/structure/extinguisher_cabinet/west,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/zta)
+"wok" = (
+/obj/structure/platform{
+	dir = 1
+	},
+/obj/machinery/alarm/west,
+/obj/structure/railing/mapped,
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "wou" = (
 /obj/machinery/light{
 	dir = 8
@@ -48674,29 +49013,14 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/chief)
 "wGN" = (
-/obj/structure/table/standard,
-/obj/effect/floor_decal/corner/mauve/full,
-/obj/item/device/flashlight/lamp,
-/obj/machinery/ringer/west{
-	department = "R&D Laboratory";
-	id = "sci_ringer";
-	req_access = list(7)
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/black/full{
+	dir = 4
 	},
-/obj/machinery/button/remote/blast_door{
-	desc = "It controls the research shutters.";
-	id = "RnDShutters";
-	name = "Research Shutters";
-	pixel_x = 8
-	},
-/obj/machinery/button/remote/blast_door{
-	desc = "It controls the research shutters.";
-	id = "shutters_deck2_rescon";
-	name = "Research Conveyor Shutter";
-	pixel_x = 8;
-	pixel_y = 10
-	},
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "wGT" = (
 /obj/effect/floor_decal/corner_wide/blue/full{
 	dir = 4
@@ -48820,21 +49144,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "wKS" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/disposalpipe/sortjunction{
+	dir = 2;
+	name = "Machinist Workshop";
+	sortType = "Machinist Workshop"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist)
 "wLc" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
@@ -48845,30 +49165,6 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/operations/mail_room)
-"wLg" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
-	dir = 4;
-	name = "Research and Development";
-	req_access = list(7)
-	},
-/obj/effect/map_effect/door_helper/unres{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/rnd/research)
 "wLi" = (
 /obj/structure/table/standard,
 /obj/item/autopsy_scanner{
@@ -49032,19 +49328,16 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/bar)
 "wMv" = (
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/effect/floor_decal/corner/mauve{
+/obj/effect/floor_decal/corner/brown{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
@@ -49377,19 +49670,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "wXp" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 12
+/obj/structure/platform{
+	dir = 8
 	},
-/obj/machinery/shower{
-	dir = 8;
-	pixel_x = 1;
-	pixel_y = 1
+/obj/effect/floor_decal/spline/plain{
+	dir = 5
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/turf/simulated/floor/carpet/rubber,
+/area/operations/lower/machinist)
 "wXA" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{
 	id = "surgery1"
@@ -49496,11 +49784,11 @@
 /turf/simulated/floor/carpet,
 /area/horizon/security/head_of_security)
 "wZw" = (
-/obj/structure/table/rack,
-/obj/item/stack/material/plasteel{
-	amount = 20;
-	pixel_y = 4;
-	randpixel = 0
+/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
+/obj/machinery/door/blast/shutters/open{
+	dir = 8;
+	id = "RnDShutters";
+	name = "RnD Shutters"
 	},
 /obj/item/stack/material/glass{
 	amount = 50;
@@ -49541,9 +49829,6 @@
 	c_tag = "Operations -  Machinist Workshop Starboard";
 	dir = 1
 	},
-/obj/item/stack/material/phoron{
-	amount = 15
-	},
 /turf/simulated/floor/tiled,
 /area/operations/lower/machinist)
 "wZG" = (
@@ -49721,14 +50006,35 @@
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "xdr" = (
-/obj/effect/floor_decal/spline/plain{
+/obj/structure/table/standard,
+/obj/machinery/button/remote/blast_door{
+	desc = "It controls the research shutters.";
+	id = "RnDShutters";
+	name = "Research Shutters";
+	pixel_x = 6;
+	dir = 1;
+	pixel_y = 10
+	},
+/obj/machinery/button/remote/blast_door{
+	desc = "It controls the research shutters.";
+	id = "shutters_deck2_rescon";
+	name = "Research Conveyor Shutter";
+	pixel_x = -6;
+	pixel_y = 10;
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/mauve{
 	dir = 5
 	},
-/obj/structure/table/standard,
-/obj/item/storage/box/masks,
-/obj/item/storage/box/gloves,
+/obj/machinery/button/remote/blast_door{
+	desc = "It controls the research shutters.";
+	id = "RnDDesk";
+	name = "Research Desk Shutters";
+	pixel_x = -6;
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
-/area/operations/lower/machinist)
+/area/rnd/lab)
 "xdu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -49761,17 +50067,11 @@
 /turf/simulated/floor/reinforced/airless,
 /area/engineering/engine_room/rust)
 "xea" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/corner/black{
-	dir = 10
+/obj/effect/floor_decal/corner/mauve{
+	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/rnd/hallway)
+/area/hallway/primary/central_one)
 "xed" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/effect/floor_decal/industrial/warning{
@@ -50068,6 +50368,10 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/horizon/security/brig)
+"xkk" = (
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/carpet/rubber,
+/area/rnd/lab)
 "xkH" = (
 /obj/machinery/firealarm/south,
 /obj/machinery/mech_recharger,
@@ -50085,15 +50389,14 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/equipment)
 "xkS" = (
-/obj/machinery/computer/rdconsole/robotics{
-	dir = 8
+/obj/effect/floor_decal/corner/mauve{
+	dir = 10
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/spline/plain{
-	dir = 6
+/obj/machinery/computer/guestpass{
+	pixel_y = -32
 	},
-/turf/simulated/floor/carpet/rubber,
-/area/operations/lower/machinist)
+/turf/simulated/floor/tiled,
+/area/rnd/hallway)
 "xlz" = (
 /obj/machinery/computer/security/engineering{
 	name = "Drone Monitoring Cameras"
@@ -50133,15 +50436,20 @@
 /turf/simulated/floor/grass,
 /area/horizon/hallway/deck_two/fore)
 "xlP" = (
-/obj/effect/floor_decal/corner/black{
-	dir = 10
+/obj/machinery/shower{
+	dir = 4;
+	pixel_x = -1;
+	pixel_y = 1
 	},
-/obj/machinery/power/apc/super/south,
-/obj/structure/cable/green{
-	icon_state = "0-4"
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = -12
 	},
+/obj/effect/floor_decal/corner/mauve/full,
+/obj/machinery/power/apc/south,
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/area/rnd/research)
 "xlQ" = (
 /obj/item/modular_computer/console/preset/medical{
 	dir = 8
@@ -50443,35 +50751,16 @@
 /turf/simulated/floor/wood,
 /area/horizon/library)
 "xun" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/machinery/door/blast/shutters/open{
+	id = "RnDShutters";
+	name = "RnD Shutters"
 	},
-/obj/machinery/door/airlock/mining{
-	dir = 1;
-	name = "Machinist Workshop";
-	req_access = list(29)
-	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/full,
-/area/operations/lower/machinist)
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/lab)
 "xur" = (
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
-"xuv" = (
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 8;
-	icon_state = "shutter0";
-	id = "RnDShutters";
-	name = "Research and Development";
-	opacity = 0
-	},
-/obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
-/turf/simulated/floor/tiled/dark/full,
-/area/rnd/chemistry)
 "xuX" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/effect/floor_decal/industrial/warning{
@@ -50581,17 +50870,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/engineering/lobby)
-"xxm" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/obj/effect/floor_decal/corner/mauve{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/white,
-/area/rnd/research)
 "xxw" = (
 /obj/structure/window/borosilicate/reinforced/skrell{
 	dir = 4
@@ -50607,13 +50885,25 @@
 /turf/simulated/floor/bluegrid/cooled,
 /area/turret_protected/ai)
 "xxy" = (
+/obj/machinery/alarm/north,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/mauve{
+/obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/alarm/north,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "xzd" = (
@@ -50866,11 +51156,14 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/gen_treatment)
 "xEp" = (
-/obj/effect/floor_decal/spline/plain{
-	dir = 8
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/r_n_d/protolathe,
+/obj/structure/railing/mapped{
+	dir = 4
 	},
+/obj/structure/railing/mapped,
 /turf/simulated/floor/carpet/rubber,
-/area/rnd/research)
+/area/operations/lower/machinist)
 "xED" = (
 /obj/machinery/light/small/emergency,
 /obj/effect/floor_decal/industrial/warning{
@@ -51193,14 +51486,14 @@
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
 "xMm" = (
+/obj/effect/floor_decal/corner/mauve{
+	dir = 9
+	},
 /obj/structure/cable/green{
-	icon_state = "1-8"
+	icon_state = "1-2"
 	},
-/obj/effect/floor_decal/corner/black{
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "xMu" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 5
@@ -51350,25 +51643,13 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/bar)
 "xQg" = (
-/obj/machinery/camera/network/supply{
-	c_tag = "Operations -  Machinist Workshop Port";
-	dir = 8
+/obj/effect/floor_decal/corner/mauve/full{
+	dir = 4
 	},
-/obj/machinery/conveyor_switch/oneway{
-	desc = "A conveyor control switch. It appears to only go in one direction. Controls the components conveyor belt.";
-	id = "Robocompo";
-	pixel_x = -13;
-	pixel_y = -6
-	},
-/obj/effect/floor_decal/corner/black{
-	dir = 6
-	},
-/obj/effect/floor_decal/industrial/loading/yellow{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/item/device/radio/intercom/east,
+/obj/structure/railing/mapped,
+/turf/simulated/floor/tiled/white,
+/area/rnd/lab)
 "xQj" = (
 /turf/simulated/open,
 /area/hallway/primary/central_one)
@@ -51667,7 +51948,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/full,
-/area/rnd/hallway)
+/area/maintenance/wing/port)
 "xWr" = (
 /obj/machinery/door/firedoor{
 	dir = 4
@@ -52032,6 +52313,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/reception)
+"ycW" = (
+/obj/machinery/power/apc/east,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/tiled,
+/area/operations/lower/machinist/surgicalbay)
 "ydh" = (
 /obj/structure/viewport/zavod,
 /turf/template_noop,
@@ -52230,18 +52518,17 @@
 /area/crew_quarters/heads/chief)
 "ygL" = (
 /obj/structure/table/standard,
-/obj/machinery/cell_charger,
-/obj/item/cell/high{
+/obj/item/storage/box/beakers{
+	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/item/cell/high{
-	pixel_y = 10
+/obj/item/storage/box/syringes{
+	pixel_y = 2;
+	pixel_x = -8
 	},
-/obj/effect/floor_decal/corner/black{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/corner/mauve/full,
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry)
 "ygP" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -52281,13 +52568,9 @@
 /turf/simulated/floor/tiled,
 /area/operations/office)
 "yhR" = (
-/obj/structure/table/standard,
-/obj/item/storage/box/fancy/tray/machinist,
-/obj/effect/floor_decal/spline/plain{
-	dir = 9
-	},
-/turf/simulated/floor/tiled/white,
-/area/operations/lower/machinist)
+/obj/effect/floor_decal/industrial/loading/yellow,
+/turf/simulated/floor/tiled/dark/full,
+/area/rnd/lab)
 "yig" = (
 /obj/machinery/light{
 	dir = 4
@@ -52381,15 +52664,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/zta)
 "yjZ" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/table/standard,
-/obj/machinery/camera/network/research{
-	c_tag = "Research - Exploratory Chemistry";
+/obj/effect/floor_decal/industrial/loading/yellow,
+/obj/structure/platform{
 	dir = 4
 	},
-/obj/machinery/reagentgrinder,
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry)
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/operations/lower/machinist)
 "yka" = (
 /turf/simulated/wall/r_wall,
 /area/maintenance/wing/port/far)
@@ -74180,16 +74463,16 @@ sDz
 nlG
 rls
 kpC
-kpC
-kpC
-hDr
-hDr
-hDr
-hDr
-xuv
-xuv
-hDr
-hDr
+rfO
+rfO
+rfO
+rfO
+rfO
+rfO
+rfO
+boB
+boB
+rfO
 mVO
 ibf
 ept
@@ -74382,17 +74665,17 @@ idU
 nlG
 ybl
 opF
-kRA
+rfO
 eVf
 hDr
-uzh
 jdH
+aUB
 yjZ
 qJr
 rCd
 dRN
-fjc
-xhg
+dJh
+etv
 ibf
 ept
 tHk
@@ -74584,17 +74867,17 @@ uHh
 nlG
 lSn
 qFs
-kaz
+rfO
 pXP
-hDr
+fqq
 fqq
 fSG
 bJA
 fVX
 qyh
 dki
-fjc
-xhg
+dJh
+etv
 ibf
 pdv
 dPz
@@ -74786,17 +75069,17 @@ kUU
 nlG
 egf
 vmv
-kaz
+rfO
 dNz
-hDr
+fxK
+fxK
+fxK
 hUB
-kfE
-kfE
 rhC
 wXp
 ptV
-fjc
-xhg
+dJh
+etv
 bdh
 ept
 pWR
@@ -74988,16 +75271,16 @@ axa
 nlG
 nAz
 vmv
-aUB
+rfO
 rbf
-hDr
-hDr
-fjl
+eSU
+qpg
 fjl
+syj
 uKB
-hDr
-hDr
-hDr
+iQI
+vQe
+rfO
 uFc
 ibf
 ept
@@ -75189,19 +75472,19 @@ uxE
 nlG
 nlG
 xpv
-nHq
-bQx
+vmv
+rfO
 bQx
 ktC
 poe
 tAS
-tAS
-maP
+sym
+qfP
 rFF
 wGN
 ulB
-xhg
-ibf
+dRa
+hJb
 ept
 ayF
 gBk
@@ -75393,15 +75676,15 @@ bmM
 sPY
 rNQ
 gNn
-pDW
-jTQ
-gQj
 kHu
+jTQ
+jTQ
+jTQ
 fzb
 wKS
 clb
 iCz
-nRx
+rfO
 gzF
 hcF
 wtj
@@ -75588,22 +75871,22 @@ sve
 xvZ
 wfD
 ngE
-bGh
-bGh
-bGh
-bGh
-bGh
-bGh
-bGh
-bGh
-bGh
+puN
+pmT
+pmT
+pmT
+pmT
+pmT
+pmT
+pmT
+rfO
 lbv
 mbH
 qBt
 pib
-nvv
+bGj
 fEa
-ulB
+aWy
 dpv
 mvZ
 ukp
@@ -75790,29 +76073,29 @@ iwu
 xvZ
 wfD
 kvZ
-bGh
-afD
-pbS
-fFx
-fgZ
+vFa
+pmT
+hte
+wok
+cjJ
 dfO
 gWW
 byI
-iLC
+bUN
 cAp
-xxm
-tYs
+fxK
+qBt
 roX
-rlp
+bGj
 qTB
-rUh
+dJh
 avz
 aKr
 qIJ
-ejU
-gio
-gio
-vrd
+vIt
+xea
+xea
+xea
 hkk
 vIt
 qIr
@@ -75993,28 +76276,28 @@ lGd
 wfD
 kvZ
 bGh
-hOa
+pmT
 sDQ
 vzv
 fgZ
-hte
+fIi
 fIi
 jAT
-bGh
+bUN
 cnQ
 xEp
-etv
-aBr
-gPM
+qBt
+ncx
+bQE
 lFE
-jTQ
-eHG
+rfO
+ebk
 rvf
 uTr
 uTr
-bQE
-pGn
-uTr
+wZw
+vsE
+vsE
 uTr
 eHG
 qGp
@@ -76194,30 +76477,30 @@ lFU
 wfD
 wfD
 kvZ
-bGh
-ihe
+ilf
+pmT
 ejw
 iid
-fgZ
+kQV
 fIE
 rtb
 ikB
-fgZ
+bUN
 ljp
-tDc
-oGR
-aBr
-lWQ
+pLf
+fOI
+ncx
+ncx
 bGj
-ulB
-kXY
-uPo
-uTr
+dJh
+iGU
+tHv
+urG
 hEx
 rDh
 mAQ
 uon
-uTr
+urG
 nGI
 aNp
 mbE
@@ -76395,31 +76678,31 @@ tPU
 wQS
 fWp
 uEq
-kvZ
-bGh
-vBy
+dRh
+kCs
+pmT
 pbS
 uoA
-fgZ
-aWy
-iRN
-tHv
-bGh
+nRx
+nRx
+nRx
+eUS
+lXP
 utF
 nio
 iFw
 mxm
 oBl
 vpk
-ulB
-kXY
-rnA
-bUN
+dJh
+iGU
+tHv
+rlp
 qsv
 env
-ncx
+pvc
 ygL
-bUN
+rlp
 vyd
 gGI
 mNn
@@ -76598,30 +76881,30 @@ eOs
 pOV
 uEq
 kvZ
-bGh
+cZL
 fsL
-sDQ
-kPA
+czx
+ycW
 tci
-hyL
-kEh
+kok
+kPA
 ayA
-bGh
+rfO
+rfO
+rfO
+rfO
+rfO
+rfO
 rLw
-rLw
-rLw
-jTQ
-wLg
-rLw
-jTQ
+rfO
 dCK
-rnA
-bUN
+tHv
+rlp
 sGG
 luY
-ncx
+iuA
 heg
-bUN
+uTr
 xhg
 mzL
 ayF
@@ -76812,18 +77095,18 @@ cyZ
 pkK
 eUT
 rgc
-rLw
+vBO
 soW
 rZU
-ulB
-kXY
-rnA
-bUN
+gQj
+dYz
+sgS
+uTr
 ntg
-ncx
-ncx
+maP
+eSn
 dlT
-bUN
+uTr
 gma
 bhJ
 xZy
@@ -77014,17 +77297,17 @@ cyZ
 fGi
 fnh
 qLj
-rLw
+vBO
 ldk
 sxQ
-ulB
-kXY
+feE
+pgD
 qsj
 uTr
-ntg
-ncx
-ncx
-wZw
+eWv
+trE
+eWv
+uTr
 uTr
 xmw
 ylk
@@ -77216,18 +77499,18 @@ obZ
 vQd
 aVO
 tyd
-rLw
+vBO
 uFM
 eUj
-ulB
+sMq
 pgD
 gem
-uTr
+tbA
 bWT
 eWz
 qyF
 xlP
-uTr
+tbA
 ayF
 ykd
 ayF
@@ -77418,15 +77701,15 @@ mYp
 ndn
 jSY
 uTw
-jTQ
-tJP
-oAR
-jTQ
+sig
+vBO
+vBO
+sig
 xxy
-uPo
-uTr
+vhw
+dsq
 kbF
-oUZ
+oOk
 ukT
 jPr
 cHz
@@ -77625,16 +77908,16 @@ qAF
 bmq
 bmq
 wMv
-rnA
-uTr
-tld
 xkS
+ioQ
+ioQ
+fjc
 kur
-aWN
-uTr
-uTr
-uTr
-uTr
+fjc
+ioQ
+ioQ
+ioQ
+ioQ
 emN
 wmZ
 bHb
@@ -77827,7 +78110,7 @@ gax
 jko
 jIL
 umH
-xea
+rnA
 xun
 qFg
 goQ
@@ -77836,7 +78119,7 @@ xMm
 knA
 vPg
 bAZ
-uTr
+ioQ
 kaT
 drT
 bHb
@@ -78029,16 +78312,16 @@ cer
 cer
 oAw
 qhA
-qUz
-bUN
+fFx
+jgh
 yhR
 qdf
-qfP
-ncx
-ncx
-ncx
-dYe
-uTr
+dds
+mIi
+wbh
+wbh
+vXT
+ioQ
 kaT
 lFG
 ePb
@@ -78231,16 +78514,16 @@ pRo
 qrx
 taf
 fKk
-rnA
-bUN
+ena
+kEh
 aTp
 sRC
-qfP
-ncx
-ncx
-ncx
+dlo
+cyn
+qKx
+iSf
 dYe
-uTr
+ioQ
 tCY
 bBu
 ePb
@@ -78434,15 +78717,15 @@ hfv
 pZQ
 wEq
 rnA
-bUN
+xun
 xdr
 tSJ
-qfP
-ncx
+jim
+hKB
 dzI
 uxf
-oGK
-uTr
+xkk
+ioQ
 veG
 bBu
 ePb
@@ -78636,7 +78919,7 @@ qrx
 tcX
 daM
 uPo
-uTr
+ioQ
 gnA
 tPL
 opW
@@ -78644,7 +78927,7 @@ xQg
 twc
 drw
 tYa
-uTr
+ioQ
 kaT
 hps
 hps
@@ -78838,15 +79121,15 @@ wbV
 iRq
 wpb
 kZL
-rfO
-rfO
-rfO
-rfO
-rfO
-rfO
-rfO
-rfO
-uTr
+mWQ
+mWQ
+mWQ
+mWQ
+mWQ
+mWQ
+mWQ
+mWQ
+ioQ
 iYf
 hps
 elh