From 7a4ed5b82fa65fae4ec0df421f4051d2bd5a545b Mon Sep 17 00:00:00 2001 From: RaveRadbury <3204033+RaveRadbury@users.noreply.github.com> Date: Wed, 24 Apr 2019 08:29:04 -0700 Subject: [PATCH] Service Jobs have Servicelathe access. (#43647) * Update clown_items.dm * baguettes can be slotted to back and belt * Chaplain gets service key * Update chaplain.dm * Service Access to Service Hall * Took out a space that had slipped in. fixed accidental change to meta * Adds new files to make way for pAI camera feature. * Added additional access so jobs can reach the service hall through least number of maint doors * Removed accidental push from other branch * put a thing back to how it was at start. --- _maps/map_files/BoxStation/BoxStation.dmm | 11 +++++++---- _maps/map_files/Deltastation/DeltaStation2.dmm | 8 +++++--- _maps/map_files/Donutstation/Donutstation.dmm | 4 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 8 ++++---- _maps/map_files/PubbyStation/PubbyStation.dmm | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 27d1b5bbc6c..2415b7fe9cf 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -11950,7 +11950,8 @@ /area/maintenance/starboard/fore) "aBC" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" + req_access_txt = "12"; + req_one_access_txt = "0" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -15434,7 +15435,8 @@ "aJD" = ( /obj/machinery/door/airlock/maintenance{ name = "Bar Maintenance"; - req_access_txt = "12" + req_access_txt = "0"; + req_one_access_txt = "12;25;26;35;28;22;37;46;38" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -19577,7 +19579,8 @@ /area/storage/tools) "aUx" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" + req_access_txt = "0"; + req_one_access_txt = "12;38" }, /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -58037,7 +58040,7 @@ "xiw" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "25;26;35;28" + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index f125b269ae3..113528b85b7 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -13854,7 +13854,7 @@ }, /obj/machinery/door/airlock/maintenance_hatch{ name = "Service Hallway Maintenance Hatch"; - req_one_access_txt = "12;25;28;46" + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -31677,7 +31677,8 @@ "bgn" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ - name = "Service Hall" + name = "Service Hall"; + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -35940,7 +35941,8 @@ "bno" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ - name = "Service Foyer" + name = "Service Foyer"; + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index dd1e3e91c3b..6cf84c9063b 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -19309,7 +19309,7 @@ "aTo" = ( /obj/machinery/door/airlock/medical/glass{ name = "Service Door"; - req_one_access_txt = "35;28" + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /turf/open/floor/plating, /area/maintenance/fore) @@ -49342,7 +49342,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;35;28;25" + req_one_access_txt = "12;22;25;26;28;35;37;38;46" }, /turf/open/floor/plating, /area/maintenance/fore) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index bf07f698e14..b0075099ecb 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -33980,7 +33980,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;25;46" + req_one_access_txt = "12;22;25;37;38;46" }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -38121,7 +38121,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;25;46" + req_one_access_txt = "12;22;25;37;38;46" }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -51166,7 +51166,7 @@ /obj/machinery/door/airlock{ name = "Service Hall"; req_access_txt = "null"; - req_one_access_txt = "25;26;35;28" + req_one_access_txt = "25;26;35;28;22;37;46;38" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -53140,7 +53140,7 @@ /obj/machinery/door/airlock{ name = "Service Hall"; req_access_txt = "null"; - req_one_access_txt = "25;26;35;28" + req_one_access_txt = "25;26;35;28;22;37;46;38" }, /turf/open/floor/plating, /area/maintenance/starboard) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index f24fa5ef348..3c81b77d108 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -21123,7 +21123,7 @@ /obj/machinery/door/airlock{ name = "Service Access"; req_access_txt = "0"; - req_one_access_txt = "25; 26; 28; 35" + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,