From fcdd022aacd7bcf62a310c659072b80e630eb5c5 Mon Sep 17 00:00:00 2001
From: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com>
Date: Mon, 27 Oct 2025 03:02:38 +0200
Subject: [PATCH] Paramedic room fixes (#93608)

---
 .../map_files/Deltastation/DeltaStation2.dmm  |  2 +-
 .../map_files/IceBoxStation/IceBoxStation.dmm |  7 ++--
 _maps/map_files/MetaStation/MetaStation.dmm   | 19 +++++++----
 .../map_files/NebulaStation/NebulaStation.dmm |  9 ++++--
 _maps/map_files/tramstation/tramstation.dmm   | 32 ++++++++++++++-----
 _maps/map_files/wawastation/wawastation.dmm   | 30 ++++++++---------
 6 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 0675be9a4c2..9cd4eeb96ac 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -34204,7 +34204,7 @@
 	id = "paramed_dispatch";
 	name = "Privacy Shutters";
 	pixel_x = 6;
-	req_access = list("medical")
+	req_access = list("paramedic")
 	},
 /obj/machinery/light_switch/directional/north{
 	pixel_x = -8
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 6e76cead554..4bccb53f246 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -3246,7 +3246,8 @@
 	pixel_y = 0;
 	id = "paramedic_shutters";
 	name = "Shutters button";
-	pixel_x = 23
+	pixel_x = 23;
+	req_access = list("paramedic")
 	},
 /turf/open/floor/iron/dark,
 /area/station/medical/paramedic)
@@ -44738,9 +44739,11 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/medical/glass,
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/tile/blue/full,
+/obj/machinery/door/airlock/medical/glass{
+	name = "Paramedic Dispatch Room"
+	},
 /turf/open/floor/iron/dark,
 /area/station/medical/paramedic)
 "mGu" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 15640960a11..937752d0ebe 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -6130,11 +6130,11 @@
 "cjb" = (
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
 /obj/effect/mapping_helpers/airlock/unres,
 /obj/machinery/door/airlock/medical/glass{
 	name = "Medbay Staff Entrance"
 	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /turf/open/floor/iron/dark,
 /area/station/medical/medbay/central)
 "cji" = (
@@ -24323,6 +24323,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/security/general,
 /turf/open/floor/iron/dark,
 /area/station/security/checkpoint/medical)
 "ivu" = (
@@ -33300,6 +33301,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/station/security/medical)
+"lvU" = (
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/turf/open/floor/iron/dark,
+/area/station/hallway/primary/central)
 "lvZ" = (
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
@@ -33408,11 +33413,11 @@
 "lyh" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /obj/machinery/door/airlock/medical/glass{
 	name = "Cryogenics Bay"
 	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
 /turf/open/floor/iron/dark,
 /area/station/medical/paramedic)
 "lyu" = (
@@ -46201,11 +46206,11 @@
 /area/station/science/xenobiology/hallway)
 "pUM" = (
 /obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /obj/machinery/door/airlock/medical/glass{
 	name = "Paramedic Dispatch Room"
 	},
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
 /turf/open/floor/iron/dark,
 /area/station/medical/paramedic)
 "pUS" = (
@@ -48638,7 +48643,9 @@
 	dir = 1
 	},
 /obj/machinery/portable_atmospherics/canister/anesthetic_mix,
-/obj/machinery/light_switch/directional/east,
+/obj/machinery/light_switch/directional/east{
+	pixel_x = 21
+	},
 /obj/effect/turf_decal/stripes/end{
 	dir = 1
 	},
@@ -63387,11 +63394,11 @@
 /obj/machinery/door/airlock/medical/glass{
 	name = "Paramedic Dispatch Room"
 	},
-/obj/effect/mapping_helpers/airlock/access/all/medical/general,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/door/firedoor,
+/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
 /turf/open/floor/iron/dark,
 /area/station/medical/paramedic)
 "vIz" = (
@@ -93006,7 +93013,7 @@ sVY
 sVY
 xxk
 ahr
-dYa
+lvU
 bMY
 rvq
 fFi
diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm
index cce2405ec5b..e7a68fd2f97 100644
--- a/_maps/map_files/NebulaStation/NebulaStation.dmm
+++ b/_maps/map_files/NebulaStation/NebulaStation.dmm
@@ -10146,6 +10146,9 @@
 	dir = 2
 	},
 /obj/effect/landmark/start/psychologist,
+/obj/machinery/door/airlock/medical{
+	name = "Psychology Lobby"
+	},
 /turf/open/floor/wood/parquet,
 /area/station/medical/psychology)
 "bBl" = (
@@ -78400,9 +78403,6 @@
 /turf/open/floor/iron/dark,
 /area/station/command/bridge)
 "lBR" = (
-/obj/machinery/door/airlock/medical{
-	name = "Psychology Lobby"
-	},
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /obj/machinery/door/firedoor,
 /obj/structure/cable,
@@ -78412,6 +78412,9 @@
 	dir = 4
 	},
 /obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
+/obj/machinery/door/airlock/medical/glass{
+	name = "Paramedic Dispatch Room"
+	},
 /turf/open/floor/iron/white,
 /area/station/medical/paramedic)
 "lBS" = (
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 449c8347d2b..8ee47544104 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -20093,7 +20093,8 @@
 	pixel_y = 0;
 	id = "paramedic_shutters";
 	name = "Shutters button";
-	pixel_x = 23
+	pixel_x = 23;
+	req_access = list("paramedic")
 	},
 /turf/open/floor/iron/dark,
 /area/station/medical/paramedic)
@@ -25070,6 +25071,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/secondary/command)
+"hPO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/structure/grille,
+/turf/open/floor/plating,
+/area/station/asteroid)
 "hPQ" = (
 /obj/structure/secure_safe/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -49532,6 +49538,10 @@
 	},
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
+"qpd" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/station/asteroid)
 "qpj" = (
 /obj/structure/chair/stool/bar/directional/east,
 /obj/effect/landmark/start/prisoner,
@@ -52375,6 +52385,12 @@
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
 /turf/open/floor/plating,
 /area/station/engineering/atmos/pumproom)
+"rob" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/structure/closet_empty/crate,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plating,
+/area/station/asteroid)
 "roi" = (
 /obj/structure/chair/stool/directional/north,
 /obj/effect/turf_decal/trimline/dark_green/line{
@@ -105354,8 +105370,8 @@ kFp
 kFp
 mqq
 qjU
-aaa
-aaa
+rob
+hPO
 fal
 fal
 fal
@@ -105612,7 +105628,7 @@ qyr
 xdJ
 qjU
 qjU
-aaa
+hPO
 pIc
 oNW
 wqV
@@ -105869,7 +105885,7 @@ knG
 dcq
 kxC
 knG
-aaa
+qpd
 qpv
 nRK
 oFd
@@ -106126,7 +106142,7 @@ tqp
 kGR
 lhi
 kFp
-aaa
+qpd
 qpv
 crU
 kbG
@@ -106383,7 +106399,7 @@ tqp
 qjU
 qjU
 qjU
-aaa
+aaS
 pIc
 hZr
 hZr
@@ -106639,7 +106655,7 @@ mDx
 pwh
 fNX
 nag
-qjU
+cbc
 qjU
 aaa
 hZr
diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm
index 0b132f350b2..1249394f1c5 100644
--- a/_maps/map_files/wawastation/wawastation.dmm
+++ b/_maps/map_files/wawastation/wawastation.dmm
@@ -1138,7 +1138,7 @@
 	},
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/white,
-/area/station/medical/paramedic)
+/area/station/medical/exam_room)
 "asZ" = (
 /turf/open/floor/glass/airless,
 /area/space/nearstation)
@@ -7512,7 +7512,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron/white,
-/area/station/medical/paramedic)
+/area/station/medical/exam_room)
 "cJx" = (
 /obj/structure/closet/crate/preopen,
 /obj/effect/spawner/random/engineering/flashlight,
@@ -10042,7 +10042,7 @@
 	},
 /obj/structure/closet/secure_closet/personal,
 /turf/open/floor/iron/white,
-/area/station/medical/paramedic)
+/area/station/medical/exam_room)
 "dAu" = (
 /obj/structure/chair/sofa/bench/left{
 	dir = 8
@@ -12345,7 +12345,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/mapping_helpers/airlock/access/any/medical/paramedic,
+/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
 /turf/open/floor/holofloor/dark,
 /area/station/medical/exam_room)
 "epr" = (
@@ -22202,7 +22202,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 8
 	},
-/obj/effect/mapping_helpers/airlock/access/any/medical/paramedic,
+/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
 /turf/open/floor/iron/dark,
 /area/station/medical/paramedic)
 "hIv" = (
@@ -26386,7 +26386,7 @@
 	},
 /obj/structure/closet/secure_closet/medical1,
 /turf/open/floor/iron/white,
-/area/station/medical/paramedic)
+/area/station/medical/exam_room)
 "jkc" = (
 /obj/structure/bed{
 	dir = 1
@@ -39804,16 +39804,16 @@
 /turf/open/floor/iron,
 /area/station/construction/mining/aux_base)
 "nKe" = (
-/obj/machinery/door/airlock/medical{
-	name = "Medical Breakroom and Paramedic Dispatch"
-	},
 /obj/machinery/door/firedoor,
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/any/medical/paramedic,
+/obj/machinery/door/airlock/medical{
+	name = "Paramedic Dispatch"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/paramedic,
 /turf/open/floor/iron/dark,
 /area/station/medical/paramedic)
 "nKi" = (
@@ -55556,7 +55556,7 @@
 	dir = 8
 	},
 /turf/open/floor/iron/white,
-/area/station/medical/paramedic)
+/area/station/medical/exam_room)
 "sZs" = (
 /obj/effect/landmark/event_spawn,
 /obj/effect/turf_decal/siding/wood,
@@ -61467,7 +61467,7 @@
 /obj/machinery/light/cold/directional/north,
 /obj/structure/closet/wardrobe/white/medical,
 /turf/open/floor/iron/white,
-/area/station/medical/paramedic)
+/area/station/medical/exam_room)
 "vdD" = (
 /obj/effect/turf_decal/siding/purple{
 	dir = 1
@@ -86677,7 +86677,7 @@ cqJ
 pCK
 lyF
 rgE
-cBb
+dgp
 jka
 sZl
 rnk
@@ -86934,7 +86934,7 @@ jSY
 dPt
 xdm
 pzo
-cBb
+dgp
 vdb
 cJh
 rnk
@@ -87191,7 +87191,7 @@ oBg
 eAJ
 vkn
 pGM
-cBb
+dgp
 dAr
 asP
 rnk