Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Job Alternative Titles - Hotfix for #11973 #12087

Merged
adamsong merged 3 commits into from
Aug 21, 2021
Merged

Job Alternative Titles - Hotfix for #11973 #12087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34390cc
Fixes
JamieD1 Aug 19, 2021
d89306f
Cap
JamieD1 Aug 19, 2021
b33661f
eee
JamieD1 Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/assistant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Assistant
paycheck_department = ACCOUNT_CIV
display_order = JOB_DISPLAY_ORDER_ASSISTANT

alt_titles = list("Intern", "Apprentice", "Subordinate", "Temporary Worker", "Colleague", "Associate")
alt_titles = list("Intern", "Apprentice", "Subordinate", "Temporary Worker", "Associate")

/datum/job/assistant/get_access()
if(CONFIG_GET(flag/assistants_have_maint_access) || !CONFIG_GET(flag/jobs_have_minimal_access)) //Config has assistant maint access set
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/atmospheric_technician.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
selection_color = "#fff5cc"
exp_requirements = 180
exp_type = EXP_TYPE_CREW
alt_titles = list("Breach Fixer", "Radiation Creator", "Habitation Technician", "Fire Suppression Technician", "Atmospherics Trainee", "Environmental Maintainer")
alt_titles = list("Life-support Technician", "Fire Suppression Specialist", "Atmospherics Trainee", "Environmental Maintainer")

outfit = /datum/outfit/job/atmos

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/captain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_COMMAND
alt_titles = list("Station Commander", "Facility Overseer")
alt_titles = list("Station Commander", "Facility Director")

outfit = /datum/outfit/job/captain

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chaplain.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

outfit = /datum/outfit/job/chaplain

alt_titles = list("Priest", "Preacher", "Cleric")
alt_titles = list("Priest", "Preacher", "Cleric", "Exorcist")

access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE)
minimal_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/chief_engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_ENGINEERING
alt_titles = list("Head of Engineering", "Engineering Director")
alt_titles = list("Engineering Director", "Head of Engineering")

outfit = /datum/outfit/job/ce

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/cyborg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
minimal_player_age = 21
exp_requirements = 120
exp_type = EXP_TYPE_CREW
alt_titles = list("Android", "Robot", "Cyborg")
alt_titles = list("Droid", "Robot", "Automaton")

display_order = JOB_DISPLAY_ORDER_CYBORG

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/head_of_personnel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SUPPLY
alt_titles = list("Chief of Staff", "Head of Internal Affairs")
alt_titles = list("Chief of Staff", "Head of Internal Affairs", "First Officer")

outfit = /datum/outfit/job/hop

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/medical_doctor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
selection_color = "#d4ebf2"
exp_requirements = 180
exp_type = EXP_TYPE_CREW
alt_titles = list("Physician", "Surgeon", "Nurse", "Medical Resident", "Attending Physician", "Attending Physician", "General Practitioner")
alt_titles = list("Physician", "Surgeon", "Nurse", "Medical Resident", "Attending Physician", "General Practitioner")

outfit = /datum/outfit/job/doctor

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/scientist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
selection_color = "#ffeeff"
exp_requirements = 180
exp_type = EXP_TYPE_CREW
alt_titles = list("Researcher", "Toxins Specialist", "Physicist", "Science Intern", "Anomalist", "Quantum Physicist", "Xenobiologist", "Bomb Specialist")
alt_titles = list("Researcher", "Toxins Specialist", "Physicist", "Test Associate", "Anomalist", "Quantum Physicist", "Xenobiologist", "Explosives Technician")

outfit = /datum/outfit/job/scientist

Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/security_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

outfit = /datum/outfit/job/security

alt_titles = list("Security Guard", "Threat Response Officer", "Civilan Protection Officer", "Security Cadet", "Security Staff Sergeant")
alt_titles = list("Threat Response Officer", "Civilan Protection Officer", "Security Cadet", "Corporate Marine")

access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM) // See /datum/job/officer/get_access()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/warden.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

outfit = /datum/outfit/job/warden

alt_titles = list("Brig Watchman", "Brig Superintendent", "Security Lt. Commander", "Security Dispatcher", "Prison Supervisor")
alt_titles = list("Brig Watchman", "Brig Superintendent", "Security Staff Sergeant", "Security Dispatcher", "Prison Supervisor")

access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MECH_SECURITY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) // See /datum/job/warden/get_access()
Expand Down
20 changes: 10 additions & 10 deletions code/modules/jobs/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ GLOBAL_LIST_INIT(original_nonhuman_positions, list(
ROLE_PAI))

GLOBAL_LIST_INIT(alt_command_positions, list(
"Station Commander", "Facility Overseer",
"Chief of Staff", "Head of Internal Affairs",
"Station Commander", "Facility Director",
"Chief of Staff", "Head of Internal Affairs", "First Officer",
"Security Commander", "Security Chief",
"Head of Engineering", "Engineering Director",
"Chief Science Officer", "Head of Research",
Expand All @@ -70,13 +70,13 @@ GLOBAL_LIST_INIT(alt_command_positions, list(
GLOBAL_LIST_INIT(alt_engineering_positions, list(
"Head of Engineering", "Engineering Director",
"Engine Technician", "Solar Engineer", "Project Engineer", "Junior Engineer", "Construction Specialist",
"Habitation Technician", "Fire Suppression Technician", "Atmospherics Trainee", "Environmental Maintainer",
"Life-support Technician", "Fire Suppression Specialist", "Atmospherics Trainee", "Environmental Maintainer",
"NTSL Programmer", "Comms Tech", "Station IT Support"
))

GLOBAL_LIST_INIT(alt_medical_positions, list(
"Medical Director", "Head of Medical",
"Physician", "Surgeon", "Nurse", "Medical Resident", "Attending Physician", "Chief Surgeon", "Attending Physician", "Chief Surgeon", "Medical Subdirector", "General Practitioner",
"Physician", "Surgeon", "Nurse", "Medical Resident", "Attending Physician", "Chief Surgeon", "Chief Surgeon", "Medical Subdirector", "General Practitioner",
"DNA Mechanic", "Bioengineer", "Junior Geneticist", "Gene Splicer",
"Microbiologist", "Pathologist", "Junior Disease Researcher", "Epidemiologist",
"Pharmacist", "Chemical Analyst", "Chemistry Lab Technician", "Chemical Specialist",
Expand All @@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(alt_medical_positions, list(

GLOBAL_LIST_INIT(alt_science_positions, list(
"Chief Science Officer", "Head of Research",
"Researcher", "Toxins Specialist", "Physicist", "Science Intern", "Anomalist", "Quantum Physicist", "Xenobiologist", "Bomb Specialist",
"Researcher", "Toxins Specialist", "Physicist", "Test Associate", "Anomalist", "Quantum Physicist", "Xenobiologist", "Explosives Technician",
"Augmentation Theorist", "Cyborg Maintainer", "Robotics Intern", "Biomechanical Engineer", "Mechatronic Engineer"))

GLOBAL_LIST_INIT(alt_supply_positions, list(
Expand All @@ -102,25 +102,25 @@ GLOBAL_LIST_INIT(alt_civilian_positions, list(
"Custodian", "Sanitation Worker", "Cleaner", "Caretaker",
"Librarian", "Journalist", "Archivist",
"Prosecutor", "Defense Attorney", "Paralegal", "Ace Attorney",
"Priest", "Preacher", "Cleric",
"Priest", "Preacher", "Cleric", "Exorcist",
"Entertainer", "Comedian", "Jester",
"Mute Entertainer", "Silent Jokester", "Pantomimist",
"Intern", "Apprentice", "Subordinate", "Temporary Worker", "Colleague", "Associate",
"Intern", "Apprentice", "Subordinate", "Temporary Worker", "Associate",
"Salesman", "Gift Shop Attendent", "Retail Worker",
"Visitor", "Traveler", "Siteseer",
"Composer", "Artisan"
))

GLOBAL_LIST_INIT(alt_security_positions, list(
"Security Commander", "Security Chief",
"Brig Watchman", "Brig Superintendent", "Security Lt. Commander", "Security Dispatcher", "Prison Supervisor",
"Brig Watchman", "Brig Superintendent", "Security Staff Sergeant", "Security Dispatcher", "Prison Supervisor",
"Investigator", "Forensic Analyst", "Investigative Cadet", "Private Eye", "Inspector",
"Security Guard", "Threat Response Officer", "Civilan Protection Officer", "Security Cadet", "Security Staff Sergeant",
"Threat Response Officer", "Civilan Protection Officer", "Security Cadet", "Corporate Marine",
))

GLOBAL_LIST_INIT(alt_nonhuman_positions, list(
"Station Central Processor", "Central Silicon Intelligence", "Station Super Computer",
"Android", "Robot",
"Droid", "Robot", "Automaton",
ROLE_PAI))

GLOBAL_LIST_INIT(command_positions, original_command_positions | alt_command_positions)
Expand Down