diff --git a/code/controllers/configuration/entries/game.dm b/code/controllers/configuration/entries/game.dm index c8c8e470704..549ab14ca68 100644 --- a/code/controllers/configuration/entries/game.dm +++ b/code/controllers/configuration/entries/game.dm @@ -78,3 +78,6 @@ /datum/config_entry/flag/emojis default = TRUE + +/datum/config_entry/flag/almost_everyone_has_maintenance_access + default = TRUE diff --git a/code/modules/jobs/job.dm b/code/modules/jobs/job.dm index d610599d869..ae99a808d2a 100644 --- a/code/modules/jobs/job.dm +++ b/code/modules/jobs/job.dm @@ -364,7 +364,9 @@ . = outfit.equip_base(H, title, alt_title) /datum/role/job/proc/get_access() - return minimal_access | (config_legacy.jobs_have_minimal_access? list() : additional_access) + . = minimal_access | (config_legacy.jobs_have_minimal_access? list() : additional_access) + if(faction == JOB_FACTION_STATION && CONFIG_GET(flag/almost_everyone_has_maintenance_access)) + . |= ACCESS_ENGINEERING_MAINT // If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/role/job/proc/player_old_enough(client/C) diff --git a/code/modules/jobs/job_types/station/civillian/chaplain.dm b/code/modules/jobs/job_types/station/civillian/chaplain.dm index 038fe39fc06..02a6c0d11f8 100644 --- a/code/modules/jobs/job_types/station/civillian/chaplain.dm +++ b/code/modules/jobs/job_types/station/civillian/chaplain.dm @@ -9,8 +9,13 @@ supervisors = "the Head of Personnel" selection_color = "#515151" idtype = /obj/item/card/id/civilian/chaplain - additional_access = list(ACCESS_MEDICAL_MORGUE, ACCESS_GENERAL_CHAPEL, ACCESS_GENERAL_CREMATOR, ACCESS_ENGINEERING_MAINT) - minimal_access = list(ACCESS_GENERAL_CHAPEL, ACCESS_GENERAL_CREMATOR) + additional_access = list( + ACCESS_MEDICAL_MORGUE, + ) + minimal_access = list( + ACCESS_GENERAL_CHAPEL, + ACCESS_GENERAL_CREMATOR, + ) outfit_type = /datum/outfit/job/station/chaplain desc = "The Chaplain ministers to the spiritual needs of the crew." diff --git a/code/modules/jobs/job_types/station/civillian/clown.dm b/code/modules/jobs/job_types/station/civillian/clown.dm index b6c72c82061..6bac381f117 100644 --- a/code/modules/jobs/job_types/station/civillian/clown.dm +++ b/code/modules/jobs/job_types/station/civillian/clown.dm @@ -8,8 +8,11 @@ spawn_positions = 1 supervisors = "the spirit of laughter" selection_color = "#515151" - additional_access = list(ACCESS_GENERAL_ENTERTAINMENT) - minimal_access = list(ACCESS_GENERAL_ENTERTAINMENT) + minimal_access = list( + ACCESS_GENERAL_ENTERTAINMENT, + ACCESS_GENERAL_CLOWN, + ACCESS_GENERAL_TOMFOOLERY, + ) desc = "A Clown is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!" whitelist_only = 1 outfit_type = /datum/outfit/job/station/clown @@ -22,12 +25,6 @@ /datum/prototype/struct/alt_title/clown/fool title = "Fool" -/datum/role/job/station/clown/get_access() - if(config_legacy.assistant_maint) - return list(ACCESS_ENGINEERING_MAINT, ACCESS_GENERAL_ENTERTAINMENT, ACCESS_GENERAL_CLOWN, ACCESS_GENERAL_TOMFOOLERY) - else - return list(ACCESS_GENERAL_ENTERTAINMENT, ACCESS_GENERAL_CLOWN, ACCESS_GENERAL_TOMFOOLERY) - /datum/outfit/job/station/clown name = OUTFIT_JOB_NAME("Clown") shoes = /obj/item/clothing/shoes/clown_shoes diff --git a/code/modules/jobs/job_types/station/civillian/entertainer.dm b/code/modules/jobs/job_types/station/civillian/entertainer.dm index c3f14f53bc0..31bdfded7ca 100644 --- a/code/modules/jobs/job_types/station/civillian/entertainer.dm +++ b/code/modules/jobs/job_types/station/civillian/entertainer.dm @@ -8,8 +8,9 @@ spawn_positions = 4 supervisors = "the Head of Personnel" selection_color = "#515151" - additional_access = list(ACCESS_GENERAL_ENTERTAINMENT) - minimal_access = list(ACCESS_GENERAL_ENTERTAINMENT) + minimal_access = list( + ACCESS_GENERAL_ENTERTAINMENT, + ) pto_type = PTO_CIVILIAN outfit_type = /datum/outfit/job/station/assistant diff --git a/code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm b/code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm index 9a898210fbb..ab803250571 100644 --- a/code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm +++ b/code/modules/jobs/job_types/station/civillian/internals_affairs_agent.dm @@ -9,8 +9,11 @@ supervisors = "company officials and Corporate Regulations" selection_color = "#515151" idtype = /obj/item/card/id/civilian/internal_affairs_agent - additional_access = list(ACCESS_COMMAND_IAA, ACCESS_SECURITY_MAIN, ACCESS_ENGINEERING_MAINT, ACCESS_COMMAND_BRIDGE) - minimal_access = list(ACCESS_COMMAND_IAA, ACCESS_SECURITY_MAIN, ACCESS_COMMAND_BRIDGE) + minimal_access = list( + ACCESS_COMMAND_IAA, + ACCESS_SECURITY_MAIN, + ACCESS_COMMAND_BRIDGE, + ) minimal_player_age = 7 outfit_type = /datum/outfit/job/station/internal_affairs_agent diff --git a/code/modules/jobs/job_types/station/civillian/librarian.dm b/code/modules/jobs/job_types/station/civillian/librarian.dm index 447edba9d44..f9ece96690a 100644 --- a/code/modules/jobs/job_types/station/civillian/librarian.dm +++ b/code/modules/jobs/job_types/station/civillian/librarian.dm @@ -10,8 +10,9 @@ supervisors = "the Head of Personnel" selection_color = "#515151" idtype = /obj/item/card/id/civilian/librarian - additional_access = list(ACCESS_GENERAL_LIBRARY, ACCESS_ENGINEERING_MAINT) - minimal_access = list(ACCESS_GENERAL_LIBRARY) + minimal_access = list( + ACCESS_GENERAL_LIBRARY, + ) outfit_type = /datum/outfit/job/station/librarian desc = "The Librarian curates the book selection in the Library, so the crew might enjoy it." diff --git a/code/modules/jobs/job_types/station/civillian/mime.dm b/code/modules/jobs/job_types/station/civillian/mime.dm index 4532a1647d3..f49c9bb4d3c 100644 --- a/code/modules/jobs/job_types/station/civillian/mime.dm +++ b/code/modules/jobs/job_types/station/civillian/mime.dm @@ -8,8 +8,11 @@ spawn_positions = 1 supervisors = "the spirit of performance" selection_color = "#515151" - additional_access = list(ACCESS_GENERAL_ENTERTAINMENT) - minimal_access = list(ACCESS_GENERAL_ENTERTAINMENT) + minimal_access = list( + ACCESS_GENERAL_ENTERTAINMENT, + ACCESS_GENERAL_CLOWN, + ACCESS_GENERAL_MIME, + ) desc = "A Mime is there to entertain the crew and keep high morale using unbelievable performances and acting skills!" alt_titles = list("Poseur" = /datum/prototype/struct/alt_title/mime/poseur) whitelist_only = 1 @@ -19,12 +22,6 @@ /datum/prototype/struct/alt_title/mime/poseur title = "Poseur" -/datum/role/job/station/mime/get_access() - if(config_legacy.assistant_maint) - return list(ACCESS_ENGINEERING_MAINT, ACCESS_GENERAL_ENTERTAINMENT, ACCESS_GENERAL_TOMFOOLERY, ACCESS_GENERAL_MIME) - else - return list(ACCESS_GENERAL_ENTERTAINMENT, ACCESS_GENERAL_TOMFOOLERY, ACCESS_GENERAL_MIME) - /datum/outfit/job/station/mime name = OUTFIT_JOB_NAME("Mime") shoes = /obj/item/clothing/shoes/mime diff --git a/code/modules/jobs/job_types/station/civillian/pilot.dm b/code/modules/jobs/job_types/station/civillian/pilot.dm index d765af62a38..9078f980668 100644 --- a/code/modules/jobs/job_types/station/civillian/pilot.dm +++ b/code/modules/jobs/job_types/station/civillian/pilot.dm @@ -12,8 +12,10 @@ selection_color = "#515151" minimal_player_age = 3 pto_type = PTO_EXPLORATION - additional_access = list(ACCESS_GENERAL_PILOT, ACCESS_ENGINEERING_AIRLOCK) - minimal_access = list(ACCESS_GENERAL_PILOT, ACCESS_ENGINEERING_AIRLOCK) + minimal_access = list( + ACCESS_GENERAL_PILOT, + ACCESS_ENGINEERING_AIRLOCK, + ) outfit_type = /datum/outfit/job/station/pilot desc = "A Pilot flies the various shuttles in the Virgo-Erigone System." alt_titles = list( diff --git a/code/modules/jobs/job_types/station/command/command_secretary.dm b/code/modules/jobs/job_types/station/command/command_secretary.dm index d23724875ab..f3a61ded4ce 100644 --- a/code/modules/jobs/job_types/station/command/command_secretary.dm +++ b/code/modules/jobs/job_types/station/command/command_secretary.dm @@ -14,8 +14,11 @@ selection_color = "#1D1D4F" minimal_player_age = 5 - additional_access = list(ACCESS_COMMAND_BRIDGE, ACCESS_COMMAND_KEYAUTH) - minimal_access = list(ACCESS_COMMAND_BRIDGE, ACCESS_COMMAND_KEYAUTH) + minimal_access = list( + ACCESS_COMMAND_BRIDGE, + ACCESS_COMMAND_KEYAUTH, + ACCESS_ENGINEERING_MAINT, + ) outfit_type = /datum/outfit/job/station/command_secretary desc = "A Command Secretary handles paperwork duty for the Heads of Staff, so they can better focus on managing their departments. \ diff --git a/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm b/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm index b73a8571429..c0a70735458 100644 --- a/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm +++ b/code/modules/jobs/job_types/station/engineering/atmospherics_technician.dm @@ -11,8 +11,19 @@ idtype = /obj/item/card/id/engineering/atmos pto_type = PTO_ENGINEERING - additional_access = list(ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAIN, ACCESS_ENGINEERING_ENGINE, ACCESS_ENGINEERING_TECHSTORAGE, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_ENGINEERING_CONSTRUCTION, ACCESS_ENGINEERING_ATMOS, ACCESS_ENGINEERING_AIRLOCK) - minimal_access = list(ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAIN, ACCESS_ENGINEERING_ATMOS, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_TRIAGE, ACCESS_ENGINEERING_CONSTRUCTION, ACCESS_ENGINEERING_AIRLOCK) + additional_access = list( + ACCESS_ENGINEERING_ENGINE, + ACCESS_ENGINEERING_TECHSTORAGE, + ) + minimal_access = list( + ACCESS_COMMAND_EVA, + ACCESS_ENGINEERING_MAIN, + ACCESS_ENGINEERING_ATMOS, + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_TRIAGE, + ACCESS_ENGINEERING_CONSTRUCTION, + ACCESS_ENGINEERING_AIRLOCK, + ) minimal_player_age = 3 diff --git a/code/modules/jobs/job_types/station/engineering/senior_engineer.dm b/code/modules/jobs/job_types/station/engineering/senior_engineer.dm index 6da5549b4ff..8bb275e78fe 100644 --- a/code/modules/jobs/job_types/station/engineering/senior_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/senior_engineer.dm @@ -12,8 +12,16 @@ idtype = /obj/item/card/id/engineering/engineer pto_type = PTO_ENGINEERING - additional_access = list(ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAIN, ACCESS_ENGINEERING_ENGINE, ACCESS_ENGINEERING_TECHSTORAGE, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_ENGINEERING_CONSTRUCTION, ACCESS_ENGINEERING_ATMOS) - minimal_access = list(ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAIN, ACCESS_ENGINEERING_ENGINE, ACCESS_ENGINEERING_TECHSTORAGE, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_ENGINEERING_CONSTRUCTION) + minimal_access = list( + ACCESS_COMMAND_EVA, + ACCESS_ENGINEERING_ATMOS, + ACCESS_ENGINEERING_MAIN, + ACCESS_ENGINEERING_ENGINE, + ACCESS_ENGINEERING_TECHSTORAGE, + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_AIRLOCK, + ACCESS_ENGINEERING_CONSTRUCTION, + ) minimal_player_age = 14 diff --git a/code/modules/jobs/job_types/station/engineering/station_engineer.dm b/code/modules/jobs/job_types/station/engineering/station_engineer.dm index 74dec418205..0b245b654ce 100644 --- a/code/modules/jobs/job_types/station/engineering/station_engineer.dm +++ b/code/modules/jobs/job_types/station/engineering/station_engineer.dm @@ -11,8 +11,18 @@ idtype = /obj/item/card/id/engineering/engineer pto_type = PTO_ENGINEERING - additional_access = list(ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAIN, ACCESS_ENGINEERING_ENGINE, ACCESS_ENGINEERING_TECHSTORAGE, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_ENGINEERING_CONSTRUCTION, ACCESS_ENGINEERING_ATMOS) - minimal_access = list(ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAIN, ACCESS_ENGINEERING_ENGINE, ACCESS_ENGINEERING_TECHSTORAGE, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_ENGINEERING_CONSTRUCTION) + additional_access = list( + ACCESS_ENGINEERING_ATMOS, + ) + minimal_access = list( + ACCESS_COMMAND_EVA, + ACCESS_ENGINEERING_MAIN, + ACCESS_ENGINEERING_ENGINE, + ACCESS_ENGINEERING_TECHSTORAGE, + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_AIRLOCK, + ACCESS_ENGINEERING_CONSTRUCTION, + ) alt_titles = list( "Maintenance Technician" = /datum/prototype/struct/alt_title/maint_tech, diff --git a/code/modules/jobs/job_types/station/exploration/explorer.dm b/code/modules/jobs/job_types/station/exploration/explorer.dm index 084b6bcaf04..54f986d32d3 100644 --- a/code/modules/jobs/job_types/station/exploration/explorer.dm +++ b/code/modules/jobs/job_types/station/exploration/explorer.dm @@ -11,8 +11,13 @@ selection_color = "#999440" pto_type = PTO_EXPLORATION idtype = /obj/item/card/id/explorer/explorer - additional_access = list(ACCESS_GENERAL_EXPLORER, ACCESS_ENGINEERING_AIRLOCK, ACCESS_SCIENCE_MAIN, ACCESS_GENERAL_PILOT, ACCESS_GENERAL_GATEWAY) - minimal_access = list(ACCESS_GENERAL_EXPLORER, ACCESS_ENGINEERING_AIRLOCK, ACCESS_SCIENCE_MAIN, ACCESS_GENERAL_PILOT, ACCESS_GENERAL_GATEWAY) + minimal_access = list( + ACCESS_GENERAL_EXPLORER, + ACCESS_ENGINEERING_AIRLOCK, + ACCESS_SCIENCE_MAIN, + ACCESS_GENERAL_PILOT, + ACCESS_GENERAL_GATEWAY, + ) outfit_type = /datum/outfit/job/station/explorer desc = "An Explorer searches for interesting things, and returns them to the station." alt_titles = list( diff --git a/code/modules/jobs/job_types/station/exploration/field_medic.dm b/code/modules/jobs/job_types/station/exploration/field_medic.dm index 5237c7a6eff..ff234f88107 100644 --- a/code/modules/jobs/job_types/station/exploration/field_medic.dm +++ b/code/modules/jobs/job_types/station/exploration/field_medic.dm @@ -12,8 +12,19 @@ idtype = /obj/item/card/id/medical/sar minimal_player_age = 3 pto_type = PTO_EXPLORATION - additional_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_SURGERY, ACCESS_MEDICAL_CHEMISTRY, ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_GENERAL_PILOT) - minimal_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_GENERAL_PILOT) + additional_access = list( + ACCESS_MEDICAL_SURGERY, + ACCESS_MEDICAL_CHEMISTRY, + ACCESS_COMMAND_EVA, + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_AIRLOCK, + ) + minimal_access = list( + ACCESS_MEDICAL_MAIN, + ACCESS_MEDICAL_EQUIPMENT, + ACCESS_MEDICAL_MORGUE, + ACCESS_GENERAL_PILOT, + ) outfit_type = /datum/outfit/job/station/sar desc = "A Field medic works as the field doctor of expedition teams." alt_titles = list( diff --git a/code/modules/jobs/job_types/station/exploration/pathfinder.dm b/code/modules/jobs/job_types/station/exploration/pathfinder.dm index a53bf48cf6c..87cd7e3a0ff 100644 --- a/code/modules/jobs/job_types/station/exploration/pathfinder.dm +++ b/code/modules/jobs/job_types/station/exploration/pathfinder.dm @@ -15,8 +15,18 @@ minimal_player_age = 7 pto_type = PTO_EXPLORATION - additional_access = list(ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_GENERAL_PILOT, ACCESS_GENERAL_EXPLORER, ACCESS_SCIENCE_MAIN, ACCESS_GENERAL_GATEWAY, ACCESS_GENERAL_PATHFINDER) - minimal_access = list(ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_GENERAL_PILOT, ACCESS_GENERAL_EXPLORER, ACCESS_SCIENCE_MAIN, ACCESS_GENERAL_GATEWAY, ACCESS_GENERAL_PATHFINDER) + additional_access = list( + ACCESS_ENGINEERING_MAINT, + ) + minimal_access = list( + ACCESS_COMMAND_EVA, + ACCESS_ENGINEERING_AIRLOCK, + ACCESS_GENERAL_PILOT, + ACCESS_GENERAL_EXPLORER, + ACCESS_SCIENCE_MAIN, + ACCESS_GENERAL_GATEWAY, + ACCESS_GENERAL_PATHFINDER, + ) outfit_type = /datum/outfit/job/station/pathfinder desc = "The Pathfinder's job is to lead and manage expeditions, and is the primary authority on all off-station expeditions." alt_titles = list( diff --git a/code/modules/jobs/job_types/station/medical/chemist.dm b/code/modules/jobs/job_types/station/medical/chemist.dm index ecbcf872984..96669768470 100644 --- a/code/modules/jobs/job_types/station/medical/chemist.dm +++ b/code/modules/jobs/job_types/station/medical/chemist.dm @@ -10,8 +10,17 @@ selection_color = "#013D3B" pto_type = PTO_MEDICAL idtype = /obj/item/card/id/medical/chemist - additional_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_SURGERY, ACCESS_MEDICAL_CHEMISTRY, ACCESS_MEDICAL_VIROLOGY, ACCESS_SCIENCE_GENETICS) - minimal_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_CHEMISTRY) + additional_access = list( + ACCESS_MEDICAL_MORGUE, + ACCESS_MEDICAL_SURGERY, + ACCESS_MEDICAL_VIROLOGY, + ACCESS_SCIENCE_GENETICS, + ) + minimal_access = list( + ACCESS_MEDICAL_MAIN, + ACCESS_MEDICAL_EQUIPMENT, + ACCESS_MEDICAL_CHEMISTRY, + ) minimal_player_age = 3 outfit_type = /datum/outfit/job/station/chemist diff --git a/code/modules/jobs/job_types/station/medical/head_nurse.dm b/code/modules/jobs/job_types/station/medical/head_nurse.dm index 48b20a022b6..c7628dc97fd 100644 --- a/code/modules/jobs/job_types/station/medical/head_nurse.dm +++ b/code/modules/jobs/job_types/station/medical/head_nurse.dm @@ -11,8 +11,18 @@ selection_color = "#013D3B" pto_type = PTO_MEDICAL idtype = /obj/item/card/id/medical/doctor - additional_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_SURGERY, ACCESS_MEDICAL_CHEMISTRY, ACCESS_MEDICAL_VIROLOGY, ACCESS_SCIENCE_GENETICS, ACCESS_COMMAND_EVA) - minimal_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_SURGERY, ACCESS_MEDICAL_VIROLOGY, ACCESS_COMMAND_EVA) + additional_access = list( + ACCESS_MEDICAL_CHEMISTRY, + ACCESS_MEDICAL_VIROLOGY, + ACCESS_SCIENCE_GENETICS, + ) + minimal_access = list( + ACCESS_COMMAND_EVA, + ACCESS_MEDICAL_MAIN, + ACCESS_MEDICAL_EQUIPMENT, + ACCESS_MEDICAL_MORGUE, + ACCESS_MEDICAL_SURGERY, + ) outfit_type = /datum/outfit/job/station/medical_doctor/head_nurse desc = "A Head Nurse is a senior medical professional from the nursing field. They are expected to coordinate and perform the duties associated with \ nurses, such as sensors monitoring and non-critical care, as well as provide them and other medical staff with guidance and oversight when presented with \ diff --git a/code/modules/jobs/job_types/station/medical/medical_doctor.dm b/code/modules/jobs/job_types/station/medical/medical_doctor.dm index 1354d84be0d..70153d37884 100644 --- a/code/modules/jobs/job_types/station/medical/medical_doctor.dm +++ b/code/modules/jobs/job_types/station/medical/medical_doctor.dm @@ -10,8 +10,18 @@ selection_color = "#013D3B" pto_type = PTO_MEDICAL idtype = /obj/item/card/id/medical/doctor - additional_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_SURGERY, ACCESS_MEDICAL_CHEMISTRY, ACCESS_MEDICAL_VIROLOGY, ACCESS_SCIENCE_GENETICS, ACCESS_COMMAND_EVA) - minimal_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_SURGERY, ACCESS_MEDICAL_VIROLOGY, ACCESS_COMMAND_EVA) + additional_access = list( + ACCESS_COMMAND_EVA, + ACCESS_MEDICAL_CHEMISTRY, + ACCESS_SCIENCE_GENETICS, + ) + minimal_access = list( + ACCESS_MEDICAL_MAIN, + ACCESS_MEDICAL_EQUIPMENT, + ACCESS_MEDICAL_MORGUE, + ACCESS_MEDICAL_SURGERY, + ACCESS_MEDICAL_VIROLOGY, + ) outfit_type = /datum/outfit/job/station/medical_doctor desc = "A Medical Doctor is a Jack-of-All-Trades Medical title, covering a variety of skill levels and minor specializations. They are likely \ familiar with basic first aid, and a number of accompanying medications, and can generally save, if not cure, a majority of the \ diff --git a/code/modules/jobs/job_types/station/medical/paramedic.dm b/code/modules/jobs/job_types/station/medical/paramedic.dm index 5b00551d0c3..45717a8b6a3 100644 --- a/code/modules/jobs/job_types/station/medical/paramedic.dm +++ b/code/modules/jobs/job_types/station/medical/paramedic.dm @@ -10,8 +10,20 @@ selection_color = "#013D3B" pto_type = PTO_MEDICAL idtype = /obj/item/card/id/medical/paramedic - additional_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_SURGERY, ACCESS_MEDICAL_CHEMISTRY, ACCESS_MEDICAL_VIROLOGY, ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_MEDICAL_PSYCH) - minimal_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK) + additional_access = list( + ACCESS_MEDICAL_SURGERY, + ACCESS_MEDICAL_CHEMISTRY, + ACCESS_MEDICAL_VIROLOGY, + ACCESS_MEDICAL_PSYCH, + ) + minimal_access = list( + ACCESS_MEDICAL_MAIN, + ACCESS_MEDICAL_EQUIPMENT, + ACCESS_MEDICAL_MORGUE, + ACCESS_COMMAND_EVA, + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_AIRLOCK, + ) outfit_type = /datum/outfit/job/station/paramedic desc = "A Paramedic is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their own. \ They may also be called upon to keep patients stable when Medical is busy or understaffed." diff --git a/code/modules/jobs/job_types/station/medical/psychiatrist.dm b/code/modules/jobs/job_types/station/medical/psychiatrist.dm index 2b948102c99..71765e4f41a 100644 --- a/code/modules/jobs/job_types/station/medical/psychiatrist.dm +++ b/code/modules/jobs/job_types/station/medical/psychiatrist.dm @@ -10,8 +10,15 @@ selection_color = "#013D3B" pto_type = PTO_MEDICAL idtype = /obj/item/card/id/medical/psychiatrist - additional_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_MORGUE, ACCESS_MEDICAL_PSYCH) - minimal_access = list(ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_EQUIPMENT, ACCESS_MEDICAL_PSYCH, ACCESS_MEDICAL_CHEMISTRY) + additional_access = list( + ACCESS_MEDICAL_CHEMISTRY, + ACCESS_MEDICAL_MORGUE, + ) + minimal_access = list( + ACCESS_MEDICAL_MAIN, + ACCESS_MEDICAL_EQUIPMENT, + ACCESS_MEDICAL_PSYCH, + ) outfit_type = /datum/outfit/job/station/psychiatrist desc = "A Psychiatrist provides mental health services to crew members in need. They may also be called upon to determine whatever \ ails the mentally unwell, frequently under Security supervision. They understand the effects of various psychoactive drugs." diff --git a/code/modules/jobs/job_types/station/offduty/civillian.dm b/code/modules/jobs/job_types/station/offduty/civillian.dm index e0d6d660f67..1c7a7ab1bce 100644 --- a/code/modules/jobs/job_types/station/offduty/civillian.dm +++ b/code/modules/jobs/job_types/station/offduty/civillian.dm @@ -2,8 +2,6 @@ id = JOB_ID_OFFDUTY_CIVILLIAN title = "Off-duty Worker" selection_color = "#9b633e" - additional_access = list(ACCESS_ENGINEERING_MAINT) - minimal_access = list(ACCESS_ENGINEERING_MAINT) outfit_type = /datum/outfit/job/station/assistant/worker desc = "Off-duty crew has no responsibilities or authority and is just there to spend their \"well-deserved\" time off." pto_type = PTO_CIVILIAN diff --git a/code/modules/jobs/job_types/station/offduty/command.dm b/code/modules/jobs/job_types/station/offduty/command.dm index 748722d4d65..d2da5731b93 100644 --- a/code/modules/jobs/job_types/station/offduty/command.dm +++ b/code/modules/jobs/job_types/station/offduty/command.dm @@ -4,8 +4,10 @@ timeoff_factor = -1 total_positions = -1 selection_color = "#9b633e" - additional_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK) - minimal_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK) + minimal_access = list( + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_AIRLOCK, + ) outfit_type = /datum/outfit/job/station/assistant desc = "Off-duty crew has no responsibilities or authority and is just there to spend their \"well-deserved\" time off." pto_type = PTO_COMMAND diff --git a/code/modules/jobs/job_types/station/offduty/engineering.dm b/code/modules/jobs/job_types/station/offduty/engineering.dm index df1efef18a2..e65ae7b6a3b 100644 --- a/code/modules/jobs/job_types/station/offduty/engineering.dm +++ b/code/modules/jobs/job_types/station/offduty/engineering.dm @@ -2,8 +2,13 @@ id = JOB_ID_OFFDUTY_ENGINEER title = "Off-duty Engineer" selection_color = "#5B4D20" - additional_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_ENGINEERING_CONSTRUCTION) - minimal_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK) + additional_access = list( + ACCESS_ENGINEERING_CONSTRUCTION, + ) + minimal_access = list( + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_AIRLOCK, + ) outfit_type = /datum/outfit/job/station/assistant/engineer desc = "Off-duty crew has no responsibilities or authority and is just there to spend their \"well-deserved\" time off." pto_type = PTO_ENGINEERING diff --git a/code/modules/jobs/job_types/station/offduty/exploration.dm b/code/modules/jobs/job_types/station/offduty/exploration.dm index 34b88eb4df4..50f285fbe74 100644 --- a/code/modules/jobs/job_types/station/offduty/exploration.dm +++ b/code/modules/jobs/job_types/station/offduty/exploration.dm @@ -2,8 +2,6 @@ id = JOB_ID_OFFDUTY_EXPLORER title = "Off-duty Explorer" selection_color = "#999440" - additional_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK) - minimal_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK) outfit_type = /datum/outfit/job/station/assistant/explorer desc = "Off-duty crew has no responsibilities or authority and is just there to spend their \"well-deserved\" time off." pto_type = PTO_EXPLORATION diff --git a/code/modules/jobs/job_types/station/offduty/medical.dm b/code/modules/jobs/job_types/station/offduty/medical.dm index 1a97d5d95b5..1f25e42639a 100644 --- a/code/modules/jobs/job_types/station/offduty/medical.dm +++ b/code/modules/jobs/job_types/station/offduty/medical.dm @@ -2,8 +2,6 @@ id = JOB_ID_OFFDUTY_MEDBAY title = "Off-duty Medic" selection_color = "#013D3B" - additional_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK) - minimal_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK) outfit_type = /datum/outfit/job/station/assistant/medic desc = "Off-duty crew has no responsibilities or authority and is just there to spend their \"well-deserved\" time off." pto_type = PTO_MEDICAL diff --git a/code/modules/jobs/job_types/station/offduty/science.dm b/code/modules/jobs/job_types/station/offduty/science.dm index 7630e85e0c9..3a0816a6986 100644 --- a/code/modules/jobs/job_types/station/offduty/science.dm +++ b/code/modules/jobs/job_types/station/offduty/science.dm @@ -2,8 +2,6 @@ id = JOB_ID_OFFDUTY_SCIENCE title = "Off-duty Scientist" selection_color = "#633D63" - additional_access = list(ACCESS_ENGINEERING_MAINT) - minimal_access = list(ACCESS_ENGINEERING_MAINT) outfit_type = /datum/outfit/job/station/assistant/scientist desc = "Off-duty crew has no responsibilities or authority and is just there to spend their \"well-deserved\" time off." pto_type = PTO_SCIENCE diff --git a/code/modules/jobs/job_types/station/offduty/security.dm b/code/modules/jobs/job_types/station/offduty/security.dm index 5fbd22482b8..69969ca3982 100644 --- a/code/modules/jobs/job_types/station/offduty/security.dm +++ b/code/modules/jobs/job_types/station/offduty/security.dm @@ -2,8 +2,6 @@ id = JOB_ID_OFFDUTY_SECURITY title = "Off-duty Officer" selection_color = "#601C1C" - additional_access = list(ACCESS_ENGINEERING_MAINT) - minimal_access = list(ACCESS_ENGINEERING_MAINT) outfit_type = /datum/outfit/job/station/assistant/officer desc = "Off-duty crew has no responsibilities or authority and is just there to spend their \"well-deserved\" time off." pto_type = PTO_SECURITY diff --git a/code/modules/jobs/job_types/station/offduty/supply.dm b/code/modules/jobs/job_types/station/offduty/supply.dm index b9129999a80..65c075a27cd 100644 --- a/code/modules/jobs/job_types/station/offduty/supply.dm +++ b/code/modules/jobs/job_types/station/offduty/supply.dm @@ -2,8 +2,6 @@ id = JOB_ID_OFFDUTY_CARGO title = "Off-duty Cargo" selection_color = "#9b633e" - additional_access = list(ACCESS_ENGINEERING_MAINT) - minimal_access = list(ACCESS_ENGINEERING_MAINT) outfit_type = /datum/outfit/job/station/assistant/cargo desc = "Off-duty crew has no responsibilities or authority and is just there to spend their \"well-deserved\" time off." pto_type = PTO_CARGO diff --git a/code/modules/jobs/job_types/station/science/research_director.dm b/code/modules/jobs/job_types/station/science/research_director.dm index 5e673575b8a..557f12603fe 100644 --- a/code/modules/jobs/job_types/station/science/research_director.dm +++ b/code/modules/jobs/job_types/station/science/research_director.dm @@ -26,6 +26,7 @@ ACCESS_COMMAND_KEYAUTH, ACCESS_COMMAND_TELEPORTER, ACCESS_COMMAND_UPLOAD, + ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_TECHSTORAGE, ACCESS_ENGINEERING_TELECOMMS, ACCESS_GENERAL_GATEWAY, diff --git a/code/modules/jobs/job_types/station/science/roboticist.dm b/code/modules/jobs/job_types/station/science/roboticist.dm index 6e40eaa0051..ce228060f5e 100644 --- a/code/modules/jobs/job_types/station/science/roboticist.dm +++ b/code/modules/jobs/job_types/station/science/roboticist.dm @@ -9,8 +9,16 @@ supervisors = "the Research Director" selection_color = "#633D63" pto_type = PTO_SCIENCE - additional_access = list(ACCESS_SCIENCE_ROBOTICS, ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_ENGINEERING_TECHSTORAGE, ACCESS_MEDICAL_MORGUE, ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_FABRICATION) //As a job that handles so many corpses, it makes sense for them to have morgue access. - minimal_access = list(ACCESS_SCIENCE_ROBOTICS, ACCESS_ENGINEERING_TECHSTORAGE, ACCESS_MEDICAL_MORGUE, ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_FABRICATION) //As a job that handles so many corpses, it makes sense for them to have morgue access. + additional_access = list( + ACCESS_SCIENCE_FABRICATION, + ACCESS_SCIENCE_TOXINS, + ACCESS_MEDICAL_MORGUE, + ) + minimal_access = list( + ACCESS_ENGINEERING_TECHSTORAGE, + ACCESS_SCIENCE_ROBOTICS, + ACCESS_SCIENCE_MAIN, + ) minimal_player_age = 7 outfit_type = /datum/outfit/job/station/roboticist diff --git a/code/modules/jobs/job_types/station/science/scientist.dm b/code/modules/jobs/job_types/station/science/scientist.dm index 24ba0d8172c..918b4c00309 100644 --- a/code/modules/jobs/job_types/station/science/scientist.dm +++ b/code/modules/jobs/job_types/station/science/scientist.dm @@ -9,8 +9,17 @@ supervisors = "the Research Director" selection_color = "#633D63" idtype = /obj/item/card/id/science/scientist - additional_access = list(ACCESS_SCIENCE_ROBOTICS, ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_XENOBIO, ACCESS_SCIENCE_XENOARCH, ACCESS_SCIENCE_XENOBOTANY) - minimal_access = list(ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_XENOARCH, ACCESS_SCIENCE_XENOBIO, ACCESS_SCIENCE_XENOBOTANY) + additional_access = list( + ACCESS_SCIENCE_ROBOTICS, + ) + minimal_access = list( + ACCESS_SCIENCE_FABRICATION, + ACCESS_SCIENCE_TOXINS, + ACCESS_SCIENCE_MAIN, + ACCESS_SCIENCE_XENOARCH, + ACCESS_SCIENCE_XENOBIO, + ACCESS_SCIENCE_XENOBOTANY, + ) minimal_player_age = 14 diff --git a/code/modules/jobs/job_types/station/science/senior_researcher.dm b/code/modules/jobs/job_types/station/science/senior_researcher.dm index e70f35d1c36..a3a36c80476 100644 --- a/code/modules/jobs/job_types/station/science/senior_researcher.dm +++ b/code/modules/jobs/job_types/station/science/senior_researcher.dm @@ -10,8 +10,15 @@ supervisors = "the Research Director" selection_color = "#633D63" idtype = /obj/item/card/id/science/scientist - additional_access = list(ACCESS_SCIENCE_ROBOTICS, ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_XENOBIO, ACCESS_SCIENCE_XENOARCH, ACCESS_SCIENCE_XENOBOTANY) - minimal_access = list(ACCESS_SCIENCE_FABRICATION, ACCESS_SCIENCE_TOXINS, ACCESS_SCIENCE_MAIN, ACCESS_SCIENCE_XENOARCH, ACCESS_SCIENCE_XENOBIO, ACCESS_SCIENCE_XENOBOTANY) + minimal_access = list( + ACCESS_SCIENCE_FABRICATION, + ACCESS_SCIENCE_TOXINS, + ACCESS_SCIENCE_MAIN, + ACCESS_SCIENCE_ROBOTICS, + ACCESS_SCIENCE_XENOARCH, + ACCESS_SCIENCE_XENOBIO, + ACCESS_SCIENCE_XENOBOTANY, + ) minimal_player_age = 14 diff --git a/code/modules/jobs/job_types/station/security/detective.dm b/code/modules/jobs/job_types/station/security/detective.dm index cd2b2988e1d..2b631aafd7e 100644 --- a/code/modules/jobs/job_types/station/security/detective.dm +++ b/code/modules/jobs/job_types/station/security/detective.dm @@ -10,8 +10,20 @@ selection_color = "#601C1C" idtype = /obj/item/card/id/security/detective pto_type = PTO_SECURITY - additional_access = list(ACCESS_SECURITY_EQUIPMENT, ACCESS_SECURITY_MAIN, ACCESS_SECURITY_FORENSICS, ACCESS_MEDICAL_MORGUE, ACCESS_ENGINEERING_MAINT, ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_AIRLOCK, ACCESS_SECURITY_BRIG) - minimal_access = list(ACCESS_SECURITY_EQUIPMENT, ACCESS_SECURITY_MAIN, ACCESS_SECURITY_FORENSICS, ACCESS_MEDICAL_MORGUE, ACCESS_ENGINEERING_MAINT, ACCESS_COMMAND_EVA, ACCESS_ENGINEERING_AIRLOCK) + additional_access = list( + ACCESS_COMMAND_EVA, + ACCESS_ENGINEERING_AIRLOCK, + ACCESS_ENGINEERING_MAINT, + ACCESS_MEDICAL_MORGUE, + ACCESS_SECURITY_BRIG, + ) + minimal_access = list( + ACCESS_SECURITY_EQUIPMENT, + ACCESS_SECURITY_FORENSICS, + ACCESS_SECURITY_MAIN, + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_AIRLOCK, + ) minimal_player_age = 3 outfit_type = /datum/outfit/job/station/detective diff --git a/code/modules/jobs/job_types/station/security/head_of_security.dm b/code/modules/jobs/job_types/station/security/head_of_security.dm index 19bbafeda9c..7abf5ac634c 100644 --- a/code/modules/jobs/job_types/station/security/head_of_security.dm +++ b/code/modules/jobs/job_types/station/security/head_of_security.dm @@ -21,6 +21,14 @@ disallow_jobhop = TRUE pto_type = PTO_SECURITY req_admin_notify = 1 + additional_access = list( + ACCESS_ENGINEERING_CONSTRUCTION, + ACCESS_ENGINEERING_MAIN, + ACCESS_MEDICAL_MAIN, + ACCESS_SCIENCE_MAIN, + ACCESS_SUPPLY_MAIN, + ACCESS_SUPPLY_MINE, + ) minimal_access = list( ACCESS_COMMAND_ANNOUNCE, ACCESS_COMMAND_BRIDGE, @@ -28,13 +36,9 @@ ACCESS_COMMAND_KEYAUTH, ACCESS_COMMAND_LOCKERS, ACCESS_ENGINEERING_AIRLOCK, - ACCESS_ENGINEERING_CONSTRUCTION, - ACCESS_ENGINEERING_MAIN, ACCESS_ENGINEERING_MAINT, - ACCESS_MEDICAL_MAIN, ACCESS_MEDICAL_MORGUE, ACCESS_GENERAL_GATEWAY, - ACCESS_SCIENCE_MAIN, ACCESS_SECURITY_ARMORY, ACCESS_SECURITY_BRIG, ACCESS_SECURITY_EDIT, @@ -42,8 +46,6 @@ ACCESS_SECURITY_FORENSICS, ACCESS_SECURITY_HOS, ACCESS_SECURITY_MAIN, - ACCESS_SUPPLY_MAIN, - ACCESS_SUPPLY_MINE, ACCESS_SECURITY_GENPOP_ENTER, ACCESS_SECURITY_GENPOP_EXIT, ) diff --git a/code/modules/jobs/job_types/station/security/security_officer.dm b/code/modules/jobs/job_types/station/security/security_officer.dm index d01de13e4cc..0fffeff35d2 100644 --- a/code/modules/jobs/job_types/station/security/security_officer.dm +++ b/code/modules/jobs/job_types/station/security/security_officer.dm @@ -10,8 +10,19 @@ supervisors = "the Head of Security" idtype = /obj/item/card/id/security/officer selection_color = "#601C1C" - additional_access = list(ACCESS_SECURITY_EQUIPMENT, ACCESS_COMMAND_EVA, ACCESS_SECURITY_MAIN, ACCESS_SECURITY_BRIG, ACCESS_ENGINEERING_MAINT, ACCESS_MEDICAL_MORGUE, ACCESS_ENGINEERING_AIRLOCK) - minimal_access = list(ACCESS_SECURITY_EQUIPMENT, ACCESS_COMMAND_EVA, ACCESS_SECURITY_MAIN, ACCESS_SECURITY_BRIG, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_SECURITY_GENPOP_ENTER, ACCESS_SECURITY_GENPOP_EXIT) + additional_access = list( + ACCESS_MEDICAL_MORGUE, + ) + minimal_access = list( + ACCESS_SECURITY_EQUIPMENT, + ACCESS_COMMAND_EVA, + ACCESS_SECURITY_MAIN, + ACCESS_SECURITY_BRIG, + ACCESS_ENGINEERING_MAINT, + ACCESS_ENGINEERING_AIRLOCK, + ACCESS_SECURITY_GENPOP_ENTER, + ACCESS_SECURITY_GENPOP_EXIT, + ) minimal_player_age = 3 outfit_type = /datum/outfit/job/station/security_officer diff --git a/code/modules/jobs/job_types/station/security/warden.dm b/code/modules/jobs/job_types/station/security/warden.dm index 062f23d6585..d4209d778eb 100644 --- a/code/modules/jobs/job_types/station/security/warden.dm +++ b/code/modules/jobs/job_types/station/security/warden.dm @@ -12,8 +12,20 @@ selection_color = "#601C1C" idtype = /obj/item/card/id/security/warden pto_type = PTO_SECURITY - additional_access = list(ACCESS_SECURITY_EQUIPMENT, ACCESS_COMMAND_EVA, ACCESS_SECURITY_MAIN, ACCESS_SECURITY_BRIG, ACCESS_SECURITY_ARMORY, ACCESS_ENGINEERING_MAINT, ACCESS_MEDICAL_MORGUE, ACCESS_ENGINEERING_AIRLOCK) - minimal_access = list(ACCESS_SECURITY_EQUIPMENT, ACCESS_COMMAND_EVA, ACCESS_SECURITY_MAIN, ACCESS_SECURITY_BRIG, ACCESS_SECURITY_ARMORY, ACCESS_ENGINEERING_MAINT, ACCESS_ENGINEERING_AIRLOCK, ACCESS_SECURITY_GENPOP_ENTER, ACCESS_SECURITY_GENPOP_EXIT) + additional_access = list( + ACCESS_COMMAND_EVA, + ACCESS_MEDICAL_MORGUE, + ACCESS_ENGINEERING_AIRLOCK, + ) + minimal_access = list( + ACCESS_SECURITY_EQUIPMENT, + ACCESS_SECURITY_MAIN, + ACCESS_SECURITY_BRIG, + ACCESS_SECURITY_ARMORY, + ACCESS_ENGINEERING_MAINT, + ACCESS_SECURITY_GENPOP_ENTER, + ACCESS_SECURITY_GENPOP_EXIT, + ) minimal_player_age = 5 outfit_type = /datum/outfit/job/station/warden diff --git a/code/modules/jobs/job_types/station/service/bartender.dm b/code/modules/jobs/job_types/station/service/bartender.dm index 4e10248a49e..d498622aec5 100644 --- a/code/modules/jobs/job_types/station/service/bartender.dm +++ b/code/modules/jobs/job_types/station/service/bartender.dm @@ -10,8 +10,13 @@ selection_color = "#515151" idtype = /obj/item/card/id/civilian/bartender pto_type = PTO_CIVILIAN - additional_access = list(ACCESS_GENERAL_BOTANY, ACCESS_GENERAL_BAR, ACCESS_GENERAL_KITCHEN) - minimal_access = list(ACCESS_GENERAL_BAR) + additional_access = list( + ACCESS_GENERAL_BOTANY, + ACCESS_GENERAL_KITCHEN, + ) + minimal_access = list( + ACCESS_GENERAL_BAR, + ) outfit_type = /datum/outfit/job/station/bartender desc = "A Bartender mixes drinks for the crew. They generally have permission to charge for drinks or deny service to unruly patrons." diff --git a/code/modules/jobs/job_types/station/service/botanist.dm b/code/modules/jobs/job_types/station/service/botanist.dm index 9cba20ac0be..25b4381a00f 100644 --- a/code/modules/jobs/job_types/station/service/botanist.dm +++ b/code/modules/jobs/job_types/station/service/botanist.dm @@ -11,8 +11,13 @@ pto_type = PTO_CIVILIAN pto_type = PTO_CIVILIAN idtype = /obj/item/card/id/civilian/botanist - additional_access = list(ACCESS_GENERAL_BOTANY, ACCESS_GENERAL_BAR, ACCESS_GENERAL_KITCHEN) - minimal_access = list(ACCESS_GENERAL_BOTANY) + additional_access = list( + ACCESS_GENERAL_BAR, + ACCESS_GENERAL_KITCHEN, + ) + minimal_access = list( + ACCESS_GENERAL_BOTANY, + ) outfit_type = /datum/outfit/job/station/botanist/gardener desc = "A Botanist grows plants for the Chef and Bartender." diff --git a/code/modules/jobs/job_types/station/service/chef.dm b/code/modules/jobs/job_types/station/service/chef.dm index cea948fa13e..653cc9dcaa1 100644 --- a/code/modules/jobs/job_types/station/service/chef.dm +++ b/code/modules/jobs/job_types/station/service/chef.dm @@ -10,8 +10,13 @@ selection_color = "#515151" pto_type = PTO_CIVILIAN idtype = /obj/item/card/id/civilian/chef - additional_access = list(ACCESS_GENERAL_BOTANY, ACCESS_GENERAL_BAR, ACCESS_GENERAL_KITCHEN) - minimal_access = list(ACCESS_GENERAL_KITCHEN) + additional_access = list( + ACCESS_GENERAL_BOTANY, + ACCESS_GENERAL_BAR, + ) + minimal_access = list( + ACCESS_GENERAL_KITCHEN, + ) outfit_type = /datum/outfit/job/station/chef desc = "A Chef cooks food for the crew. They generally have permission to charge for food or deny service to unruly diners." diff --git a/code/modules/jobs/job_types/station/service/janitor.dm b/code/modules/jobs/job_types/station/service/janitor.dm index 77c8c9759ef..c0eb1419485 100644 --- a/code/modules/jobs/job_types/station/service/janitor.dm +++ b/code/modules/jobs/job_types/station/service/janitor.dm @@ -10,8 +10,12 @@ supervisors = "the Head of Personnel" selection_color = "#515151" idtype = /obj/item/card/id/civilian/janitor - additional_access = list(ACCESS_GENERAL_JANITOR, ACCESS_ENGINEERING_MAINT) - minimal_access = list(ACCESS_GENERAL_JANITOR, ACCESS_ENGINEERING_MAINT) + additional_access = list( + ACCESS_ENGINEERING_MAINT, + ) + minimal_access = list( + ACCESS_GENERAL_JANITOR, + ) outfit_type = /datum/outfit/job/station/janitor desc = "A Janitor keeps the station clean, as long as it doesn't interfere with active crime scenes." diff --git a/code/modules/jobs/job_types/station/supply/cargo_technician.dm b/code/modules/jobs/job_types/station/supply/cargo_technician.dm index 02d217e7954..0b878e333a9 100644 --- a/code/modules/jobs/job_types/station/supply/cargo_technician.dm +++ b/code/modules/jobs/job_types/station/supply/cargo_technician.dm @@ -9,8 +9,16 @@ spawn_positions = 2 supervisors = "the Quartermaster and the Head of Personnel" selection_color = "#7a4f33" - additional_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_SUPPLY_MAIN, ACCESS_SUPPLY_BAY, ACCESS_SUPPLY_MULEBOT, ACCESS_SUPPLY_MINE, ACCESS_SUPPLY_MINE_OUTPOST) - minimal_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_SUPPLY_BAY, ACCESS_SUPPLY_MULEBOT, ACCESS_SUPPLY_MAIN) + additional_access = list( + ACCESS_SUPPLY_MINE, + ACCESS_SUPPLY_MINE_OUTPOST, + ) + minimal_access = list( + ACCESS_ENGINEERING_MAINT, + ACCESS_SUPPLY_BAY, + ACCESS_SUPPLY_MULEBOT, + ACCESS_SUPPLY_MAIN, + ) outfit_type = /datum/outfit/job/station/cargo_technician desc = "A Cargo Technician fills and delivers cargo orders. They are encouraged to return delivered crates to the Cargo Shuttle, \ diff --git a/code/modules/jobs/job_types/station/supply/shaft_miner.dm b/code/modules/jobs/job_types/station/supply/shaft_miner.dm index c46fee9045c..609bc44969d 100644 --- a/code/modules/jobs/job_types/station/supply/shaft_miner.dm +++ b/code/modules/jobs/job_types/station/supply/shaft_miner.dm @@ -11,8 +11,16 @@ spawn_positions = 3 supervisors = "the Quartermaster and the Head of Personnel" selection_color = "#7a4f33" - additional_access = list(ACCESS_ENGINEERING_MAINT, ACCESS_SUPPLY_MAIN, ACCESS_SUPPLY_BAY, ACCESS_SUPPLY_MULEBOT, ACCESS_SUPPLY_MINE, ACCESS_SUPPLY_MINE_OUTPOST) - minimal_access = list(ACCESS_SUPPLY_MINE, ACCESS_SUPPLY_MINE_OUTPOST, ACCESS_SUPPLY_MAIN, ACCESS_SUPPLY_BAY, ACCESS_SUPPLY_MULEBOT) + additional_access = list( + ACCESS_ENGINEERING_MAINT, + ) + minimal_access = list( + ACCESS_SUPPLY_MINE, + ACCESS_SUPPLY_MINE_OUTPOST, + ACCESS_SUPPLY_MAIN, + ACCESS_SUPPLY_BAY, + ACCESS_SUPPLY_MULEBOT, + ) outfit_type = /datum/outfit/job/station/shaft_miner desc = "A Shaft Miner mines and processes minerals to be delivered to departments that need them." diff --git a/config/entries/game.txt b/config/entries/game.txt index f969403248c..0dbc702386a 100644 --- a/config/entries/game.txt +++ b/config/entries/game.txt @@ -40,3 +40,6 @@ ENGINE_SUBMAP EngineSubmap_Singulo 20 ## Set to 0 to disable emoji parse EMOJIS + +## Set to 0 to disable everyone on station having maint. +ALMOST_EVERYONE_HAS_MAINTENANCE_ACCESS