From e1627a12e224deda115f8e55709041057362ccc7 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:59:53 +0200 Subject: [PATCH] Role Access List Rename (#22231) renames the basic role access list to "job_access" to make its purpose clearer and removes the unused expanded access list since we only use the former. it should also help prevent confusion when adding access to roles. server config should be updated. --- code/controllers/configuration.dm | 4 -- code/game/jobs/job/captain.dm | 18 ++------- code/game/jobs/job/civilian.dm | 37 +++++-------------- code/game/jobs/job/engineering.dm | 25 +++---------- code/game/jobs/job/event.dm | 17 +++------ code/game/jobs/job/hra.dm | 8 +--- code/game/jobs/job/job.dm | 12 ++---- code/game/jobs/job/medical.dm | 32 ++++++---------- code/game/jobs/job/outsider/merchant.dm | 3 +- code/game/jobs/job/outsider/representative.dm | 18 +++------ code/game/jobs/job/science.dm | 24 ++++-------- code/game/jobs/job/security.dm | 26 +++---------- code/game/jobs/job/ship_crew.dm | 13 +++---- code/modules/admin/verbs/bluespacetech.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- config/example/config.txt | 3 -- config/ut/config-db.txt | 3 -- config/ut/config-nodb.txt | 3 -- .../SleepyGemmy-access_lists_names.yml | 6 +++ 19 files changed, 73 insertions(+), 183 deletions(-) create mode 100644 html/changelogs/SleepyGemmy-access_lists_names.yml diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 07baf8b089d..e6e5d8592e7 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -228,7 +228,6 @@ GLOBAL_LIST_EMPTY(gamemode_cache) var/load_jobs_from_txt = 0 var/automute_on = 0 //enables automuting/spam prevention var/macro_trigger = 5 // The grace period between messages before it's counted as abusing a macro. - var/jobs_have_minimal_access = 0 //determines whether jobs use minimal access or expanded access. var/override_map var/cult_ghostwriter = 1 //Allows ghosts to write in blood in cult rounds... @@ -550,9 +549,6 @@ GENERAL_PROTECT_DATUM(/datum/configuration) if ("load_age_restrictions_from_file") GLOB.config.age_restrictions_from_file = 1 - if ("jobs_have_minimal_access") - GLOB.config.jobs_have_minimal_access = 1 - if ("use_spreading_explosions") GLOB.config.use_spreading_explosions = 1 diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index cfd4a63dc0b..d21daeb92d0 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -11,8 +11,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca intro_prefix = "the" supervisors = "company officials and Corporate Regulations" selection_color = "#114dc1" - access = list() //See get_access() - minimal_access = list() //See get_access() + job_access = list() //See get_access() minimal_player_age = 14 economic_modifier = 20 @@ -102,14 +101,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca outfit = /obj/outfit/job/xo - access = list( - ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_CREMATORIUM, ACCESS_GALLEY, ACCESS_HYDROPONICS, ACCESS_CHAPEL_OFFICE, - ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_JANITOR, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, - ACCESS_WEAPONS, ACCESS_JOURNALIST, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, ACCESS_TELEPORTER - ) - - minimal_access = list( + job_access = list( ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_SHIP_WEAPONS, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_CREMATORIUM, ACCESS_GALLEY, ACCESS_HYDROPONICS, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_JANITOR, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, @@ -169,11 +161,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca outfit = /obj/outfit/job/bridge_crew - access = list( - ACCESS_EVA, ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, - ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS - ) - minimal_access = list( + job_access = list( ACCESS_HEADS, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS ) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index d335cf29a97..a3c8dd7eea2 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -15,8 +15,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_GALLEY) - minimal_access = list(ACCESS_BAR) + job_access = list(ACCESS_BAR) alt_titles = list("Barista") outfit = /obj/outfit/job/bartender blacklisted_species = list(SPECIES_VAURCA_BREEDER) @@ -62,8 +61,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_GALLEY) - minimal_access = list(ACCESS_GALLEY) + job_access = list(ACCESS_GALLEY) alt_titles = list("Cook") outfit = /obj/outfit/job/chef blacklisted_species = list(SPECIES_VAURCA_BREEDER) @@ -113,8 +111,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_GALLEY) - minimal_access = list(ACCESS_HYDROPONICS) + job_access = list(ACCESS_HYDROPONICS) outfit = /obj/outfit/job/hydro blacklisted_species = list(SPECIES_VAURCA_BREEDER) alt_titles = list("Hydroponicist") @@ -166,8 +163,7 @@ spawn_positions = 2 supervisors = "the executive officer" selection_color = "#90524b" - access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_MEDICAL) - minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_MEDICAL) + job_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_MEDICAL) outfit = /obj/outfit/job/janitor blacklisted_species = list(SPECIES_VAURCA_BREEDER) @@ -205,8 +201,7 @@ spawn_positions = 1 supervisors = "the executive officer" selection_color = "#90524b" - access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_LIBRARY) + job_access = list(ACCESS_LIBRARY) alt_titles = list("Curator", "Tech Support") alt_outfits = list("Curator" = /obj/outfit/job/librarian/curator, "Tech Support" = /obj/outfit/job/librarian/tech_support) title_accesses = list("Tech Support" = list(ACCESS_IT, ACCESS_TECH_STORAGE)) @@ -274,8 +269,7 @@ spawn_positions = 1 supervisors = "the executive officer" selection_color = "#90524b" - access = list(ACCESS_CHAPEL_OFFICE, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_CHAPEL_OFFICE) + job_access = list(ACCESS_CHAPEL_OFFICE) alt_titles = list("Presbyter", "Rabbi", "Imam", "Priest", "Priestess", "Shaman", "Counselor", "Keeper", "Shaper", "Sleepwalker") outfit = /obj/outfit/job/chaplain @@ -353,9 +347,7 @@ SPECIES_SKRELL_AXIORI = 70 ) - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_HEADS, - ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_ROBOTICS, ACCESS_ENGINE, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_INTREPID) - minimal_access = list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_SHIP_WEAPONS, ACCESS_MINING_STATION, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_HEADS, + job_access = list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_SHIP_WEAPONS, ACCESS_MINING_STATION, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_HEADS, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_ROBOTICS, ACCESS_ENGINE, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_INTREPID) outfit = /obj/outfit/job/operations_manager @@ -408,10 +400,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list( - ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_SHIP_WEAPONS, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION - ) - minimal_access = list( + job_access = list( ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_MAILSORTING ) outfit = /obj/outfit/job/hangar_tech @@ -461,10 +450,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list( - ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_SPARK - ) - minimal_access = list( + job_access = list( ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_SPARK ) outfit = /obj/outfit/job/mining @@ -522,10 +508,7 @@ SPECIES_SKRELL_AXIORI = 55 ) - access = list( - ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MAILSORTING - ) - minimal_access = list( + job_access = list( ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MAILSORTING ) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index bcd01bc1322..e66b357d5db 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -17,14 +17,7 @@ SPECIES_SKRELL_AXIORI = 80 ) - 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_LEVIATHAN, ACCESS_SHIP_WEAPONS, ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, ACCESS_RESEARCH, - ACCESS_MEDICAL, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_AI_UPLOAD, ACCESS_IT, - ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, ACCESS_NETWORK - ) - - minimal_access = list( + job_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_LEVIATHAN, ACCESS_SHIP_WEAPONS, ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_AI_UPLOAD, ACCESS_IT, @@ -101,10 +94,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list( - ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN - ) - minimal_access = list( + job_access = list( ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_LEVIATHAN ) outfit = /obj/outfit/job/engineer @@ -183,10 +173,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list( - ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN - ) - minimal_access = list( + job_access = list( ACCESS_EVA, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN ) outfit = /obj/outfit/job/atmos @@ -257,10 +244,8 @@ intro_prefix = "an" supervisors = "the Chief Engineer" selection_color = "#c67519" - access = list( - ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE - ) - minimal_access = list( + + job_access = list( ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE ) outfit = /obj/outfit/job/intern_eng diff --git a/code/game/jobs/job/event.dm b/code/game/jobs/job/event.dm index 3b4d92e5240..a3ac5b6bde9 100644 --- a/code/game/jobs/job/event.dm +++ b/code/game/jobs/job/event.dm @@ -17,8 +17,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) - minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) + job_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) minimal_player_age = 7 outfit = /obj/outfit/job/officer/event @@ -58,8 +57,7 @@ SPECIES_SKRELL_AXIORI = 55 ) - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) + job_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) outfit = /obj/outfit/job/med_tech/event blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) @@ -102,8 +100,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN) - minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_LEVIATHAN) + job_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_LEVIATHAN) outfit = /obj/outfit/job/engineer/event blacklisted_species = list(SPECIES_VAURCA_BREEDER) @@ -151,8 +148,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID) - minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID) + job_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID) minimal_player_age = 14 outfit = /obj/outfit/job/scientist/event @@ -185,8 +181,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_SHIP_WEAPONS, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_ROBOTICS) - minimal_access = list(ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_MAILSORTING) + job_access = list(ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_MAILSORTING) outfit = /obj/outfit/job/hangar_tech/event blacklisted_species = list(SPECIES_VAURCA_BREEDER) @@ -216,5 +211,5 @@ SPECIES_SKRELL = 50, SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_GALLEY) + job_access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_GALLEY) outfit = /obj/outfit/job/bartender diff --git a/code/game/jobs/job/hra.dm b/code/game/jobs/job/hra.dm index 3092c20d108..e550b7b340b 100644 --- a/code/game/jobs/job/hra.dm +++ b/code/game/jobs/job/hra.dm @@ -12,13 +12,7 @@ selection_color = "#c9ad12" - access = list( - ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_EVA, ACCESS_HEADS, ACCESS_MAINT_TUNNELS, - ACCESS_CONSTRUCTION, ACCESS_RESEARCH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, - ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, ACCESS_CENT_CCIA - ) - - minimal_access = list( + job_access = list( ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_EVA, ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_RESEARCH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, ACCESS_CENT_CCIA diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 4a75cb46a2a..e0e21a58ee6 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -2,11 +2,8 @@ /// The name of the job. var/title = "NOPE" - /// Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access - /// Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) - var/list/minimal_access = list() - /// Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) - var/list/access = list() + /// Job access. + var/list/job_access = list() /// Bitflags for the job. var/flag = 0 @@ -197,10 +194,7 @@ /datum/job/proc/get_access(selected_title) SHOULD_NOT_SLEEP(TRUE) - if(!GLOB.config || GLOB.config.jobs_have_minimal_access) - . = minimal_access.Copy() - else - . = access.Copy() + . = job_access.Copy() if (LAZYLEN(title_accesses) && title_accesses[selected_title]) . += title_accesses[selected_title] diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index a597d14d799..96dd997dced 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -17,13 +17,7 @@ SPECIES_SKRELL_AXIORI = 80 ) - access = list( - ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS, - ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_CONSTRUCTION, - ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, - ACCESS_PARAMEDIC, ACCESS_MAINT_TUNNELS, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, ACCESS_TELEPORTER - ) - minimal_access = list( + job_access = list( ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_CONSTRUCTION, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, @@ -79,8 +73,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA) + job_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA) outfit = /obj/outfit/job/doctor blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) skill_requirements = alist( @@ -106,8 +99,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA) + job_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA) outfit = /obj/outfit/job/doctor/surgeon blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) skill_requirements = alist( @@ -174,8 +166,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PHARMACY, ACCESS_VIROLOGY) + job_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PHARMACY, ACCESS_VIROLOGY) outfit = /obj/outfit/job/pharmacist blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) @@ -215,6 +206,8 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the chief medical officer" + selection_color = "#15903a" economic_modifier = 5 minimum_character_age = list( @@ -223,10 +216,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - supervisors = "the chief medical officer" - selection_color = "#15903a" - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_PSYCHIATRIST) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PSYCHIATRIST) + job_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PSYCHIATRIST) alt_titles = list("Psychologist") outfit = /obj/outfit/job/psychiatrist alt_outfits = list("Psychologist" = /obj/outfit/job/psychiatrist/psycho) @@ -283,8 +273,7 @@ SPECIES_SKRELL_AXIORI = 55 ) - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) + job_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) outfit = /obj/outfit/job/med_tech blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) @@ -358,13 +347,14 @@ spawn_positions = 2 supervisors = "the Chief Medical Officer" selection_color = "#15903a" - access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP) + minimum_character_age = list( SPECIES_HUMAN = 18, SPECIES_SKRELL = 50, SPECIES_SKRELL_AXIORI = 50 ) + + job_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP) outfit = /obj/outfit/job/intern_med blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) skill_requirements = alist( diff --git a/code/game/jobs/job/outsider/merchant.dm b/code/game/jobs/job/outsider/merchant.dm index 4bd82d1fb11..00606e6489c 100644 --- a/code/game/jobs/job/outsider/merchant.dm +++ b/code/game/jobs/job/outsider/merchant.dm @@ -16,8 +16,7 @@ selection_color = "#c9ad12" - access = list(ACCESS_MERCHANT) - minimal_access = list(ACCESS_MERCHANT) + job_access = list(ACCESS_MERCHANT) latejoin_at_spawnpoints = TRUE diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index ee7f5a3afce..f628f137978 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -15,8 +15,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) + job_access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) alt_titles = list("Freelance Journalist") alt_factions = list( "Corporate Reporter" = list("NanoTrasen", "Idris Incorporated", "Hephaestus Industries", "Orion Express", "Zavodskoi Interstellar", "Zeng-Hu Pharmaceuticals", "Private Military Contracting Group", "Stellar Corporate Conglomerate"), @@ -88,8 +87,7 @@ SPECIES_SKRELL_AXIORI = 80 ) - access = list(ACCESS_LAWYER, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_LAWYER) + job_access = list(ACCESS_LAWYER) alt_titles = list( "Workplace Liaison", "Corporate Representative", @@ -218,8 +216,7 @@ SPECIES_SKRELL_AXIORI = 150 ) - access = list(ACCESS_CONSULAR, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_CONSULAR) + job_access = list(ACCESS_CONSULAR) outfit = /obj/outfit/job/representative/consular blacklisted_species = list(SPECIES_VAURCA_BULWARK) blacklisted_citizenship = list(CITIZENSHIP_ERIDANI, CITIZENSHIP_ELYRA_NCP, CITIZENSHIP_NONE, CITIZENSHIP_FREE_COUNCIL) @@ -327,8 +324,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_CONSULAR, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_CONSULAR) + job_access = list(ACCESS_CONSULAR) outfit = /obj/outfit/job/diplomatic_aide blacklisted_citizenship = ALL_CITIZENSHIPS //removed based on consular citizensihp @@ -374,8 +370,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_CONSULAR, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_CONSULAR) + job_access = list(ACCESS_CONSULAR) outfit = /obj/outfit/job/diplomatic_bodyguard blacklisted_citizenship = ALL_CITIZENSHIPS //removed based on consular citizensihp @@ -421,8 +416,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list(ACCESS_LAWYER, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_LAWYER) + job_access = list(ACCESS_LAWYER) outfit = /obj/outfit/job/corporate_aide /obj/outfit/job/corporate_aide diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index c1ab36f9bc5..38c8fea5475 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -17,13 +17,7 @@ SPECIES_SKRELL_AXIORI = 80 ) - access = list( - ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TOX_STORAGE, - ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_CONSTRUCTION, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_RESEARCH, - ACCESS_XENOBIOLOGY, ACCESS_XENOBOTANY, ACCESS_AI_UPLOAD, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, - ACCESS_XENOARCH, ACCESS_NETWORK, ACCESS_MAINT_TUNNELS, ACCESS_IT, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY - ) - minimal_access = list( + job_access = list( ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_CONSTRUCTION, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOBOTANY, ACCESS_AI_UPLOAD, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, @@ -77,8 +71,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) - minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) + job_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) minimal_player_age = 14 outfit = /obj/outfit/job/scientist @@ -132,8 +125,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOARCH, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) - minimal_access = list(ACCESS_RESEARCH, ACCESS_XENOARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) + job_access = list(ACCESS_RESEARCH, ACCESS_XENOARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) minimal_player_age = 14 outfit = /obj/outfit/job/scientist/xenoarchaeologist @@ -185,8 +177,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) - minimal_access = list(ACCESS_TOX, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_TOX_STORAGE, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) + job_access = list(ACCESS_TOX, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_TOX_STORAGE, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) minimal_player_age = 14 @@ -223,8 +214,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBOTANY, ACCESS_TOX, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) - minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBOTANY, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) + job_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBOTANY, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY) minimal_player_age = 14 @@ -255,8 +245,8 @@ spawn_positions = 3 supervisors = "the Research Director" selection_color = "#a44799" - access = list(ACCESS_RESEARCH, ACCESS_TOX) - minimal_access = list(ACCESS_RESEARCH, ACCESS_TOX) + + job_access = list(ACCESS_RESEARCH, ACCESS_TOX) outfit = /obj/outfit/job/intern_sci blacklisted_species = list(SPECIES_VAURCA_BREEDER) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 7f519c9967f..8e463e096d7 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -17,14 +17,7 @@ SPECIES_SKRELL_AXIORI = 80 ) - access = list( - ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, - ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_MINING, - ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, - ACCESS_GATEWAY, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, ACCESS_TELEPORTER - ) - - minimal_access = list( + job_access = list( ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, @@ -94,8 +87,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) - minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) + job_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) minimal_player_age = 7 outfit = /obj/outfit/job/warden @@ -155,10 +147,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list( - ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS - ) - minimal_access = list( + job_access = list( ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_WEAPONS ) minimal_player_age = 3 @@ -216,10 +205,7 @@ SPECIES_SKRELL_AXIORI = 50 ) - access = list( - ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS - ) - minimal_access = list( + job_access = list( ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS ) minimal_player_age = 7 @@ -283,8 +269,8 @@ spawn_positions = 2 supervisors = "the Head of Security" selection_color = "#991818" - access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS) + + job_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS) outfit = /obj/outfit/job/intern_sec/officer minimum_character_age = list( SPECIES_HUMAN = 18, diff --git a/code/game/jobs/job/ship_crew.dm b/code/game/jobs/job/ship_crew.dm index 60b592644a0..66f22b44782 100644 --- a/code/game/jobs/job/ship_crew.dm +++ b/code/game/jobs/job/ship_crew.dm @@ -10,8 +10,8 @@ supervisors = "absolutely everyone" selection_color = "#949494" economic_modifier = 1 - access = list() //See /datum/job/assistant/get_access() - minimal_access = list() //See /datum/job/assistant/get_access() + + job_access = list() //See /datum/job/assistant/get_access() outfit = /obj/outfit/job/assistant blacklisted_species = list(SPECIES_VAURCA_BREEDER) alt_ages = list( @@ -37,7 +37,6 @@ "Wait Staff" = list("NanoTrasen", "Idris Incorporated", "Orion Express") ) - /datum/job/assistant/get_access(selected_title) var/list/out_list = list() @@ -118,8 +117,8 @@ supervisors = "any authority figure" selection_color = "#949494" economic_modifier = 1 - access = list() - minimal_access = list() + + job_access = list() outfit = /obj/outfit/job/visitor blacklisted_species = list(SPECIES_VAURCA_BREEDER) @@ -145,7 +144,7 @@ supervisors = "any authority figure" selection_color = "#949494" economic_modifier = 1 - access = list() - minimal_access = list() + + job_access = list() outfit = /obj/outfit/job/visitor/passenger blacklisted_species = list(SPECIES_VAURCA_BREEDER) diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm index dec43958216..d7a32100f5a 100644 --- a/code/modules/admin/verbs/bluespacetech.dm +++ b/code/modules/admin/verbs/bluespacetech.dm @@ -511,7 +511,7 @@ possible_access["== Default BSTech =="] = get_all_accesses() + get_all_centcom_access() + get_all_syndicate_access() for(var/job in subtypesof(/datum/job)) var/datum/job/J = new job - possible_access[J.title] = J.access + possible_access[J.title] = J.job_access var/chosen_access = input(usr, "Which access do you want your ID to have?", "ID Access") as null|anything in possible_access if(!chosen_access) return diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a0ec9892664..ee24770d5e3 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -217,7 +217,7 @@ for(var/job_type in module.specialized_access_types) var/datum/job/job = new job_type() - id_card.access |= job.access + id_card.access |= job.job_access to_chat(src, SPAN_NOTICE("Access set to the department the role belongs to.")) diff --git a/config/example/config.txt b/config/example/config.txt index 2ffa8c9ec3b..0824bb673a6 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -19,9 +19,6 @@ ADMIN_LEGACY_SYSTEM ## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system. BAN_LEGACY_SYSTEM -## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. -JOBS_HAVE_MINIMAL_ACCESS - ## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing ## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job. ## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up. diff --git a/config/ut/config-db.txt b/config/ut/config-db.txt index 5dd2f2e81c4..15fff167363 100644 --- a/config/ut/config-db.txt +++ b/config/ut/config-db.txt @@ -16,9 +16,6 @@ ADMIN_LEGACY_SYSTEM ## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system. BAN_LEGACY_SYSTEM -## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. -JOBS_HAVE_MINIMAL_ACCESS - ## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing ## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job. ## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up. diff --git a/config/ut/config-nodb.txt b/config/ut/config-nodb.txt index a5e3df3e449..9dd817b7343 100644 --- a/config/ut/config-nodb.txt +++ b/config/ut/config-nodb.txt @@ -16,9 +16,6 @@ ADMIN_LEGACY_SYSTEM ## Add a # infront of this if you want to use the SQL based banning system. The legacy systems use the files in the data folder. You need to set up your database to use the SQL based system. BAN_LEGACY_SYSTEM -## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. -JOBS_HAVE_MINIMAL_ACCESS - ## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing ## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job. ## REQUIRES the database set up to work. Keep it hashed if you don't have a database set up. diff --git a/html/changelogs/SleepyGemmy-access_lists_names.yml b/html/changelogs/SleepyGemmy-access_lists_names.yml new file mode 100644 index 00000000000..4fdd8162859 --- /dev/null +++ b/html/changelogs/SleepyGemmy-access_lists_names.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - config: "Renamed the basic role access list and removed the unused expanded role access list."