From 34390cc66b394bfa525c6aa2dd53eec9a96f848c Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Thu, 19 Aug 2021 22:35:13 +0100 Subject: [PATCH 1/3] Fixes --- code/modules/jobs/job_types/assistant.dm | 2 +- .../jobs/job_types/atmospheric_technician.dm | 2 +- code/modules/jobs/job_types/chaplain.dm | 2 +- code/modules/jobs/job_types/chief_engineer.dm | 2 +- code/modules/jobs/job_types/cyborg.dm | 2 +- .../jobs/job_types/head_of_personnel.dm | 2 +- code/modules/jobs/job_types/medical_doctor.dm | 2 +- code/modules/jobs/job_types/scientist.dm | 2 +- .../modules/jobs/job_types/security_officer.dm | 2 +- code/modules/jobs/job_types/warden.dm | 2 +- code/modules/jobs/jobs.dm | 18 +++++++++--------- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index ce2353de5bb9..2ba1ee587520 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -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 diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 8c46a483bbcf..f6eb729f72c8 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -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 diff --git a/code/modules/jobs/job_types/chaplain.dm b/code/modules/jobs/job_types/chaplain.dm index 8f4bff90ab97..4ea295f1a711 100644 --- a/code/modules/jobs/job_types/chaplain.dm +++ b/code/modules/jobs/job_types/chaplain.dm @@ -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) diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 6630586a7681..4e5c78b64cdd 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -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 diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index a9babf2ba89c..157ef3951894 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -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 diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 28e923c571fb..29df1103c986 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -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 diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 37070fc29b83..3dd910f1f4fb 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -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 diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index a9a4f0b0d021..6a8e88ea011c 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -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 diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 47ede25e69ee..93cce0cda2f7 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -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() diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 301c2549b1bd..746267b848ea 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -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", "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() diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 9c7f5b4abc03..02bb740fb846 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -61,7 +61,7 @@ GLOBAL_LIST_INIT(original_nonhuman_positions, list( GLOBAL_LIST_INIT(alt_command_positions, list( "Station Commander", "Facility Overseer", - "Chief of Staff", "Head of Internal Affairs", + "Chief of Staff", "Head of Internal Affairs", "First Officer", "Security Commander", "Security Chief", "Head of Engineering", "Engineering Director", "Chief Science Officer", "Head of Research", @@ -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", @@ -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( @@ -102,10 +102,10 @@ 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" @@ -113,14 +113,14 @@ GLOBAL_LIST_INIT(alt_civilian_positions, list( 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) From d89306fc816bda3f82fa80fa626f0fd3ba00c4f0 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Thu, 19 Aug 2021 22:36:19 +0100 Subject: [PATCH 2/3] Cap --- code/modules/jobs/job_types/captain.dm | 2 +- code/modules/jobs/jobs.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index f9777f17a9b3..ed41d6e3f60f 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -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 diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 02bb740fb846..687d1aa2eeea 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -60,7 +60,7 @@ GLOBAL_LIST_INIT(original_nonhuman_positions, list( ROLE_PAI)) GLOBAL_LIST_INIT(alt_command_positions, list( - "Station Commander", "Facility Overseer", + "Station Commander", "Facility Director", "Chief of Staff", "Head of Internal Affairs", "First Officer", "Security Commander", "Security Chief", "Head of Engineering", "Engineering Director", From b33661fcf9a8fe15a1e6f456ba753eb8141b62f1 Mon Sep 17 00:00:00 2001 From: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Thu, 19 Aug 2021 22:43:40 +0100 Subject: [PATCH 3/3] eee --- code/modules/jobs/job_types/warden.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index 746267b848ea..f187aef28686 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -16,7 +16,7 @@ outfit = /datum/outfit/job/warden - alt_titles = list("Brig Watchman", "Brig Superintendent", "Staff Sergeant", "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()