From 82daae064956ee61753f2841d3e849b0feceaeb8 Mon Sep 17 00:00:00 2001 From: dragomagol <66640614+dragomagol@users.noreply.github.com> Date: Mon, 28 Mar 2022 14:58:10 -0700 Subject: [PATCH] Renames some security accesses + misc (#65679) Renames ACCESS_SEC_DOORS to ACCESS_BRIG_ENTRANCE Renames ACCESS_FORENSICS_LOCKERS to ACCESS_FORENSICS Adds a helper for detective access (because I forgot it in my first PR, oops) Changes gulag item reclaimer access from ACCESS_SECURITY to ACCESS_BRIG --- code/__DEFINES/access.dm | 12 +++++----- code/controllers/subsystem/id_access.dm | 4 ++-- code/datums/id_trim/jobs.dm | 24 +++++++++---------- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/doors/windowdoor.dm | 2 +- code/game/machinery/gulag_item_reclaimer.dm | 2 +- .../crates_lockers/closets/secure/security.dm | 4 ++-- code/modules/cargo/goodies.dm | 2 +- code/modules/cargo/packs.dm | 2 +- code/modules/mapping/access_helpers.dm | 16 +++++++++---- 11 files changed, 40 insertions(+), 32 deletions(-) diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index fac334a42e8..118d5d05a34 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -5,7 +5,7 @@ /// Armory, gulag teleporter, execution chamber #define ACCESS_ARMORY 3 ///Detective's office, forensics lockers, security+medical records -#define ACCESS_FORENSICS_LOCKERS 4 +#define ACCESS_FORENSICS 4 /// Medical general access #define ACCESS_MEDICAL 5 /// Morgue access @@ -69,7 +69,7 @@ #define ACCESS_TCOMSAT 61 #define ACCESS_GATEWAY 62 /// Outer brig doors, department security posts -#define ACCESS_SEC_DOORS 63 +#define ACCESS_BRIG_ENTRANCE 63 /// For releasing minerals from the ORM #define ACCESS_MINERAL_STOREROOM 64 #define ACCESS_MINISAT 65 @@ -240,7 +240,7 @@ ACCESS_NETWORK, \ ACCESS_WEAPONS, \ ACCESS_MINERAL_STOREROOM, \ - ACCESS_SEC_DOORS, \ + ACCESS_BRIG_ENTRANCE, \ ACCESS_XENOBIOLOGY, \ ACCESS_MINING_STATION, \ ACCESS_MAILSORTING, \ @@ -271,7 +271,7 @@ ACCESS_RND, \ ACCESS_MORGUE, \ ACCESS_MEDICAL, \ - ACCESS_FORENSICS_LOCKERS, \ + ACCESS_FORENSICS, \ ACCESS_BRIG, \ ACCESS_SECURITY, \ ACCESS_ATMOSPHERICS, \ @@ -375,12 +375,12 @@ #define REGION_SECURITY "Security" /// Used to seed the accesses_by_region list in SSid_access. A list of all security regional accesses that are overseen by the HoS. #define REGION_ACCESS_SECURITY list( \ - ACCESS_SEC_DOORS, \ + ACCESS_BRIG_ENTRANCE, \ ACCESS_WEAPONS, \ ACCESS_SECURITY, \ ACCESS_BRIG, \ ACCESS_ARMORY, \ - ACCESS_FORENSICS_LOCKERS, \ + ACCESS_FORENSICS, \ ACCESS_COURT, \ ACCESS_MECH_SECURITY, \ ACCESS_HOS, \ diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index c5fb8686cf1..81c3ad1b27a 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -248,7 +248,7 @@ SUBSYSTEM_DEF(id_access) desc_by_access["[ACCESS_SECURITY]"] = "Security" desc_by_access["[ACCESS_BRIG]"] = "Holding Cells" desc_by_access["[ACCESS_COURT]"] = "Courtroom" - desc_by_access["[ACCESS_FORENSICS_LOCKERS]"] = "Forensics" + desc_by_access["[ACCESS_FORENSICS]"] = "Forensics" desc_by_access["[ACCESS_MEDICAL]"] = "Medical" desc_by_access["[ACCESS_GENETICS]"] = "Genetics Lab" desc_by_access["[ACCESS_MORGUE]"] = "Morgue" @@ -301,7 +301,7 @@ SUBSYSTEM_DEF(id_access) desc_by_access["[ACCESS_KEYCARD_AUTH]"] = "Keycode Auth." desc_by_access["[ACCESS_TCOMSAT]"] = "Telecommunications" desc_by_access["[ACCESS_GATEWAY]"] = "Gateway" - desc_by_access["[ACCESS_SEC_DOORS]"] = "Brig" + desc_by_access["[ACCESS_BRIG_ENTRANCE]"] = "Brig" desc_by_access["[ACCESS_MINERAL_STOREROOM]"] = "Mineral Storage" desc_by_access["[ACCESS_MINISAT]"] = "AI Satellite" desc_by_access["[ACCESS_WEAPONS]"] = "Weapon Permit" diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 8e5763dccbb..e55d101cee3 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -186,7 +186,7 @@ extra_wildcard_access = list() minimal_access = list(ACCESS_ATMOSPHERICS, ACCESS_AUX_BASE, ACCESS_CE, ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, - ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, ACCESS_TCOMSAT, ACCESS_TECH_STORAGE) + ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_RC_ANNOUNCE, ACCESS_BRIG_ENTRANCE, ACCESS_TCOMSAT, ACCESS_TECH_STORAGE) minimal_wildcard_access = list(ACCESS_CE) config_job = "chief_engineer" template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) @@ -201,7 +201,7 @@ extra_wildcard_access = list() minimal_access = list(ACCESS_CHEMISTRY, ACCESS_EVA, ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MEDICAL, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_PHARMACY, ACCESS_PSYCHOLOGY, ACCESS_RC_ANNOUNCE, - ACCESS_SEC_DOORS, ACCESS_SURGERY, ACCESS_VIROLOGY) + ACCESS_BRIG_ENTRANCE, ACCESS_SURGERY, ACCESS_VIROLOGY) minimal_wildcard_access = list(ACCESS_CMO) config_job = "chief_medical_officer" template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) @@ -246,7 +246,7 @@ trim_state = "trim_detective" sechud_icon_state = SECHUD_DETECTIVE extra_access = list() - minimal_access = list(ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, ACCESS_SEC_DOORS,ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, + minimal_access = list(ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS, ACCESS_BRIG_ENTRANCE,ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) config_job = "detective" template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) @@ -284,7 +284,7 @@ ACCESS_HEADS, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN, ACCESS_LAWYER, ACCESS_LIBRARY, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MINING, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MORGUE, ACCESS_PSYCHOLOGY, ACCESS_QM, ACCESS_RC_ANNOUNCE, - ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_VAULT, ACCESS_WEAPONS, ACCESS_SERVICE) + ACCESS_RESEARCH, ACCESS_BRIG_ENTRANCE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_VAULT, ACCESS_WEAPONS, ACCESS_SERVICE) minimal_wildcard_access = list(ACCESS_HOP) config_job = "head_of_personnel" template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) @@ -298,9 +298,9 @@ extra_access = list(ACCESS_TELEPORTER) extra_wildcard_access = list() minimal_access = list(ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_ARMORY, ACCESS_AUX_BASE, ACCESS_BRIG, ACCESS_CONSTRUCTION, ACCESS_COURT, - ACCESS_ENGINE, ACCESS_EVA, ACCESS_FORENSICS_LOCKERS, ACCESS_GATEWAY, ACCESS_HEADS, ACCESS_KEYCARD_AUTH, + ACCESS_ENGINE, ACCESS_EVA, ACCESS_FORENSICS, ACCESS_GATEWAY, ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, - ACCESS_MINING, ACCESS_MORGUE, ACCESS_RC_ANNOUNCE, ACCESS_RESEARCH, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_WEAPONS) + ACCESS_MINING, ACCESS_MORGUE, ACCESS_RC_ANNOUNCE, ACCESS_RESEARCH, ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_WEAPONS) minimal_wildcard_access = list(ACCESS_HOS) config_job = "head_of_security" template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) @@ -331,7 +331,7 @@ trim_state = "trim_lawyer" sechud_icon_state = SECHUD_LAWYER extra_access = list() - minimal_access = list(ACCESS_COURT, ACCESS_LAWYER, ACCESS_SEC_DOORS, ACCESS_SERVICE) + minimal_access = list(ACCESS_COURT, ACCESS_LAWYER, ACCESS_BRIG_ENTRANCE, ACCESS_SERVICE) config_job = "lawyer" template_access = list(ACCESS_CAPTAIN, ACCESS_HOP, ACCESS_HOS, ACCESS_CHANGE_IDS) job = /datum/job/lawyer @@ -435,7 +435,7 @@ ACCESS_NETWORK, ACCESS_MAINT_TUNNELS, ACCESS_MECH_ENGINE, ACCESS_MECH_MINING, ACCESS_MECH_SECURITY, ACCESS_MECH_SCIENCE, ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINISAT, ACCESS_MORGUE, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_RESEARCH, ACCESS_RND, ACCESS_ROBOTICS, - ACCESS_SEC_DOORS, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_XENOBIOLOGY) + ACCESS_BRIG_ENTRANCE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_XENOBIOLOGY) minimal_wildcard_access = list(ACCESS_RD) config_job = "research_director" template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS) @@ -468,8 +468,8 @@ assignment = "Security Officer" trim_state = "trim_securityofficer" sechud_icon_state = SECHUD_SECURITY_OFFICER - extra_access = list(ACCESS_FORENSICS_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE) - minimal_access = list(ACCESS_BRIG, ACCESS_COURT, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_MECH_SECURITY, + extra_access = list(ACCESS_FORENSICS, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE) + minimal_access = list(ACCESS_BRIG, ACCESS_COURT, ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) /// List of bonus departmental accesses that departmental sec officers get. var/department_access = list() @@ -551,9 +551,9 @@ assignment = "Warden" trim_state = "trim_warden" sechud_icon_state = SECHUD_WARDEN - extra_access = list(ACCESS_FORENSICS_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE) + extra_access = list(ACCESS_FORENSICS, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE) minimal_access = list(ACCESS_ARMORY, ACCESS_BRIG, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, - ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_WEAPONS) // See /datum/job/warden/get_access() + ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_WEAPONS) // See /datum/job/warden/get_access() config_job = "warden" template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS) job = /datum/job/warden diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index c6e8b55f3d6..192b46fb99e 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -5,7 +5,7 @@ desc = "This can be used to check medical records." icon_screen = "medcomp" icon_keyboard = "med_key" - req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS) + req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS) circuit = /obj/item/circuitboard/computer/med_data light_color = LIGHT_COLOR_BLUE var/rank = null diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 07dea2c5c9d..99e6d022fa6 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -3,7 +3,7 @@ desc = "Used to view and edit personnel's security records." icon_screen = "security" icon_keyboard = "security_key" - req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS, ACCESS_HOP) + req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS, ACCESS_HOP) circuit = /obj/item/circuitboard/computer/secure_data light_color = COLOR_SOFT_RED var/rank = null diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 665142c86f4..b6464443065 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -432,7 +432,7 @@ /obj/machinery/door/window/brigdoor/security/holding name = "holding cell door" - req_one_access = list(ACCESS_SEC_DOORS) //lawyer also gets brig_entrance + req_one_access = list(ACCESS_BRIG_ENTRANCE) //lawyer also gets brig_entrance MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/left, 0) MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/door/window/right, 0) diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index 0951189b8d4..3cd3efad6f2 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -3,7 +3,7 @@ desc = "Used to reclaim your items after you finish your sentence at the labor camp." icon = 'icons/obj/terminals.dmi' icon_state = "dorm_taken" - req_access = list(ACCESS_SECURITY) //REQACCESS TO ACCESS ALL STORED ITEMS + req_access = list(ACCESS_BRIG) //REQACCESS TO ACCESS ALL STORED ITEMS density = FALSE use_power = IDLE_POWER_USE idle_power_usage = 100 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 567654d525b..7ac0d4e2121 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -143,7 +143,7 @@ /obj/structure/closet/secure_closet/detective name = "\improper detective's cabinet" - req_access = list(ACCESS_FORENSICS_LOCKERS) + req_access = list(ACCESS_FORENSICS) icon_state = "cabinet" resistance_flags = FLAMMABLE max_integrity = 70 @@ -229,7 +229,7 @@ anchored = TRUE name = "Secure Evidence Closet" req_access_txt = "0" - req_one_access_txt = list(ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS) + req_one_access_txt = list(ACCESS_ARMORY, ACCESS_FORENSICS) /obj/structure/closet/secure_closet/brig/PopulateContents() ..() diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm index 30cd919f61a..15a6c5b5724 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -29,7 +29,7 @@ name = "Colt Detective Special Single-Pack" desc = "The HoS took your gun and your badge? No problem! Just pay the absurd taxation fee and you too can be reunited with the lethal power of a .38!" cost = PAYCHECK_HARD * 40 //they really mean a premium here - access_view = ACCESS_FORENSICS_LOCKERS + access_view = ACCESS_FORENSICS contains = list(/obj/item/gun/ballistic/revolver/detective) /datum/supply_pack/goody/stingbang diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index da1d025c825..fef8e1b055c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1005,7 +1005,7 @@ name = "50 Empty License Plates" desc = "Create a bunch of boxes." cost = CARGO_CRATE_VALUE * 2 // 50 * 25 + 700 - 1000 = 950 credits profit - access_view = ACCESS_SEC_DOORS + access_view = ACCESS_BRIG_ENTRANCE contains = list(/obj/item/stack/license_plates/empty/fifty) crate_name = "empty license plate crate" diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index 12344ac930c..661871d685f 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -180,9 +180,9 @@ . = ..() access_list += ACCESS_SECURITY -/obj/effect/mapping_helpers/airlock/access/any/security/doors/Initialize() +/obj/effect/mapping_helpers/airlock/access/any/security/entrance/Initialize() . = ..() - access_list += ACCESS_SEC_DOORS + access_list += ACCESS_BRIG_ENTRANCE /obj/effect/mapping_helpers/airlock/access/any/security/brig/Initialize() . = ..() @@ -192,6 +192,10 @@ . = ..() access_list += ACCESS_ARMORY +/obj/effect/mapping_helpers/airlock/access/any/security/detective/Initialize() + . = ..() + access_list += ACCESS_FORENSICS + /obj/effect/mapping_helpers/airlock/access/any/security/court/Initialize() . = ..() access_list += ACCESS_COURT @@ -437,9 +441,9 @@ . = ..() access_list += ACCESS_SECURITY -/obj/effect/mapping_helpers/airlock/access/all/security/doors/Initialize() +/obj/effect/mapping_helpers/airlock/access/all/security/entrance/Initialize() . = ..() - access_list += ACCESS_SEC_DOORS + access_list += ACCESS_BRIG_ENTRANCE /obj/effect/mapping_helpers/airlock/access/all/security/brig/Initialize() . = ..() @@ -449,6 +453,10 @@ . = ..() access_list += ACCESS_ARMORY +/obj/effect/mapping_helpers/airlock/access/all/security/detective/Initialize() + . = ..() + access_list += ACCESS_FORENSICS + /obj/effect/mapping_helpers/airlock/access/all/security/court/Initialize() . = ..() access_list += ACCESS_COURT