diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index da4e4b0b3dd5..206ac05f056f 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -12038,8 +12038,9 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "cpY" = ( @@ -12620,7 +12621,8 @@ /obj/machinery/door/airlock/maintenance_hatch{ name = "Medbay Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/station/maintenance/department/medical) "cuT" = ( @@ -19051,8 +19053,9 @@ dir = 4 }, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "dGe" = ( @@ -46604,8 +46607,9 @@ dir = 4 }, /obj/effect/landmark/navigate_destination, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "jbX" = ( @@ -70202,9 +70206,10 @@ name = "Primary Treatment Centre" }, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/duct, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "nIB" = ( @@ -82897,8 +82902,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "qgn" = ( diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 78b94905663b..524ae22fbe56 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5256,9 +5256,10 @@ id_tag = "medbay_foyer"; name = "Medbay" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/unres, /obj/effect/landmark/navigate_destination/med, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white/textured, /area/station/medical/medbay/central) "bKL" = ( @@ -11918,7 +11919,8 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/station/maintenance/department/medical) "dVT" = ( @@ -31704,7 +31706,8 @@ /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "kzv" = ( @@ -35098,8 +35101,9 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medical Side Entrance" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/central) "lFJ" = ( @@ -48939,8 +48943,9 @@ /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white/textured, /area/station/maintenance/starboard/aft) "qoa" = ( @@ -50775,13 +50780,14 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medical Side Entrance" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/central) "qVb" = ( @@ -65063,8 +65069,9 @@ id_tag = "medbay_foyer"; name = "Medbay" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white/textured, /area/station/medical/medbay/central) "vHv" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 1e9d98e76212..1b648d9db0e0 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2569,13 +2569,14 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medbay Treatment Center" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron, /area/station/medical/treatment_center) "aCo" = ( @@ -35282,7 +35283,6 @@ /area/station/hallway/primary/central/fore) "irD" = ( /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -35292,6 +35292,8 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medbay Treatment Center" }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron, /area/station/medical/treatment_center) "irJ" = ( @@ -48178,7 +48180,6 @@ id_tag = "side_door_bolt"; name = "Medbay Side Entrance" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -48189,6 +48190,8 @@ dir = 8 }, /obj/machinery/duct, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron, /area/station/medical/cryo) "ltV" = ( @@ -54567,7 +54570,6 @@ /area/station/medical/surgery/theatre) "mSZ" = ( /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -54580,6 +54582,8 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medbay Treatment Center" }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron, /area/station/medical/treatment_center) "mTc" = ( @@ -68082,7 +68086,6 @@ id_tag = "MedbayFoyer"; name = "Medbay Foyer" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -68092,6 +68095,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/unres, /obj/effect/landmark/navigate_destination/med, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron, /area/station/medical/medbay/lobby) "qkf" = ( @@ -82913,7 +82918,6 @@ /area/station/service/bar/backroom) "tOi" = ( /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -82924,6 +82928,8 @@ id_tag = "MedbayFoyer"; name = "Medbay Foyer" }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron, /area/station/medical/medbay/lobby) "tOm" = ( @@ -94537,11 +94543,12 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "viro-passthrough" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron, /area/station/medical/medbay) "wzT" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index dcc150694ca9..60153afadf1c 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -25710,8 +25710,9 @@ /obj/machinery/door/airlock/medical{ name = "Medbay" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/tile/blue/full, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/large, /area/station/maintenance/aft/greater) "ikz" = ( @@ -27087,8 +27088,9 @@ name = "Medbay" }, /obj/effect/mapping_helpers/airlock/unres, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/tile/blue/full, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/large, /area/station/medical/medbay/lobby) "iIF" = ( @@ -37320,9 +37322,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/tile/blue/full, /obj/effect/landmark/navigate_destination/med, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/large, /area/station/medical/medbay/lobby) "lUw" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index cd12cc41e725..6ada363e55b0 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5197,11 +5197,12 @@ id_tag = "medbay_front_door"; name = "Medbay" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "bMp" = ( @@ -7802,11 +7803,12 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) "cwL" = ( @@ -28441,8 +28443,9 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) "iLy" = ( @@ -75782,7 +75785,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/landmark/navigate_destination, /obj/machinery/door/airlock/medical/glass{ id_tag = "medbay_front_door"; @@ -75791,6 +75793,8 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "xFB" = ( @@ -77729,7 +77733,8 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "chem-passthrough" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) "ylM" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 9447509cac76..4a987bca7b18 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -11937,7 +11937,8 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "erG" = ( @@ -12933,7 +12934,8 @@ name = "Medbay Maintenance" }, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "eNq" = ( @@ -13030,7 +13032,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "eQe" = ( @@ -25676,7 +25679,8 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "jfr" = ( @@ -47145,7 +47149,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/plating, /area/station/maintenance/aft/greater) "qFj" = ( @@ -52388,7 +52393,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "stI" = ( @@ -52500,7 +52506,8 @@ id_tag = "MedbayFoyer"; name = "Medbay" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "svS" = ( diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm index ba1c7e5d0221..fe6a16d28535 100644 --- a/_maps/map_files/Ouroboros/Ouroboros.dmm +++ b/_maps/map_files/Ouroboros/Ouroboros.dmm @@ -27065,6 +27065,8 @@ /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, /obj/effect/mapping_helpers/airlock/access/any/medical/morgue, /turf/open/floor/iron/dark/smooth_large, /area/station/medical/medbay/lobby) diff --git a/_maps/map_files/Voidraptor/VoidRaptor.dmm b/_maps/map_files/Voidraptor/VoidRaptor.dmm index 96561ca31d06..0bf77c99514e 100644 --- a/_maps/map_files/Voidraptor/VoidRaptor.dmm +++ b/_maps/map_files/Voidraptor/VoidRaptor.dmm @@ -20660,11 +20660,12 @@ }, /obj/machinery/door/firedoor, /obj/machinery/duct, -/obj/effect/mapping_helpers/airlock/access/any/medical/general, -/obj/effect/mapping_helpers/airlock/access/any/medical/morgue, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/morgue, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white/textured_large, /area/station/medical/medbay/central) "gba" = ( @@ -51077,10 +51078,11 @@ /turf/open/floor/wood/large, /area/station/security/courtroom) "otQ" = ( -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/door/airlock/maintenance{ name = "Medical Maintenance" }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical/morgue) "otU" = ( @@ -54771,8 +54773,9 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/medical/general, /obj/effect/mapping_helpers/airlock/access/any/medical/morgue, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white/textured_large, /area/station/medical/medbay/central) "pte" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index b5d862c97849..f57a73ccd8c1 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -5365,8 +5365,9 @@ dir = 8 }, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "aKR" = ( @@ -22760,8 +22761,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/door/firedoor, /obj/machinery/duct, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "glc" = ( @@ -37890,10 +37892,11 @@ name = "Medical Maintenance Hatch" }, /obj/machinery/duct, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/crew_quarters/dorms) "kZD" = ( @@ -44461,9 +44464,10 @@ }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "nhf" = ( @@ -56726,10 +56730,11 @@ }, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "qZk" = ( @@ -76789,11 +76794,12 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/door/firedoor, /obj/machinery/duct, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white, /area/station/medical/treatment_center) "xqY" = ( diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 6938edf25ad2..6f537397aad4 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -51,6 +51,8 @@ #define ACCESS_HOS "hos" /// Access for the detective to get into their office, the medical data console, and some other detective-related stuff. #define ACCESS_DETECTIVE "detective" +/// Access for the brig physician to get basic access to medical tools, but not all encompassing access to medical under normal manning. MONKESTATION EDIT +#define ACCESS_BRIG_PHYSICIAN "brig_physician" /// MONKESTATION EDIT /// Engineering General Access, grants access to the standard parts of engineering (as well as the Supermatter and related equipment). #define ACCESS_ENGINEERING "engineering" diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 633c6aac387f..e0fc2a15b426 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -278,6 +278,13 @@ access_list += list(ACCESS_SECURITY, ACCESS_MAINT_TUNNELS) return access_list +/// MONKESTATION EDIT BEGIN +/obj/effect/mapping_helpers/airlock/access/any/security/brig_physician/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG_PHYSICIAN + return access_list +/// MONKESTATION EDIT END + // -------------------- Service access helpers /obj/effect/mapping_helpers/airlock/access/any/service icon_state = "access_helper_serv" @@ -739,6 +746,12 @@ access_list += ACCESS_HOS return access_list +/// MONKESTATION EDIT BEGIN +/obj/effect/mapping_helpers/airlock/access/all/security/brig_physician/get_access() + var/list/access_list = ..() + access_list += ACCESS_BRIG_PHYSICIAN + return access_list +/// MONKESTATION EDIT END // -------------------- Service access helpers /obj/effect/mapping_helpers/airlock/access/all/service icon_state = "access_helper_serv" diff --git a/code/modules/modular_computers/file_system/programs/records.dm b/code/modules/modular_computers/file_system/programs/records.dm index 960702d608cc..8a48b2c91d07 100644 --- a/code/modules/modular_computers/file_system/programs/records.dm +++ b/code/modules/modular_computers/file_system/programs/records.dm @@ -18,7 +18,7 @@ filename = "medrecords" program_icon = "book-medical" extended_desc = "Allows the user to view several basic medical records from the crew." - transfer_access = list(ACCESS_MEDICAL, ACCESS_FLAG_COMMAND) + transfer_access = list(ACCESS_MEDICAL, ACCESS_BRIG_PHYSICIAN, ACCESS_FLAG_COMMAND) ///MONKESTATION EDIT: add brig phys to medrecords. available_on_ntnet = TRUE mode = "medical" diff --git a/monkestation/code/datums/id_trim/jobs.dm b/monkestation/code/datums/id_trim/jobs.dm index ece4a2889851..d9ef7b302f02 100644 --- a/monkestation/code/datums/id_trim/jobs.dm +++ b/monkestation/code/datums/id_trim/jobs.dm @@ -9,7 +9,7 @@ ACCESS_BRIG_ENTRANCE, ACCESS_COURT, ACCESS_MECH_SECURITY, - ACCESS_MEDICAL, + ACCESS_BRIG_PHYSICIAN, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_SECURITY, @@ -19,6 +19,7 @@ ACCESS_DETECTIVE, ACCESS_MAINT_TUNNELS, ACCESS_SURGERY, + ACCESS_MEDICAL, ) template_access = list( ACCESS_CAPTAIN, diff --git a/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm b/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm index a2ae5b7beaaf..7c513a1e155e 100644 --- a/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm +++ b/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm @@ -11,7 +11,7 @@ new /obj/item/flashlight/seclite(src) new /obj/item/storage/bag/garment/brig_physician(src) new /obj/item/storage/backpack/brig_physician(src) - new /obj/item/storage/backpack/duffelbag/sec/surgery(src) + new /obj/item/storage/backpack/duffelbag/brig_physician/surgery(src) new /obj/item/clothing/glasses/hud/health(src) new /obj/item/healthanalyzer(src) new /obj/item/defibrillator/loaded(src) diff --git a/monkestation/code/modules/clothing/jobs/brig_physician.dm b/monkestation/code/modules/clothing/jobs/brig_physician.dm index 5aacbace4da7..9e6fbb05d34d 100644 --- a/monkestation/code/modules/clothing/jobs/brig_physician.dm +++ b/monkestation/code/modules/clothing/jobs/brig_physician.dm @@ -64,7 +64,7 @@ /obj/item/storage/backpack/brig_physician name = "brig physician's backpack" - desc = "You wear this on your back and put items into it." + desc = "A security-grade backpack, now in security grey!" icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' icon_state = "backpack-brigphys" @@ -74,7 +74,7 @@ /obj/item/storage/backpack/satchel/brig_physician name = "brig physician's satchel" - desc = "You wear this on your back and put items into it." + desc = "A security-grade satchel, now in security grey!" icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' icon_state = "satchel-brigphys" @@ -84,7 +84,7 @@ /obj/item/storage/backpack/duffelbag/brig_physician name = "brig physician's duffelbag" - desc = "You wear this on your back and put items into it." + desc = "A large duffel bag for holding extra supplies, now in security grey!" icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' icon_state = "duffel-brigphys" @@ -97,3 +97,19 @@ desc = "A nice set of sneakers in security red. These even have the custom fabric used by medical white! Sweet!" armor_type = /datum/armor/sneakers_white greyscale_colors = "#a52f29#918f8c" + +/obj/item/storage/backpack/duffelbag/brig_physician/surgery + name = "brig physician's surgical bag" + desc = "A large duffel bag for holding extra supplies, now in security grey! This one has a material inlay with space for various sharp-looking tools." + +/obj/item/storage/backpack/duffelbag/brig_physician/surgery/PopulateContents() + new /obj/item/scalpel(src) + new /obj/item/hemostat(src) + new /obj/item/retractor(src) + new /obj/item/circular_saw(src) + new /obj/item/bonesetter(src) + new /obj/item/surgicaldrill(src) + new /obj/item/cautery(src) + new /obj/item/surgical_drapes(src) + new /obj/item/clothing/mask/surgical(src) + new /obj/item/blood_filter(src) diff --git a/monkestation/code/modules/jobs/job_types/brig_physician.dm b/monkestation/code/modules/jobs/job_types/brig_physician.dm index 3865969ff26f..a2f673b960d7 100644 --- a/monkestation/code/modules/jobs/job_types/brig_physician.dm +++ b/monkestation/code/modules/jobs/job_types/brig_physician.dm @@ -47,7 +47,7 @@ uniform = /obj/item/clothing/under/rank/security/scrubs/sec suit = /obj/item/clothing/suit/toggle/labcoat/brig_physician suit_store = /obj/item/flashlight/pen - belt = /obj/item/modular_computer/pda/security + belt = /obj/item/modular_computer/pda/security/brig_physician ears = /obj/item/radio/headset/headset_secmed head = /obj/item/clothing/head/utility/surgerycap/sec shoes = /obj/item/clothing/shoes/sneakers/secred diff --git a/monkestation/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/monkestation/code/modules/modular_computers/computers/item/role_tablet_presets.dm new file mode 100644 index 000000000000..07e1dc55418d --- /dev/null +++ b/monkestation/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -0,0 +1,11 @@ +/obj/item/modular_computer/pda/security/brig_physician + name = "brig physician PDA" + greyscale_config = /datum/greyscale_config/tablet/stripe_split + greyscale_colors = "#A52F29#0000CC#918F8C" + starting_programs = list( + /datum/computer_file/program/records/security, + /datum/computer_file/program/records/medical, + /datum/computer_file/program/crew_manifest, + /datum/computer_file/program/robocontrol, + /datum/computer_file/program/radar/lifeline // For finding security officers + ) diff --git a/tgstation.dme b/tgstation.dme index ed9360de77c1..2d75b0c86988 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7131,6 +7131,7 @@ #include "monkestation\code\modules\modular_bartending\garnishes\grown_cuts.dm" #include "monkestation\code\modules\modular_bartending\item_modifications\attack_additions.dm" #include "monkestation\code\modules\modular_bartending\item_modifications\reagent_modification.dm" +#include "monkestation\code\modules\modular_computers\computers\item\role_tablet_presets.dm" #include "monkestation\code\modules\modular_computers\file_system\programs\crewmanifest.dm" #include "monkestation\code\modules\modular_guns\__base_attachment.dm" #include "monkestation\code\modules\modular_guns\__base_modular_gun.dm"