From 056b652ebc76b588a25057ad287cdda0bed50b59 Mon Sep 17 00:00:00 2001 From: Tom <8881105+tf-4@users.noreply.github.com> Date: Fri, 26 Nov 2021 21:56:00 +0000 Subject: [PATCH] Barber fix (#9613) --- _maps/map_files/Deltastation/DeltaStation2_skyrat.dmm | 1 + code/__DEFINES/access.dm | 3 ++- code/controllers/subsystem/id_access.dm | 1 + modular_skyrat/master_files/code/datums/id_trim/jobs.dm | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm index 486e0488add..cbf1f4e6d81 100644 --- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm @@ -17913,6 +17913,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/cable, /turf/open/floor/iron, /area/hallway/secondary/command) "cyv" = ( diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 4a8ea11a98c..7d689002fa7 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -282,7 +282,8 @@ ACCESS_ATMOSPHERICS, \ ACCESS_ORDNANCE_STORAGE, \ ACCESS_ORDNANCE, \ -) + ACCESS_BARBER, \ +) // SKYRAT EDIT ADD ACCESS_BARBER /// Command staff/secure accesses, think bridge/armoury, AI upload, notably access to modify ID cards themselves. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMAND) #define COMMAND_ACCESS list( \ diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index 8a3d516b973..dc572214753 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -321,6 +321,7 @@ SUBSYSTEM_DEF(id_access) desc_by_access["[ACCESS_CENT_SPECOPS]"] = "Code Black" desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "Code Gold" desc_by_access["[ACCESS_CENT_BAR]"] = "Code Scotch" + desc_by_access["[ACCESS_BARBER]"] = "Barber" // SKYRAT EDIT ADD - BARBER UPDATE /** * Returns the access bitflags associated with any given access level. diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm index dc234253248..7b3b96d7215 100644 --- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm +++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm @@ -31,7 +31,7 @@ ACCESS_MINERAL_STOREROOM) /datum/id_trim/job/head_of_personnel - minimal_access = list(ACCESS_AI_UPLOAD, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_AUX_BASE, ACCESS_BAR, ACCESS_CARGO, ACCESS_CHAPEL_OFFICE, + minimal_access = list(ACCESS_AI_UPLOAD, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_AUX_BASE, ACCESS_BAR, ACCESS_BARBER, ACCESS_CARGO, ACCESS_CHAPEL_OFFICE, ACCESS_CHANGE_IDS, ACCESS_CONSTRUCTION, ACCESS_COURT, ACCESS_CREMATORIUM, ACCESS_ENGINE, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_HEADS, ACCESS_HOP, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN, ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_MECH_MEDICAL, ACCESS_MECH_MINING,