From 868378999baf8050c2d3553c37aef3e1c11e05a0 Mon Sep 17 00:00:00 2001
From: Deahaka <96499407+Deahaka@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:42:47 +0200
Subject: [PATCH 1/7] box med

---
 maps/boxstation/boxstation.dmm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/maps/boxstation/boxstation.dmm b/maps/boxstation/boxstation.dmm
index e39c9165f933..fd864d3e15ad 100644
--- a/maps/boxstation/boxstation.dmm
+++ b/maps/boxstation/boxstation.dmm
@@ -72207,21 +72207,12 @@
 	dir = 4
 	},
 /obj/effect/landmark/start/paramedic,
-/obj/machinery/door_control{
-	desc = "A remote control switch for the medbay foyer.";
-	id = "MedbayFoyerOut";
-	name = "Medbay Doors Control";
-	pixel_x = 26;
-	pixel_y = -1;
-	req_access = list(5)
-	},
 /obj/machinery/door_control{
 	desc = "A remote control switch for the medbay foyer.";
 	id = "MedbayFoyerIn";
 	name = "Medbay Doors Control";
 	pixel_x = 26;
-	pixel_y = 12;
-	req_access = list(5)
+	pixel_y = 12
 	},
 /turf/simulated/floor{
 	dir = 4;

From 0e812d5b6533e78864c565ce10d3e7eb53bbcf0a Mon Sep 17 00:00:00 2001
From: Deahaka <96499407+Deahaka@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:49:50 +0200
Subject: [PATCH 2/7] prometheus revert

---
 maps/prometheus/prometheus.dmm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/maps/prometheus/prometheus.dmm b/maps/prometheus/prometheus.dmm
index 4ee265e3e234..fe80bed1d473 100644
--- a/maps/prometheus/prometheus.dmm
+++ b/maps/prometheus/prometheus.dmm
@@ -799,11 +799,10 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/medical/glass{
-	id_tag = "MedbayFoyerIn";
+	dir = 4;
+	id_tag = "Medbay";
 	name = "Medbay";
-	req_access = list(5);
-	unres_sides = 2;
-	dir = 4
+	req_access = list(5)
 	},
 /turf/simulated/floor{
 	icon_state = "dark"

From e9bb7f5ebe6c41a4f9503e3d8f3323dff992b450 Mon Sep 17 00:00:00 2001
From: Deahaka <96499407+Deahaka@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:07:00 +0200
Subject: [PATCH 3/7] gamma fikisixik

---
 maps/gamma/gamma.dmm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/maps/gamma/gamma.dmm b/maps/gamma/gamma.dmm
index f11bce396819..63cd043f535b 100644
--- a/maps/gamma/gamma.dmm
+++ b/maps/gamma/gamma.dmm
@@ -8900,7 +8900,7 @@
 	},
 /obj/machinery/door_control{
 	desc = "A remote control switch for the medbay foyer.";
-	id = "MedbayFoyer";
+	id = "MedbayFoyerIn";
 	name = "Medbay Doors Control";
 	pixel_x = 5;
 	pixel_y = -10;
@@ -121742,11 +121742,6 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /turf/simulated/floor,
 /area/station/medical/reception)
 "xMW" = (

From e1bd1a03d0cf68e47e004f9dc51c1130501e3192 Mon Sep 17 00:00:00 2001
From: Deahaka <96499407+Deahaka@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:09:57 +0200
Subject: [PATCH 4/7] cabel gamma

---
 maps/gamma/gamma.dmm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/maps/gamma/gamma.dmm b/maps/gamma/gamma.dmm
index 63cd043f535b..898641c28de3 100644
--- a/maps/gamma/gamma.dmm
+++ b/maps/gamma/gamma.dmm
@@ -51178,11 +51178,6 @@
 	},
 /area/station/medical/hallway/outbranch)
 "jxI" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "";

From 4d3c1f8ab3181678f5d0e14600aafd639d833f91 Mon Sep 17 00:00:00 2001
From: Deahaka <96499407+Deahaka@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:18:24 +0200
Subject: [PATCH 5/7] delta sideways

---
 maps/delta/delta.dmm | 63 ++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/maps/delta/delta.dmm b/maps/delta/delta.dmm
index 8813c5963c8c..ad628c2ceb05 100644
--- a/maps/delta/delta.dmm
+++ b/maps/delta/delta.dmm
@@ -2374,12 +2374,6 @@
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
-/obj/machinery/door/airlock/medical/glass{
-	dir = 4;
-	id_tag = "MedbayFoyerOut";
-	name = "Medbay";
-	req_one_access = list(2,5)
-	},
 /obj/machinery/door/poddoor{
 	density = 0;
 	dir = 4;
@@ -2388,6 +2382,13 @@
 	name = "Medbay Biohazard Blast Doors";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/medical/glass{
+	dir = 4;
+	id_tag = "MedbayFoyerOut";
+	name = "Medbay";
+	req_one_access = list(2,5);
+	unres_sides = 4
+	},
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -2951,12 +2952,6 @@
 /obj/machinery/door/firedoor{
 	dir = 4
 	},
-/obj/machinery/door/airlock/medical/glass{
-	dir = 4;
-	id_tag = "med_second_ex";
-	name = "Medbay Side Entrance";
-	req_access = list(5)
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -2968,6 +2963,13 @@
 	name = "Medbay Biohazard Blast Doors";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/medical/glass{
+	dir = 4;
+	id_tag = "med_second_ex";
+	name = "Medbay Side Entrance";
+	req_access = list(5);
+	unres_sides = 4
+	},
 /turf/simulated/floor{
 	icon_state = "neutralchoco"
 	},
@@ -24828,9 +24830,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/light/small{
-	dir = 1
-	},
 /turf/simulated/floor{
 	dir = 9;
 	icon_state = "whiteblue"
@@ -47235,10 +47234,6 @@
 /area/station/hallway/primary/central)
 "jBX" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
-	name = "Medbay Treatment Center";
-	req_access = list(5)
-	},
 /obj/machinery/door/poddoor{
 	density = 0;
 	icon_state = "pdoor0";
@@ -47246,6 +47241,11 @@
 	name = "Medbay Biohazard Blast Doors";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/medical/glass{
+	name = "Medbay Treatment Center";
+	req_access = list(5);
+	unres_sides = 2
+	},
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -54174,12 +54174,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/door/airlock/medical/glass{
-	dir = 4;
-	id_tag = "MedbayFoyerOut";
-	name = "Medbay";
-	req_one_access = list(2,5)
-	},
 /obj/machinery/door/poddoor{
 	density = 0;
 	dir = 4;
@@ -54188,6 +54182,13 @@
 	name = "Medbay Biohazard Blast Doors";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/medical/glass{
+	dir = 4;
+	id_tag = "MedbayFoyerOut";
+	name = "Medbay";
+	req_one_access = list(2,5);
+	unres_sides = 4
+	},
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -89109,10 +89110,6 @@
 /area/station/civilian/theatre)
 "sEZ" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
-	name = "Medbay Treatment Center";
-	req_access = list(5)
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/poddoor{
@@ -89122,6 +89119,11 @@
 	name = "Medbay Biohazard Blast Doors";
 	opacity = 0
 	},
+/obj/machinery/door/airlock/medical/glass{
+	name = "Medbay Treatment Center";
+	req_access = list(5);
+	unres_sides = 2
+	},
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -90156,9 +90158,6 @@
 /obj/structure/stool/bed/chair/metal{
 	dir = 8
 	},
-/obj/machinery/light/small{
-	dir = 4
-	},
 /obj/machinery/firealarm{
 	dir = 4;
 	pixel_x = 22

From 44676a1a9913654b0704174582d42ffd3d642049 Mon Sep 17 00:00:00 2001
From: Deahaka <96499407+Deahaka@users.noreply.github.com>
Date: Tue, 13 Feb 2024 19:53:47 +0200
Subject: [PATCH 6/7] delta additions

---
 maps/delta/delta.dmm | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/maps/delta/delta.dmm b/maps/delta/delta.dmm
index ad628c2ceb05..64e0cd6e7005 100644
--- a/maps/delta/delta.dmm
+++ b/maps/delta/delta.dmm
@@ -1167,11 +1167,8 @@
 	},
 /area/station/security/checkpoint/escape)
 "abQ" = (
-/obj/machinery/door_control{
-	desc = "A remote control switch for the medbay foyer.";
-	id = "MedbayFoyerOut";
-	name = "Medbay Doors Control";
-	pixel_y = -26
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -30
 	},
 /turf/simulated/floor{
 	dir = 6;
@@ -1967,6 +1964,16 @@
 /obj/item/clothing/mask/bandana/skull,
 /turf/simulated/floor,
 /area/station/cargo/storage)
+"adh" = (
+/obj/machinery/alarm{
+	pixel_x = 29;
+	pixel_y = -6
+	},
+/turf/simulated/floor{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/station/medical/hallway)
 "adi" = (
 /obj/structure/closet/l3closet/scientist,
 /obj/effect/decal/cleanable/dirt,
@@ -2387,7 +2394,7 @@
 	id_tag = "MedbayFoyerOut";
 	name = "Medbay";
 	req_one_access = list(2,5);
-	unres_sides = 4
+	unres_sides = 8
 	},
 /turf/simulated/floor{
 	icon_state = "bluechoco"
@@ -2968,7 +2975,7 @@
 	id_tag = "med_second_ex";
 	name = "Medbay Side Entrance";
 	req_access = list(5);
-	unres_sides = 4
+	unres_sides = 8
 	},
 /turf/simulated/floor{
 	icon_state = "neutralchoco"
@@ -45010,8 +45017,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 29
+/obj/machinery/computer/guestpass{
+	dir = 1;
+	pixel_y = 28
 	},
 /turf/simulated/floor{
 	dir = 5;
@@ -54187,7 +54195,7 @@
 	id_tag = "MedbayFoyerOut";
 	name = "Medbay";
 	req_one_access = list(2,5);
-	unres_sides = 4
+	unres_sides = 8
 	},
 /turf/simulated/floor{
 	icon_state = "bluechoco"
@@ -75614,7 +75622,7 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_access = list(5);
+	req_one_access = list(2,5);
 	unres_sides = 2
 	},
 /turf/simulated/floor{
@@ -103740,7 +103748,7 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_access = list(5);
+	req_one_access = list(2,5);
 	unres_sides = 2
 	},
 /turf/simulated/floor{
@@ -112898,10 +112906,6 @@
 	dir = 5;
 	network = list("SS13","Medical")
 	},
-/obj/machinery/computer/guestpass{
-	dir = 8;
-	pixel_x = -28
-	},
 /turf/simulated/floor{
 	dir = 9;
 	icon_state = "whiteblue"
@@ -152633,7 +152637,7 @@ jMv
 pxa
 cAq
 qDS
-jMv
+adh
 pxa
 pxa
 uVF

From 950bcfa30d524b9ea27b6a981541bdbe5e510511 Mon Sep 17 00:00:00 2001
From: Deahaka <96499407+Deahaka@users.noreply.github.com>
Date: Tue, 13 Feb 2024 20:36:55 +0200
Subject: [PATCH 7/7] rework all to helpers

---
 maps/boxstation/boxstation.dmm |   8 +-
 maps/delta/delta.dmm           |  28 +--
 maps/gamma/gamma.dmm           |  12 +-
 maps/palette/palette.dmm       | 392 +++++++++++++++++----------------
 maps/prometheus/prometheus.dmm |   9 +-
 5 files changed, 228 insertions(+), 221 deletions(-)

diff --git a/maps/boxstation/boxstation.dmm b/maps/boxstation/boxstation.dmm
index fd864d3e15ad..10dde1822e3c 100644
--- a/maps/boxstation/boxstation.dmm
+++ b/maps/boxstation/boxstation.dmm
@@ -32115,9 +32115,9 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_access = list(5);
-	unres_sides = 2
+	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "whitebluefull"
 	},
@@ -82418,9 +82418,9 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_access = list(5);
-	unres_sides = 2
+	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "whitebluefull"
 	},
diff --git a/maps/delta/delta.dmm b/maps/delta/delta.dmm
index 64e0cd6e7005..b69f73f44db1 100644
--- a/maps/delta/delta.dmm
+++ b/maps/delta/delta.dmm
@@ -2393,9 +2393,9 @@
 	dir = 4;
 	id_tag = "MedbayFoyerOut";
 	name = "Medbay";
-	req_one_access = list(2,5);
-	unres_sides = 8
+	req_one_access = list(2,5)
 	},
+/obj/effect/unrestricted_side/west,
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -2974,9 +2974,9 @@
 	dir = 4;
 	id_tag = "med_second_ex";
 	name = "Medbay Side Entrance";
-	req_access = list(5);
-	unres_sides = 8
+	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/west,
 /turf/simulated/floor{
 	icon_state = "neutralchoco"
 	},
@@ -47251,9 +47251,9 @@
 	},
 /obj/machinery/door/airlock/medical/glass{
 	name = "Medbay Treatment Center";
-	req_access = list(5);
-	unres_sides = 2
+	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -54194,9 +54194,9 @@
 	dir = 4;
 	id_tag = "MedbayFoyerOut";
 	name = "Medbay";
-	req_one_access = list(2,5);
-	unres_sides = 8
+	req_one_access = list(2,5)
 	},
+/obj/effect/unrestricted_side/west,
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -75622,9 +75622,9 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_one_access = list(2,5);
-	unres_sides = 2
+	req_one_access = list(2,5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -89129,9 +89129,9 @@
 	},
 /obj/machinery/door/airlock/medical/glass{
 	name = "Medbay Treatment Center";
-	req_access = list(5);
-	unres_sides = 2
+	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
@@ -103748,9 +103748,9 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_one_access = list(2,5);
-	unres_sides = 2
+	req_one_access = list(2,5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "bluechoco"
 	},
diff --git a/maps/gamma/gamma.dmm b/maps/gamma/gamma.dmm
index 898641c28de3..b32bac61c338 100644
--- a/maps/gamma/gamma.dmm
+++ b/maps/gamma/gamma.dmm
@@ -31591,9 +31591,9 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_access = list(5);
-	unres_sides = 2
+	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "whitebluefull"
 	},
@@ -54857,9 +54857,9 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_access = list(5);
-	unres_sides = 2
+	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "whitebluefull"
 	},
@@ -111858,9 +111858,9 @@
 /obj/machinery/door/airlock/medical/glass{
 	id_tag = "MedbayFoyerIn";
 	name = "Medbay";
-	req_access = list(5);
-	unres_sides = 2
+	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/south,
 /turf/simulated/floor{
 	icon_state = "whitebluefull"
 	},
diff --git a/maps/palette/palette.dmm b/maps/palette/palette.dmm
index 762ab22126c8..4d6f5d204975 100644
--- a/maps/palette/palette.dmm
+++ b/maps/palette/palette.dmm
@@ -54,6 +54,16 @@
 	icon_state = "vaultfull"
 	},
 /area/space)
+"ai" = (
+/obj/machinery/door/airlock,
+/obj/effect/unrestricted_side/south,
+/obj/effect/unrestricted_side/west,
+/obj/effect/unrestricted_side/north,
+/obj/effect/unrestricted_side/east,
+/turf/simulated/floor{
+	icon_state = "neutralfull"
+	},
+/area/space)
 "am" = (
 /turf/simulated/floor{
 	icon_state = "wooden-2"
@@ -181,27 +191,27 @@
 "ba" = (
 /obj/structure/sign/departments/security,
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Brig";
 	dir = 1;
 	name = "Brig mediumcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "Brig"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Brig";
 	dir = 4;
 	name = "Brig mediumcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "Brig"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Brig";
 	dir = 8;
 	name = "Brig mediumcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "Brig"
+	pixel_x = -28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Brig";
 	name = "Brig mediumcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "Brig"
+	pixel_y = -28
 	},
 /turf/simulated/floor{
 	dir = 9;
@@ -327,27 +337,27 @@
 "co" = (
 /obj/structure/sign/departments/cargo,
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Cargo";
 	name = "Cargo largecell apc down";
-	pixel_y = -27;
-	custom_smartlight_preset = "Cargo"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Cargo";
 	dir = 4;
 	name = "Cargo largecell apc right";
-	custom_smartlight_preset = "Cargo";
 	pixel_x = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Cargo";
 	dir = 8;
 	name = "Cargo largecell apc left";
-	custom_smartlight_preset = "Cargo";
 	pixel_x = -27
 	},
 /obj/machinery/power/apc/largecell{
-	name = "Cargo largecell apc top";
-	pixel_y = 27;
 	custom_smartlight_preset = "Cargo";
-	dir = 1
+	dir = 1;
+	name = "Cargo largecell apc top";
+	pixel_y = 27
 	},
 /turf/simulated/floor{
 	icon_state = "brownfull"
@@ -775,26 +785,26 @@
 "gU" = (
 /obj/structure/sign/departments/security,
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Brig";
 	dir = 1;
 	name = "Brig largecell apc top";
-	pixel_y = 27;
-	custom_smartlight_preset = "Brig"
+	pixel_y = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Brig";
 	name = "Brig largecell apc down";
-	pixel_y = -27;
-	custom_smartlight_preset = "Brig"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Brig";
 	dir = 4;
 	name = "Brig largecell apc right";
-	custom_smartlight_preset = "Brig";
 	pixel_x = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Brig";
 	dir = 8;
 	name = "Brig largecell apc left";
-	custom_smartlight_preset = "Brig";
 	pixel_x = -27
 	},
 /turf/simulated/floor{
@@ -1055,27 +1065,27 @@
 "jm" = (
 /obj/structure/sign/departments/science,
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "RnD";
 	dir = 1;
 	name = "RnD mediumcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "RnD"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "RnD";
 	dir = 4;
 	name = "RnD mediumcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "RnD"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "RnD";
 	dir = 8;
 	name = "RnD mediumcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "RnD"
+	pixel_x = -28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "RnD";
 	name = "RnD mediumcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "RnD"
+	pixel_y = -28
 	},
 /turf/simulated/floor{
 	dir = 10;
@@ -1460,27 +1470,27 @@
 "lC" = (
 /obj/structure/sign/departments/cargo,
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Cargo";
 	dir = 1;
 	name = "Cargo mediumcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "Cargo"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Cargo";
 	dir = 4;
 	name = "Cargo mediumcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "Cargo"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Cargo";
 	dir = 8;
 	name = "Cargo mediumcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "Cargo"
+	pixel_x = -28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Cargo";
 	name = "Cargo mediumcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "Cargo"
+	pixel_y = -28
 	},
 /turf/simulated/floor{
 	icon_state = "brownfull"
@@ -1613,26 +1623,26 @@
 "nb" = (
 /obj/structure/sign/departments/medbay/alt,
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "MedBay";
 	dir = 1;
 	name = "MedBay largecell apc top";
-	pixel_y = 27;
-	custom_smartlight_preset = "MedBay"
+	pixel_y = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "MedBay";
 	name = "MedBay largecell apc down";
-	pixel_y = -27;
-	custom_smartlight_preset = "MedBay"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "MedBay";
 	dir = 4;
 	name = "MedBay largecell apc right";
-	custom_smartlight_preset = "MedBay";
 	pixel_x = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "MedBay";
 	dir = 8;
 	name = "MedBay largecell apc left";
-	custom_smartlight_preset = "MedBay";
 	pixel_x = -27
 	},
 /turf/simulated/floor{
@@ -2360,8 +2370,8 @@
 /area/space)
 "us" = (
 /obj/effect/decal/turf_decal/orange{
-	icon_state = "siding_line";
-	dir = 9
+	dir = 9;
+	icon_state = "siding_line"
 	},
 /obj/effect/decal/turf_decal/orange{
 	icon_state = "siding_corner"
@@ -2578,26 +2588,26 @@
 "wn" = (
 /obj/structure/sign/departments/science,
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "RnD";
 	dir = 1;
 	name = "RnD largecell apc top";
-	pixel_y = 27;
-	custom_smartlight_preset = "RnD"
+	pixel_y = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "RnD";
 	name = "RnD largecell apc down";
-	pixel_y = -27;
-	custom_smartlight_preset = "RnD"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "RnD";
 	dir = 4;
 	name = "RnD largecell apc right";
-	custom_smartlight_preset = "RnD";
 	pixel_x = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "RnD";
 	dir = 8;
 	name = "RnD largecell apc left";
-	custom_smartlight_preset = "RnD";
 	pixel_x = -27
 	},
 /turf/simulated/floor{
@@ -2863,8 +2873,8 @@
 	icon_state = "siding_line"
 	},
 /obj/effect/decal/turf_decal/purple{
-	icon_state = "siding_corner";
-	dir = 8
+	dir = 8;
+	icon_state = "siding_corner"
 	},
 /turf/simulated/floor,
 /area/space)
@@ -3030,27 +3040,27 @@
 "Ai" = (
 /obj/structure/sign/departments/science,
 /obj/machinery/power/apc{
-	pixel_y = 27;
+	custom_smartlight_preset = "RnD";
 	dir = 1;
 	name = "RnD top APC";
-	custom_smartlight_preset = "RnD"
+	pixel_y = 27
 	},
 /obj/machinery/power/apc{
-	pixel_y = -27;
+	custom_smartlight_preset = "RnD";
 	name = "RnD down APC";
-	custom_smartlight_preset = "RnD"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc{
-	pixel_x = 27;
-	dir = 4;
 	custom_smartlight_preset = "RnD";
-	name = "RnD right APC"
+	dir = 4;
+	name = "RnD right APC";
+	pixel_x = 27
 	},
 /obj/machinery/power/apc{
-	pixel_x = -27;
-	dir = 8;
 	custom_smartlight_preset = "RnD";
-	name = "RnD left APC"
+	dir = 8;
+	name = "RnD left APC";
+	pixel_x = -27
 	},
 /turf/simulated/floor{
 	dir = 10;
@@ -3159,27 +3169,27 @@
 "Bs" = (
 /obj/structure/sign/departments/engineering,
 /obj/machinery/power/apc{
-	pixel_y = 27;
-	name = "Engineering top APC";
 	custom_smartlight_preset = "Engineering";
-	dir = 1
+	dir = 1;
+	name = "Engineering top APC";
+	pixel_y = 27
 	},
 /obj/machinery/power/apc{
-	pixel_y = -27;
+	custom_smartlight_preset = "Engineering";
 	name = "Engineering down APC";
-	custom_smartlight_preset = "Engineering"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc{
-	name = "Engineering right APC";
 	custom_smartlight_preset = "Engineering";
-	pixel_x = 27;
-	dir = 4
+	dir = 4;
+	name = "Engineering right APC";
+	pixel_x = 27
 	},
 /obj/machinery/power/apc{
-	name = "Engineering left APC";
 	custom_smartlight_preset = "Engineering";
-	pixel_x = -27;
-	dir = 8
+	dir = 8;
+	name = "Engineering left APC";
+	pixel_x = -27
 	},
 /turf/simulated/floor{
 	icon_state = "yellowfull"
@@ -3435,27 +3445,27 @@
 "DB" = (
 /obj/structure/sign/departments/science,
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "RnD";
 	dir = 1;
 	name = "RnD smallcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "RnD"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "RnD";
 	name = "RnD smallcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "RnD"
+	pixel_y = -28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "RnD";
 	dir = 4;
 	name = "RnD smallcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "RnD"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "RnD";
 	dir = 8;
 	name = "RnD smallcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "RnD"
+	pixel_x = -28
 	},
 /turf/simulated/floor{
 	dir = 10;
@@ -3503,8 +3513,8 @@
 /area/space)
 "DT" = (
 /obj/effect/decal/turf_decal/orange{
-	icon_state = "siding_line";
-	dir = 8
+	dir = 8;
+	icon_state = "siding_line"
 	},
 /turf/simulated/floor,
 /area/space)
@@ -3627,27 +3637,27 @@
 "EO" = (
 /obj/structure/sign/departments/engineering,
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Engineering";
 	dir = 1;
 	name = "Engineering smallcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "Engineering"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Engineering";
 	name = "Engineering smallcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "Engineering"
+	pixel_y = -28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Engineering";
 	dir = 4;
 	name = "Engineering smallcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "Engineering"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Engineering";
 	dir = 8;
 	name = "Engineering smallcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "Engineering"
+	pixel_x = -28
 	},
 /turf/simulated/floor{
 	icon_state = "yellowfull"
@@ -3826,26 +3836,26 @@
 "Gs" = (
 /obj/structure/sign/departments/engineering,
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Engineering";
 	dir = 1;
 	name = "Engineering largecell apc top";
-	pixel_y = 27;
-	custom_smartlight_preset = "Engineering"
+	pixel_y = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Engineering";
 	name = "Engineering largecell apc down";
-	pixel_y = -27;
-	custom_smartlight_preset = "Engineering"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Engineering";
 	dir = 4;
 	name = "Engineering largecell apc right";
-	custom_smartlight_preset = "Engineering";
 	pixel_x = 27
 	},
 /obj/machinery/power/apc/largecell{
+	custom_smartlight_preset = "Engineering";
 	dir = 8;
 	name = "Engineering largecell apc left";
-	custom_smartlight_preset = "Engineering";
 	pixel_x = -27
 	},
 /turf/simulated/floor{
@@ -3855,27 +3865,27 @@
 "Gu" = (
 /obj/structure/sign/departments/security,
 /obj/machinery/power/apc{
-	pixel_y = -27;
+	custom_smartlight_preset = "Brig";
 	name = "Brig down APC";
-	custom_smartlight_preset = "Brig"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc{
-	pixel_x = 27;
+	custom_smartlight_preset = "Brig";
 	dir = 4;
 	name = "Brig right APC";
-	custom_smartlight_preset = "Brig"
+	pixel_x = 27
 	},
 /obj/machinery/power/apc{
-	pixel_x = -27;
+	custom_smartlight_preset = "Brig";
 	dir = 8;
 	name = "Brig left APC";
-	custom_smartlight_preset = "Brig"
+	pixel_x = -27
 	},
 /obj/machinery/power/apc{
-	pixel_y = 27;
+	custom_smartlight_preset = "Brig";
 	dir = 1;
 	name = "Brig top APC";
-	custom_smartlight_preset = "Brig"
+	pixel_y = 27
 	},
 /turf/simulated/floor{
 	dir = 9;
@@ -4339,27 +4349,27 @@
 "JJ" = (
 /obj/structure/sign/departments/cargo,
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Cargo";
 	dir = 1;
 	name = "Cargo smallcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "Cargo"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Cargo";
 	name = "Cargo smallcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "Cargo"
+	pixel_y = -28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Cargo";
 	dir = 4;
 	name = "Cargo smallcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "Cargo"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Cargo";
 	dir = 8;
 	name = "Cargo smallcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "Cargo"
+	pixel_x = -28
 	},
 /turf/simulated/floor{
 	icon_state = "brownfull"
@@ -4783,27 +4793,27 @@
 "MT" = (
 /obj/structure/sign/departments/engineering,
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Engineering";
 	dir = 1;
 	name = "Engineering mediumcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "Engineering"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Engineering";
 	dir = 4;
 	name = "Engineering mediumcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "Engineering"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Engineering";
 	dir = 8;
 	name = "Engineering mediumcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "Engineering"
+	pixel_x = -28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "Engineering";
 	name = "Engineering mediumcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "Engineering"
+	pixel_y = -28
 	},
 /turf/simulated/floor{
 	icon_state = "yellowfull"
@@ -4915,27 +4925,27 @@
 "Oa" = (
 /obj/structure/sign/departments/medbay/alt,
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "MedBay";
 	dir = 1;
 	name = "MedBay smallcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "MedBay"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "MedBay";
 	name = "MedBay smallcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "MedBay"
+	pixel_y = -28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "MedBay";
 	dir = 4;
 	name = "MedBay smallcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "MedBay"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "MedBay";
 	dir = 8;
 	name = "MedBay smallcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "MedBay"
+	pixel_x = -28
 	},
 /turf/simulated/floor{
 	icon_state = "whitebluefull"
@@ -5191,27 +5201,27 @@
 "Qf" = (
 /obj/structure/sign/departments/medbay/alt,
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "MedBay";
 	dir = 1;
 	name = "MedBay mediumcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "MedBay"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "MedBay";
 	dir = 4;
 	name = "MedBay mediumcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "MedBay"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "MedBay";
 	dir = 8;
 	name = "MedBay mediumcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "MedBay"
+	pixel_x = -28
 	},
 /obj/machinery/power/apc/mediumcell{
+	custom_smartlight_preset = "MedBay";
 	name = "MedBay mediumcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "MedBay"
+	pixel_y = -28
 	},
 /turf/simulated/floor{
 	icon_state = "whitebluefull"
@@ -5716,8 +5726,8 @@
 	icon_state = "siding_line"
 	},
 /obj/effect/decal/turf_decal/purple{
-	icon_state = "siding_corner";
-	dir = 1
+	dir = 1;
+	icon_state = "siding_corner"
 	},
 /turf/simulated/floor,
 /area/space)
@@ -5790,27 +5800,27 @@
 "UM" = (
 /obj/structure/sign/departments/security,
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Brig";
 	dir = 1;
 	name = "Brig smallcell apc top";
-	pixel_y = 28;
-	custom_smartlight_preset = "Brig"
+	pixel_y = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Brig";
 	name = "Brig smallcell apc down";
-	pixel_y = -28;
-	custom_smartlight_preset = "Brig"
+	pixel_y = -28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Brig";
 	dir = 4;
 	name = "Brig smallcell apc right";
-	pixel_x = 28;
-	custom_smartlight_preset = "Brig"
+	pixel_x = 28
 	},
 /obj/machinery/power/apc/smallcell{
+	custom_smartlight_preset = "Brig";
 	dir = 8;
 	name = "Brig smallcell apc left";
-	pixel_x = -28;
-	custom_smartlight_preset = "Brig"
+	pixel_x = -28
 	},
 /turf/simulated/floor{
 	dir = 9;
@@ -5984,27 +5994,27 @@
 "WB" = (
 /obj/structure/sign/departments/medbay/alt,
 /obj/machinery/power/apc{
-	pixel_y = 27;
-	name = "Medbay top APC";
 	custom_smartlight_preset = "MedBay";
-	dir = 1
+	dir = 1;
+	name = "Medbay top APC";
+	pixel_y = 27
 	},
 /obj/machinery/power/apc{
-	pixel_y = -27;
+	custom_smartlight_preset = "MedBay";
 	name = "Medbay down APC";
-	custom_smartlight_preset = "MedBay"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc{
-	pixel_x = -27;
+	custom_smartlight_preset = "MedBay";
 	dir = 8;
 	name = "Medbay left APC";
-	custom_smartlight_preset = "MedBay"
+	pixel_x = -27
 	},
 /obj/machinery/power/apc{
-	pixel_x = 27;
-	dir = 4;
 	custom_smartlight_preset = "MedBay";
-	name = "Medbay right APC"
+	dir = 4;
+	name = "Medbay right APC";
+	pixel_x = 27
 	},
 /turf/simulated/floor{
 	icon_state = "whitebluefull"
@@ -6033,26 +6043,26 @@
 "WN" = (
 /obj/structure/sign/departments/cargo,
 /obj/machinery/power/apc{
-	pixel_y = 27;
-	name = "Cargo top APC";
 	custom_smartlight_preset = "Cargo";
-	dir = 1
+	dir = 1;
+	name = "Cargo top APC";
+	pixel_y = 27
 	},
 /obj/machinery/power/apc{
-	name = "Cargo right APC";
 	custom_smartlight_preset = "Cargo";
 	dir = 4;
+	name = "Cargo right APC";
 	pixel_x = 27
 	},
 /obj/machinery/power/apc{
-	pixel_y = -27;
+	custom_smartlight_preset = "Cargo";
 	name = "Cargo down APC";
-	custom_smartlight_preset = "Cargo"
+	pixel_y = -27
 	},
 /obj/machinery/power/apc{
-	name = "Cargo left APC";
 	custom_smartlight_preset = "Cargo";
 	dir = 8;
+	name = "Cargo left APC";
 	pixel_x = -27
 	},
 /turf/simulated/floor{
@@ -6297,26 +6307,26 @@
 /area/space)
 "Zy" = (
 /obj/machinery/power/apc{
+	custom_smartlight_preset = "bar";
 	dir = 1;
 	name = "Bar apc top";
-	custom_smartlight_preset = "bar";
 	pixel_y = 27
 	},
 /obj/machinery/power/apc{
-	pixel_x = -27;
+	custom_smartlight_preset = "bar";
 	dir = 8;
 	name = "Bar apc left";
-	custom_smartlight_preset = "bar"
+	pixel_x = -27
 	},
 /obj/machinery/power/apc{
-	pixel_x = 27;
+	custom_smartlight_preset = "bar";
 	dir = 4;
 	name = "Bar apc right";
-	custom_smartlight_preset = "bar"
+	pixel_x = 27
 	},
 /obj/machinery/power/apc{
-	name = "Bar apc down";
 	custom_smartlight_preset = "bar";
+	name = "Bar apc down";
 	pixel_y = -27
 	},
 /obj/machinery/vending/boozeomat,
@@ -8359,11 +8369,11 @@ uA
 uA
 uA
 uA
-uA
-uA
-uA
-uA
-uA
+Hy
+Hy
+yc
+Hy
+Hy
 uA
 uA
 uA
@@ -8410,11 +8420,11 @@ uA
 uA
 uA
 uA
-uA
-uA
-uA
-uA
-uA
+Hy
+yc
+ai
+yc
+Hy
 uA
 uA
 uA
@@ -8461,11 +8471,11 @@ uA
 uA
 uA
 uA
-uA
-uA
-uA
-uA
-uA
+Hy
+Hy
+yc
+Hy
+Hy
 uA
 uA
 uA
@@ -8512,11 +8522,11 @@ uA
 uA
 uA
 uA
-uA
-uA
-uA
-uA
-uA
+Hy
+Hy
+Hy
+Hy
+Hy
 uA
 uA
 uA
diff --git a/maps/prometheus/prometheus.dmm b/maps/prometheus/prometheus.dmm
index fe80bed1d473..4ce787d8a833 100644
--- a/maps/prometheus/prometheus.dmm
+++ b/maps/prometheus/prometheus.dmm
@@ -804,6 +804,7 @@
 	name = "Medbay";
 	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/west,
 /turf/simulated/floor{
 	icon_state = "dark"
 	},
@@ -7838,12 +7839,6 @@
 /turf/simulated/floor,
 /area/station/maintenance/chapel)
 "bqp" = (
-/obj/machinery/door_control{
-	desc = "A remote control switch for the medbay foyer.";
-	id = "Medbay";
-	name = "Medbay Doors Control";
-	pixel_x = 28
-	},
 /obj/item/weapon/flora/pottedplant{
 	icon_state = "plant-21"
 	},
@@ -18872,6 +18867,7 @@
 	name = "Medbay";
 	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/west,
 /turf/simulated/floor{
 	icon_state = "dark"
 	},
@@ -39928,6 +39924,7 @@
 	name = "Medbay";
 	req_access = list(5)
 	},
+/obj/effect/unrestricted_side/west,
 /turf/simulated/floor{
 	icon_state = "dark"
 	},