diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index f6967918fed..f3e22d78216 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -52654,10 +52654,11 @@ }, /obj/machinery/door/airlock/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" }, +/obj/effect/mapping_helpers/airlock/access/any/security/court, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, /turf/simulated/floor/wood, /area/station/legal/courtroom/gallery) "eba" = ( @@ -60087,10 +60088,11 @@ }, /obj/machinery/door/airlock/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" }, +/obj/effect/mapping_helpers/airlock/access/any/security/court, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, /turf/simulated/floor/wood, /area/station/legal/courtroom/gallery) "hyk" = ( @@ -94002,12 +94004,13 @@ name = "Courtroom Maintenance"; security_level = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/mapping_helpers/airlock/access/any/security/court, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "yhP" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index a91d4c652fe..2967b9133f0 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -38590,10 +38590,11 @@ /obj/machinery/door/airlock/glass{ name = "Courtroom" }, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" }, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, +/obj/effect/mapping_helpers/airlock/access/any/security/court, /turf/simulated/floor/carpet, /area/station/security/processing) "frV" = ( @@ -40605,13 +40606,14 @@ "gck" = ( /obj/machinery/door/airlock/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, +/obj/effect/mapping_helpers/airlock/access/any/security/court, /turf/simulated/floor/wood, /area/station/legal/courtroom) "gcN" = ( @@ -51427,11 +51429,12 @@ "jAr" = ( /obj/machinery/door/airlock/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" }, /obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, +/obj/effect/mapping_helpers/airlock/access/any/security/court, /turf/simulated/floor/wood, /area/station/legal/courtroom) "jAy" = ( diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 6fa41435b6e..69929d860a7 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -80288,10 +80288,11 @@ /obj/machinery/door/airlock{ name = "Court" }, -/obj/effect/mapping_helpers/airlock/access/all/security/iaa, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/court, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) "nkC" = ( @@ -84921,13 +84922,14 @@ /obj/machinery/door/airlock{ name = "Court" }, -/obj/effect/mapping_helpers/airlock/access/all/security/iaa, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/any/security/court, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, /turf/simulated/floor/plasteel, /area/station/legal/courtroom) "pTN" = ( @@ -97391,7 +97393,8 @@ /obj/machinery/door/airlock{ name = "Court" }, -/obj/effect/mapping_helpers/airlock/access/all/security/iaa, +/obj/effect/mapping_helpers/airlock/access/any/security/court, +/obj/effect/mapping_helpers/airlock/access/any/security/doors, /turf/simulated/floor/plasteel, /area/station/legal/courtroom) "xaI" = ( diff --git a/code/__DEFINES/access_defines.dm b/code/__DEFINES/access_defines.dm index 10443a7316c..10b3c80ad65 100644 --- a/code/__DEFINES/access_defines.dm +++ b/code/__DEFINES/access_defines.dm @@ -1,113 +1,90 @@ -#define ACCESS_SECURITY 1 // Security equipment -#define ACCESS_BRIG 2 // Brig timers and permabrig -#define ACCESS_ARMORY 3 -#define ACCESS_FORENSICS_LOCKERS 4 -#define ACCESS_MEDICAL 5 -#define ACCESS_MORGUE 6 -#define ACCESS_TOX 7 -#define ACCESS_TOX_STORAGE 8 -#define ACCESS_GENETICS 9 -#define ACCESS_ENGINE 10 -#define ACCESS_ENGINE_EQUIP 11 -#define ACCESS_MAINT_TUNNELS 12 -#define ACCESS_EXTERNAL_AIRLOCKS 13 -#define ACCESS_EMERGENCY_STORAGE 14 -#define ACCESS_CHANGE_IDS 15 -#define ACCESS_AI_UPLOAD 16 -#define ACCESS_TELEPORTER 17 -#define ACCESS_EVA 18 -#define ACCESS_HEADS 19 -#define ACCESS_CAPTAIN 20 -#define ACCESS_ALL_PERSONAL_LOCKERS 21 -#define ACCESS_CHAPEL_OFFICE 22 -#define ACCESS_TECH_STORAGE 23 -#define ACCESS_ATMOSPHERICS 24 -#define ACCESS_BAR 25 -#define ACCESS_JANITOR 26 -#define ACCESS_CREMATORIUM 27 -#define ACCESS_KITCHEN 28 -#define ACCESS_ROBOTICS 29 -#define ACCESS_RD 30 -#define ACCESS_CARGO 31 -#define ACCESS_CONSTRUCTION 32 -#define ACCESS_CHEMISTRY 33 -#define ACCESS_CARGO_BOT 34 -#define ACCESS_HYDROPONICS 35 -#define ACCESS_MANUFACTURING 36 -#define ACCESS_LIBRARY 37 -#define ACCESS_INTERNAL_AFFAIRS 38 -#define ACCESS_VIROLOGY 39 -#define ACCESS_CMO 40 -#define ACCESS_QM 41 -#define ACCESS_COURT 42 -#define ACCESS_CLOWN 43 -#define ACCESS_MIME 44 -#define ACCESS_SURGERY 45 -#define ACCESS_THEATRE 46 -#define ACCESS_RESEARCH 47 -#define ACCESS_MINING 48 -#define ACCESS_MINING_OFFICE 49 //not in use -#define ACCESS_MAILSORTING 50 -#define ACCESS_MINT 51 -#define ACCESS_MINT_VAULT 52 -#define ACCESS_HEADS_VAULT 53 -#define ACCESS_MINING_STATION 54 -#define ACCESS_XENOBIOLOGY 55 -#define ACCESS_CE 56 -#define ACCESS_HOP 57 -#define ACCESS_HOS 58 -#define ACCESS_RC_ANNOUNCE 59 //Request console announcements -#define ACCESS_KEYCARD_AUTH 60 //Used for events which require at least two people to confirm them -#define ACCESS_TCOMSAT 61 // has access to the entire telecomms satellite / machinery -#define ACCESS_EXPEDITION 62 -#define ACCESS_SEC_DOORS 63 // Security front doors -#define ACCESS_PSYCHIATRIST 64 // Psychiatrist's office -#define ACCESS_XENOARCH 65 -#define ACCESS_PARAMEDIC 66 -#define ACCESS_BLUESHIELD 67 -// #define ACCESS_MECHANIC 70 // AA07 2021-10-02 - Removed: Kept for history sake -// #define ACCESS_PILOT 71 // AA07 2021-10-02 - Removed: Kept for history sake -#define ACCESS_NTREP 73 -#define ACCESS_MAGISTRATE 74 -#define ACCESS_MINISAT 75 -#define ACCESS_MINERAL_STOREROOM 76 -#define ACCESS_NETWORK 77 -#define ACCESS_CARGO_BAY 78 -#define ACCESS_SUPPLY_SHUTTLE 79 +#define ACCESS_SECURITY 1 //! Security equipment. +#define ACCESS_BRIG 2 //! Brig timers and permabrig. +#define ACCESS_ARMORY 3 +#define ACCESS_FORENSICS_LOCKERS 4 +#define ACCESS_MEDICAL 5 +#define ACCESS_MORGUE 6 +#define ACCESS_TOX 7 +#define ACCESS_TOX_STORAGE 8 +#define ACCESS_GENETICS 9 +#define ACCESS_ENGINE 10 +#define ACCESS_ENGINE_EQUIP 11 +#define ACCESS_MAINT_TUNNELS 12 +#define ACCESS_EXTERNAL_AIRLOCKS 13 +#define ACCESS_CHANGE_IDS 15 +#define ACCESS_AI_UPLOAD 16 +#define ACCESS_TELEPORTER 17 +#define ACCESS_EVA 18 +#define ACCESS_HEADS 19 +#define ACCESS_CAPTAIN 20 +#define ACCESS_ALL_PERSONAL_LOCKERS 21 +#define ACCESS_CHAPEL_OFFICE 22 +#define ACCESS_TECH_STORAGE 23 +#define ACCESS_ATMOSPHERICS 24 +#define ACCESS_BAR 25 +#define ACCESS_JANITOR 26 +#define ACCESS_CREMATORIUM 27 +#define ACCESS_KITCHEN 28 +#define ACCESS_ROBOTICS 29 +#define ACCESS_RD 30 +#define ACCESS_CARGO 31 +#define ACCESS_CONSTRUCTION 32 +#define ACCESS_CHEMISTRY 33 +#define ACCESS_CARGO_BOT 34 +#define ACCESS_HYDROPONICS 35 +#define ACCESS_LIBRARY 37 +#define ACCESS_INTERNAL_AFFAIRS 38 +#define ACCESS_VIROLOGY 39 +#define ACCESS_CMO 40 +#define ACCESS_QM 41 +#define ACCESS_COURT 42 +#define ACCESS_CLOWN 43 +#define ACCESS_MIME 44 +#define ACCESS_SURGERY 45 +#define ACCESS_THEATRE 46 +#define ACCESS_RESEARCH 47 +#define ACCESS_MINING 48 +#define ACCESS_MAILSORTING 50 +#define ACCESS_HEADS_VAULT 53 +#define ACCESS_MINING_STATION 54 +#define ACCESS_XENOBIOLOGY 55 +#define ACCESS_CE 56 +#define ACCESS_HOP 57 +#define ACCESS_HOS 58 +#define ACCESS_RC_ANNOUNCE 59 //! Request console announcements. +#define ACCESS_KEYCARD_AUTH 60 //! Used for events which require at least two people to confirm them. +#define ACCESS_TCOMSAT 61 //! Has access to the entire telecomms satellite / machinery. +#define ACCESS_EXPEDITION 62 +#define ACCESS_SEC_DOORS 63 //! Security front doors. +#define ACCESS_PSYCHIATRIST 64 +#define ACCESS_PARAMEDIC 66 +#define ACCESS_BLUESHIELD 67 +#define ACCESS_NTREP 73 +#define ACCESS_MAGISTRATE 74 +#define ACCESS_MINISAT 75 +#define ACCESS_MINERAL_STOREROOM 76 +#define ACCESS_CARGO_BAY 78 +#define ACCESS_SUPPLY_SHUTTLE 79 -#define ACCESS_WEAPONS 99 //Weapon authorization for secbots +#define ACCESS_WEAPONS 99 //! Weapon authorization for secbots. - //BEGIN CENTCOM ACCESS -#define ACCESS_CENT_GENERAL 101//General facilities. -#define ACCESS_CENT_LIVING 102//Living quarters. -#define ACCESS_CENT_MEDICAL 103//Medical. -#define ACCESS_CENT_SECURITY 104//Security. -#define ACCESS_CENT_STORAGE 105//Storage areas. -#define ACCESS_CENT_SHUTTLES 106//Shuttle docks. -#define ACCESS_CENT_TELECOMMS 107//Telecomms. -#define ACCESS_CENT_TELEPORTER 108//Teleporter -#define ACCESS_CENT_SPECOPS 109//Special Ops. -#define ACCESS_CENT_SPECOPS_COMMANDER 110//Special Ops Commander. -#define ACCESS_CENT_BLACKOPS 111//Black Ops. -#define ACCESS_CENT_THUNDER 112//Thunderdome. -#define ACCESS_CENT_BRIDGE 113//Bridge. -#define ACCESS_CENT_COMMANDER 114//Commander's Office/ID computer. +// MARK: CENTCOM ACCESS +#define ACCESS_CENT_GENERAL 101 //! Centcomm General facilities. +#define ACCESS_CENT_LIVING 102 //! Centcomm Living quarters. +#define ACCESS_CENT_SECURITY 104 //! Centcomm Security. +#define ACCESS_CENT_SHUTTLES 106 //! Centcomm Shuttle docks. +#define ACCESS_CENT_SPECOPS 109 //! Centcomm Special Ops. +#define ACCESS_CENT_SPECOPS_COMMANDER 110 //! Centcomm Special Ops Commander. +#define ACCESS_CENT_COMMANDER 114 //! Centcomm Commander's Office/ID computer. -//The Syndicate -#define ACCESS_SYNDICATE 150//General Syndicate Access -#define ACCESS_SYNDICATE_LEADER 151//Nuke Op Leader Access -#define ACCESS_VOX 152//Vox Access -#define ACCESS_SYNDICATE_COMMAND 153//Admin syndi officer +/// MARK: SYNDICATE ACCESS +#define ACCESS_SYNDICATE 150 //! General Syndicate Access +#define ACCESS_SYNDICATE_LEADER 151 //! Nuke Op Leader Access +#define ACCESS_VOX 152 //! Vox Access +#define ACCESS_SYNDICATE_COMMAND 153 //! Admin syndi officer -//Trade Stations -#define ACCESS_TRADE_SOL 160 - -//MONEY -#define ACCESS_CRATE_CASH 200 - -//Awaymissions -#define ACCESS_AWAY01 271 - -//Ghost roles -#define ACCESS_FREE_GOLEMS 300 -#define ACCESS_THETA_STATION 301 +/// MARK: MISC ACCESS +#define ACCESS_TRADE_SOL 160 //! Trade stations +#define ACCESS_AWAY01 271 //! Access used for moonoutpost19 ruin. +#define ACCESS_FREE_GOLEMS 300 //! Ghost role: free golems. +#define ACCESS_THETA_STATION 301 //! Ghost role: Theta station. diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 77d58911fed..8148382b446 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -68,31 +68,31 @@ if("VIP Guest") return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING) if("Custodian") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE) + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING) if("Thunderdome Overseer") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER) + return list(ACCESS_CENT_GENERAL) if("Emergency Response Team Officer") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SPECOPS) + get_all_accesses() if("Emergency Response Team Engineer") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SPECOPS) + get_all_accesses() if("Emergency Response Team Medic") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SPECOPS) + get_all_accesses() if("Emergency Response Team Inquisitor") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SPECOPS) + get_all_accesses() if("Emergency Response Team Janitor") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SPECOPS) + get_all_accesses() if("Emergency Response Team Member") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SPECOPS) + get_all_accesses() if("Emergency Response Team Leader") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER) + get_all_accesses() if("Medical Officer") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING) + get_all_accesses() if("Intel Officer") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY) + get_all_accesses() if("Research Officer") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE, ACCESS_CENT_TELECOMMS, ACCESS_CENT_TELEPORTER) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS) + get_all_accesses() if("Deathsquad Commando") - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER, ACCESS_CENT_BLACKOPS) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER) + get_all_accesses() if("NT Undercover Operative") return get_all_centcom_access() + get_all_accesses() if("Special Operations Officer") @@ -127,19 +127,18 @@ ACCESS_COURT, ACCESS_CONSTRUCTION, ACCESS_CREMATORIUM, ACCESS_JANITOR, ACCESS_ENGINE, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_FORENSICS_LOCKERS, ACCESS_GENETICS, ACCESS_EXPEDITION, ACCESS_BRIG, ACCESS_HOP, ACCESS_HOS, ACCESS_HYDROPONICS, ACCESS_CHANGE_IDS, ACCESS_KEYCARD_AUTH, ACCESS_KITCHEN, ACCESS_INTERNAL_AFFAIRS, ACCESS_LIBRARY, ACCESS_MAGISTRATE, ACCESS_MAINT_TUNNELS, ACCESS_HEADS_VAULT, ACCESS_MEDICAL, ACCESS_MIME, - ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_NETWORK, ACCESS_NTREP, ACCESS_PARAMEDIC, ACCESS_ALL_PERSONAL_LOCKERS, + ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, ACCESS_NTREP, ACCESS_PARAMEDIC, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_ENGINE_EQUIP, ACCESS_PSYCHIATRIST, ACCESS_QM, ACCESS_RD, ACCESS_RC_ANNOUNCE, ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_RESEARCH, ACCESS_SECURITY, - ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY, - ACCESS_XENOARCH) + ACCESS_SURGERY, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_THEATRE, ACCESS_TCOMSAT, ACCESS_TOX_STORAGE, ACCESS_VIROLOGY, ACCESS_WEAPONS, ACCESS_XENOBIOLOGY) /proc/get_all_centcom_access() - return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SHUTTLES, ACCESS_CENT_TELECOMMS, ACCESS_CENT_TELEPORTER, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER, ACCESS_CENT_BLACKOPS, ACCESS_CENT_THUNDER, ACCESS_CENT_BRIDGE, ACCESS_CENT_COMMANDER) + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_SHUTTLES, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER, ACCESS_CENT_COMMANDER) /proc/get_all_syndicate_access() return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND) /proc/get_all_misc_access() - return list(ACCESS_TRADE_SOL, ACCESS_CRATE_CASH, ACCESS_AWAY01) + return list(ACCESS_TRADE_SOL, ACCESS_AWAY01) /proc/get_absolutely_all_accesses() return (get_all_accesses() | get_all_centcom_access() | get_all_syndicate_access() | get_all_misc_access()) @@ -155,7 +154,7 @@ if(REGION_MEDBAY) //medbay return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_PSYCHIATRIST, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO, ACCESS_PARAMEDIC) if(REGION_RESEARCH) //research - return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK) + return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MINISAT, ACCESS_RD) if(REGION_ENGINEERING) //engineering and maintenance return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MINISAT, ACCESS_CE) if(REGION_SUPPLY) //supply @@ -231,8 +230,6 @@ return "Maintenance" if(ACCESS_EXTERNAL_AIRLOCKS) return "External Airlocks" - if(ACCESS_EMERGENCY_STORAGE) - return "Emergency Storage" if(ACCESS_CHANGE_IDS) return "ID Computer" if(ACCESS_AI_UPLOAD) @@ -285,28 +282,18 @@ return "Surgery" if(ACCESS_THEATRE) return "Theatre" - if(ACCESS_MANUFACTURING) - return "Manufacturing" if(ACCESS_RESEARCH) return "Science" if(ACCESS_MINING) return "Mining Dock" - if(ACCESS_MINING_OFFICE) - return "Mining Office" if(ACCESS_MAILSORTING) return "Mail Sorting" - if(ACCESS_MINT) - return "Mint" - if(ACCESS_MINT_VAULT) - return "Mint Vault" if(ACCESS_HEADS_VAULT) return "Main Vault" if(ACCESS_MINING_STATION) return "Mining Outpost" if(ACCESS_XENOBIOLOGY) return "Xenobiology Lab" - if(ACCESS_XENOARCH) - return "Xenoarchaeology" if(ACCESS_HOP) return "Head of Personnel" if(ACCESS_HOS) @@ -319,8 +306,6 @@ return "Keycode Auth. Device" if(ACCESS_TCOMSAT) return "Telecommunications" - if(ACCESS_NETWORK) - return "Network Access" if(ACCESS_EXPEDITION) return "Expedition" if(ACCESS_SEC_DOORS) @@ -346,28 +331,14 @@ return "General Access" if(ACCESS_CENT_LIVING) return "Living Quarters" - if(ACCESS_CENT_MEDICAL) - return "Medical" if(ACCESS_CENT_SECURITY) return "Security" - if(ACCESS_CENT_STORAGE) - return "Storage" if(ACCESS_CENT_SHUTTLES) return "Shuttles" - if(ACCESS_CENT_TELECOMMS) - return "Telecommunications" - if(ACCESS_CENT_TELEPORTER) - return "Teleporter" if(ACCESS_CENT_SPECOPS) return "Special Ops" if(ACCESS_CENT_SPECOPS_COMMANDER) return "Special Ops Commander" - if(ACCESS_CENT_BLACKOPS) - return "Black Ops" - if(ACCESS_CENT_THUNDER) - return "Thunderdome" - if(ACCESS_CENT_BRIDGE) - return "Bridge" if(ACCESS_CENT_COMMANDER) return "Commander" diff --git a/code/game/jobs/job/engineering_jobs.dm b/code/game/jobs/job/engineering_jobs.dm index 9b4741eb3b2..6fd1344e45f 100644 --- a/code/game/jobs/job/engineering_jobs.dm +++ b/code/game/jobs/job/engineering_jobs.dm @@ -11,7 +11,7 @@ req_admin_notify = 1 department_account_access = TRUE access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, - ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA, + ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EVA, ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS) minimal_player_age = 21 @@ -90,7 +90,7 @@ supervisors = "the chief engineer" department_head = list("Chief Engineer") selection_color = "#fff5cc" - access = list(ACCESS_EVA, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) + access = list(ACCESS_EVA, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) alt_titles = list("Atmospheric Technician") minimal_player_age = 7 exp_map = list(EXP_TYPE_CREW = 300) diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm index af124bccc76..bb7930af534 100644 --- a/code/game/jobs/job/medical_jobs.dm +++ b/code/game/jobs/job/medical_jobs.dm @@ -306,7 +306,6 @@ ACCESS_MINERAL_STOREROOM, ACCESS_MINING_STATION, ACCESS_MINING, - ACCESS_MINT, ACCESS_MORGUE, ACCESS_PARAMEDIC ) diff --git a/code/game/jobs/job/science_jobs.dm b/code/game/jobs/job/science_jobs.dm index 3ddf3c0e18f..1c6a788ea42 100644 --- a/code/game/jobs/job/science_jobs.dm +++ b/code/game/jobs/job/science_jobs.dm @@ -21,7 +21,6 @@ ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_MORGUE, - ACCESS_NETWORK, ACCESS_RC_ANNOUNCE, ACCESS_RD, ACCESS_RESEARCH, @@ -32,7 +31,6 @@ ACCESS_TELEPORTER, ACCESS_TOX_STORAGE, ACCESS_TOX, - ACCESS_XENOARCH, ACCESS_XENOBIOLOGY, ACCESS_WEAPONS ) @@ -83,7 +81,6 @@ ACCESS_RESEARCH, ACCESS_TOX_STORAGE, ACCESS_TOX, - ACCESS_XENOARCH, ACCESS_XENOBIOLOGY ) alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist", "Chemical Researcher") diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index d7a33b09cac..fff341611bb 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -22,7 +22,6 @@ ACCESS_MINERAL_STOREROOM, ACCESS_MINING_STATION, ACCESS_MINING, - ACCESS_MINT, ACCESS_QM, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, @@ -105,7 +104,6 @@ ACCESS_MINERAL_STOREROOM, ACCESS_MINING_STATION, ACCESS_MINING, - ACCESS_MINT, ) alt_titles = list("Spelunker") outfit = /datum/outfit/job/mining diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 4aa512b173f..6a3d980797d 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -238,44 +238,12 @@ /obj/machinery/suit_storage_unit/syndicate/secure secure = TRUE -//telecoms NASA SSU. Suits themselves are assigned in Initialize -/obj/machinery/suit_storage_unit/telecoms - mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/tank/jetpack/void - req_access = list(ACCESS_TCOMSAT) - -/obj/machinery/suit_storage_unit/telecoms/secure - secure = TRUE - /obj/machinery/suit_storage_unit/radsuit name = "radiation suit storage unit" suit_type = /obj/item/clothing/suit/radiation helmet_type = /obj/item/clothing/head/radiation storage_type = /obj/item/geiger_counter -//copied from /obj/effect/nasavoidsuitspawner -/obj/machinery/suit_storage_unit/telecoms/Initialize() - switch(pick("red", "green", "ntblue", "purple", "yellow", "ltblue")) - if("red") - helmet_type = /obj/item/clothing/head/helmet/space/nasavoid - suit_type = /obj/item/clothing/suit/space/nasavoid - if("green") - helmet_type = /obj/item/clothing/head/helmet/space/nasavoid/green - suit_type = /obj/item/clothing/suit/space/nasavoid/green - if("ntblue") - helmet_type = /obj/item/clothing/head/helmet/space/nasavoid/ntblue - suit_type = /obj/item/clothing/suit/space/nasavoid/ntblue - if("purple") - helmet_type = /obj/item/clothing/head/helmet/space/nasavoid/purple - suit_type = /obj/item/clothing/suit/space/nasavoid/purple - if("yellow") - helmet_type = /obj/item/clothing/head/helmet/space/nasavoid/yellow - suit_type = /obj/item/clothing/suit/space/nasavoid/yellow - if("ltblue") - helmet_type = /obj/item/clothing/head/helmet/space/nasavoid/ltblue - suit_type = /obj/item/clothing/suit/space/nasavoid/ltblue - ..() - /obj/machinery/suit_storage_unit/Initialize() . = ..() diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index c6c84d2f11a..550be956d60 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -823,7 +823,7 @@ name = "Research ID" registered_name = "Scientist" icon_state = "research" - access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MINERAL_STOREROOM) /obj/item/card/id/roboticist name = "Roboticist ID" @@ -835,19 +835,19 @@ name = "Supply ID" registered_name = "Cargonian" icon_state = "cargo" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) /obj/item/card/id/quartermaster name = "Quartermaster ID" registered_name = "Quartermaster" icon_state = "quartermaster" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) /obj/item/card/id/shaftminer name = "Shaftminer ID" registered_name = "Shaftminer" icon_state = "shaftminer" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) /obj/item/card/id/engineering name = "Engineering ID" @@ -901,14 +901,14 @@ access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, - ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_EXPEDITION, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM) + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_EXPEDITION, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM) /obj/item/card/id/ce name = "Chief Engineer ID" registered_name = "CE" icon_state = "CE" access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, - ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA, + ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EVA, ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM) diff --git a/tools/maplint/lints/any_all_access_collisions.yml b/tools/maplint/lints/any_all_access_collisions.yml new file mode 100644 index 00000000000..b28c1852898 --- /dev/null +++ b/tools/maplint/lints/any_all_access_collisions.yml @@ -0,0 +1,4 @@ +help: "/any and /all access helper types cannot be combined." +/obj/effect/mapping_helpers/airlock/access/any: + banned_neighbors: + - /obj/effect/mapping_helpers/airlock/access/all