From afc233beb330cdd413c7932146f0427e237b22dc Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 18 May 2021 17:45:18 +0200 Subject: [PATCH] [MIRROR] Lets the Quartermaster send desk announcements (#5776) * Let the Quartermaster send desk announcements (#59124) * Lets the Quartermaster send desk announcements Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> --- _maps/map_files/Deltastation/DeltaStation2.dmm | 5 +++-- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 5 +++-- _maps/map_files/KiloStation/KiloStation.dmm | 5 +++-- _maps/map_files/MetaStation/MetaStation.dmm | 5 +++-- _maps/map_files/tramstation/tramstation.dmm | 5 +++-- code/datums/id_trim/jobs.dm | 4 ++-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 065be89133e..9a55bb7127b 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -69557,9 +69557,10 @@ dir = 8 }, /obj/machinery/requests_console/directional/east{ - department = "Cargo Bay"; + announcementConsole = 1; + department = "Quartermaster's Desk"; departmentType = 2; - name = "Cargo Bay Requests Console" + name = "Quartermaster's Requests Console" }, /turf/open/floor/iron, /area/cargo/qm) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index f23a4d3e4a2..5acc4cceac9 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -39451,9 +39451,10 @@ /area/medical/chemistry) "nCD" = ( /obj/machinery/requests_console/directional/west{ - department = "Cargo Bay"; + announcementConsole = 1; + department = "Quartermaster's Desk"; departmentType = 2; - name = "Cargo Bay Requests Console" + name = "Quartermaster's Requests Console" }, /obj/effect/turf_decal/tile/brown{ dir = 1 diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 04dcfbf6fa4..317b9c4acde 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -82385,9 +82385,10 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/east, /obj/machinery/requests_console/directional/north{ - department = "Cargo Bay"; + announcementConsole = 1; + department = "Quartermaster's Desk"; departmentType = 2; - name = "Cargo Bay Requests Console" + name = "Quartermaster's Requests Console" }, /obj/structure/extinguisher_cabinet/directional/north{ pixel_x = 32 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index edb89cb15ae..76f11155bc1 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -77905,9 +77905,10 @@ "xBW" = ( /obj/structure/table/wood/fancy/orange, /obj/machinery/requests_console/directional/east{ - department = "Cargo Bay"; + announcementConsole = 1; + department = "Quartermaster's Desk"; departmentType = 2; - name = "Cargo Bay Requests Console" + name = "Quartermaster's Requests Console" }, /obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = -5; diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 6ab6b11fab7..d89b4fbb130 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -53876,9 +53876,10 @@ }, /obj/machinery/light/directional/west, /obj/machinery/requests_console/directional/west{ - department = "Cargo Bay"; + announcementConsole = 1; + department = "Quartermaster's Desk"; departmentType = 2; - name = "Cargo Bay Requests Console" + name = "Quartermaster's Requests Console" }, /obj/machinery/camera{ c_tag = "Cargo - Quartermaster's Office"; diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index a3a8685cd4c..9715a22ad36 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -372,8 +372,8 @@ /datum/id_trim/job/quartermaster //SKYRAT EDIT: ID TRIM ACCESS OVERRIDEN IN MODULAR JOBS.DM assignment = "Quartermaster" trim_state = "trim_quartermaster" - full_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE) - minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE) + full_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_RC_ANNOUNCE) + minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MECH_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_VAULT, ACCESS_AUX_BASE, ACCESS_RC_ANNOUNCE) config_job = "quartermaster" template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_CHANGE_IDS)