diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index d1ba9df2cd..0b32747f03 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -58,9 +58,14 @@ #define JOB_AI "AI" #define JOB_CYBORG "Cyborg" - -#define JOB_ALT_ASSISTANT "Assistant" -#define JOB_ALT_RESIDENT "Resident" +// Offduty jobs +#define JOB_OFFDUTY_OFFICER "Off-duty Officer" +#define JOB_OFFDUTY_ENGINEER "Off-duty Engineer" +#define JOB_OFFDUTY_MEDIC "Off-duty Medic" +#define JOB_OFFDUTY_SCIENTIST "Off-duty Scientist" +#define JOB_OFFDUTY_CARGO "Off-duty Cargo" +#define JOB_OFFDUTY_EXPLORER "Off-duty Explorer" +#define JOB_OFFDUTY_WORKER "Off-duty Worker" // Talom jobs #define JOB_TALON_CAPTAIN "Talon Captain" @@ -70,6 +75,25 @@ #define JOB_TALON_PILOT "Talon Pilot" #define JOB_TALON_MINER "Talon Miner" +// Command alt titles +// Site Manager +#define JOB_ALT_OVERSEER "Overseer" +#define JOB_ALT_FACILITY_DIRECTOR "Facility Director" +#define JOB_ALT_CHIEF_SUPERVISOR "Chief Supervisor" +#define JOB_ALT_CAPTAIN "Captain" +// HOP +#define JOB_ALT_CREW_RESOURCE_OFFICER "Crew Resources Officer" +#define JOB_ALT_DEPUTY_MANAGER "Deputy Manager" +#define JOB_ALT_STAFF_MANAGER "Staff Manager" +#define JOB_ALT_FACILITY_STEWARD "Facility Steward" +#define JOB_ALT_FIRST_MATE "First Mate" +// Secretary +#define JOB_ALT_COMMAND_LIAISON "Command Liaison" +#define JOB_ALT_COMMAND_ASSISTANT "Command Assistant" +#define JOB_ALT_COMMAND_INTERN "Command Intern" +#define JOB_ALT_BRIDGE_SECRETARY "Bridge Secretary" +#define JOB_ALT_BRIDGE_ASSISTANT "Bridge Assistant" + // Security alt titles #define JOB_ALT_FORENSIC_TECHNICIAN "Forensic Technician" #define JOB_ALT_JUNIOR_OFFICER "Junior Officer" @@ -79,11 +103,42 @@ #define JOB_ALT_PHARMACOLOGIST "Pharmacologist" #define JOB_ALT_VIROLOGIST "Virologist" -// Civilian alt titles +// Bartender alt titles +#define JOB_ALT_BARKEEPR "Barkeeper" +#define JOB_ALT_BARMAID "Barmaid" +#define JOB_ALT_BARISTA "Barista" +#define JOB_ALT_MIXOLOGIST "Mixologist" + +// Botanist alt titles #define JOB_ALT_GARDENER "Gardener" +#define JOB_ALT_HYDROPONICIST "Hydroponicist" +#define JOB_ALT_CULTIVATOR "Cultivator" +#define JOB_ALT_FARMER "Farmer" +#define JOB_ALT_FLORIST "Florist" +#define JOB_ALT_RANCHER "Rancher" + +// Chef alt titles +#define JOB_ALT_SOUSCHEF "Sous-chef" +#define JOB_ALT_COOK "Cook" +#define JOB_ALT_KITCHEN_WORKER "Kitchen Worker" + +// Service alt titles + +// Chaplain alt titles +#define JOB_ALT_COUNSELOR "Counselor" + + +// Civilian alt titles #define JOB_ALT_PASEUR "Poseur" #define JOB_ALT_APPRENTICE_ENGINEER "Apprentice Engineer" #define JOB_ALT_MEDICAL_INTERN "Medical Intern" +#define JOB_ALT_RESEARCH_INTERN "Research Intern" +#define JOB_ALT_SECURITY_CADET "Security Cadet" +#define JOB_ALT_JR_CARGO_TECH "Jr. Cargo Tech" +#define JOB_ALT_SERVER "Server" + +#define JOB_ALT_ASSISTANT "Assistant" +#define JOB_ALT_RESIDENT "Resident" // Station Robot alt titles #define JOB_ALT_ROBOT "Robot" @@ -146,107 +201,141 @@ #define JOB_BORER "Borer" #define JOB_EMERGENCY_RESPONSE_TEAM "Emergency Response Team" +/* TODO -/* - alt_titles - - - "Research Intern" = /datum/alt_title/intern_sci, - "Security Cadet" = /datum/alt_title/intern_sec, - "Jr. Cargo Tech" = /datum/alt_title/intern_crg, - "Server" = /datum/alt_title/server, - alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, - "Captain" = /datum/alt_title/captain) - alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, - "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) - alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Command Assistant" = /datum/alt_title/command_assistant, "Command Intern" = /datum/alt_title/command_intern, - "Bridge Secretary" = /datum/alt_title/bridge_secretary, "Bridge Assistant" = /datum/alt_title/bridge_assistant) - alt_titles = list("Overseer"= /datum/alt_title/overseer) - alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro) - alt_titles = list("Counselor" = /datum/alt_title/counselor) - alt_titles = list("Sous-chef" = /datum/alt_title/souschef,"Cook" = /datum/alt_title/cook, "Kitchen Worker" = /datum/alt_title/kitchen_worker) - alt_titles = list("Hydroponicist" = /datum/alt_title/hydroponicist, "Cultivator" = /datum/alt_title/cultivator, "Farmer" = /datum/alt_title/farmer, - JOB_ALT_GARDENER = /datum/alt_title/gardener, "Florist" = /datum/alt_title/florsit, "Rancher" = /datum/alt_title/rancher) - alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief, "Logistics Manager" = /datum/alt_title/logistics_manager, "Cargo Supervisor" = /datum/alt_title/cargo_supervisor) - alt_titles = list("Cargo Loader" = /datum/alt_title/cargo_loader, "Cargo Handler" = /datum/alt_title/cargo_handler, "Supply Courier" = /datum/alt_title/supply_courier, - "Disposals Sorter" = /datum/alt_title/disposal_sorter) - alt_titles = list("Deep Space Miner" = /datum/alt_title/deep_space_miner, "Drill Technician" = /datum/alt_title/drill_tech, "Prospector" = /datum/alt_title/prospector, - "Excavator" = /datum/alt_title/excavator) - alt_titles = list("Custodian" = /datum/alt_title/custodian, "Sanitation Technician" = /datum/alt_title/sanitation_tech, - "Maid" = /datum/alt_title/maid, "Garbage Collector" = /datum/alt_title/garbage_collector) - alt_titles = list("Journalist" = /datum/alt_title/journalist, "Reporter" = /datum/alt_title/reporter, "Writer" = /datum/alt_title/writer, - "Historian" = /datum/alt_title/historian, "Archivist" = /datum/alt_title/archivist, "Professor" = /datum/alt_title/professor, - "Academic" = /datum/alt_title/academic, "Philosopher" = /datum/alt_title/philosopher, "Curator" = /datum/alt_title/curator) - alt_titles = list("Internal Affairs Liaison" = /datum/alt_title/ia_liaison, "Internal Affairs Delegate" = /datum/alt_title/ia_delegate, - "Internal Affairs Investigator" = /datum/alt_title/ia_investigator) - alt_titles = list("Missionary" = /datum/alt_title/missionary, "Preacher" = /datum/alt_title/preacher, "Priest" = /datum/alt_title/priest, - "Nun" = /datum/alt_title/nun, "Monk" = /datum/alt_title/monk, "Counselor" = /datum/alt_title/counselor, - "Guru" = /datum/alt_title/guru) - alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman) - alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand, - "Actor" = /datum/alt_title/actor, "Dancer" = /datum/alt_title/dancer, "Singer" = /datum/alt_title/singer, - "Magician" = /datum/alt_title/magician, "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian, - "Artist" = /datum/alt_title/artist, "Game Master" = /datum/alt_title/game_master) - alt_titles = list("Lawyer" = /datum/alt_title/lawyer, "Private Eye" = /datum/alt_title/private_eye, "Bodyguard" = /datum/alt_title/bodyguard, - "Personal Physician" = /datum/alt_title/personal_physician, "Dentist" = /datum/alt_title/dentist, "Fitness Instructor" = /datum/alt_title/fitness_instructor, - "Yoga Teacher" = /datum/alt_title/yoga_teacher, "Masseuse" = /datum/alt_title/masseuse, "Tradesperson" = /datum/alt_title/tradesperson, - "Streamer" = /datum/alt_title/streamer, "Influencer" = /datum/alt_title/influencer, "Paranormal Investigator" = /datum/alt_title/paranormal_investigator, - "Personal Secretary" = /datum/alt_title/personal_secretary, "Stylist" = /datum/alt_title/stylist, "Fisher" = /datum/alt_title/fisher, - "Fortune Teller" = /datum/alt_title/fortune_teller, "Spirit Healer" = /datum/alt_title/spirit_healer) - alt_titles = list("Barista" = /datum/alt_title/barista) - alt_titles = list("Cook" = /datum/alt_title/cook) - alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief) - alt_titles = list("Drill Technician" = /datum/alt_title/drill_tech) - alt_titles = list("Custodian" = /datum/alt_title/custodian) - alt_titles = list("Journalist" = /datum/alt_title/journalist, "Writer" = /datum/alt_title/writer) - alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Foreman" = /datum/alt_title/foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager) - alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, "Engine Technician" = /datum/alt_title/engine_tech, - "Electrician" = /datum/alt_title/electrician, "Construction Engineer" = /datum/alt_title/construction_engi, "Engineering Contractor" = /datum/alt_title/engineering_contractor) - alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech, - "Fuel Technician" = /datum/alt_title/refuel_tech) - alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, - "Engine Technician" = /datum/alt_title/engine_tech, "Electrician" = /datum/alt_title/electrician) - alt_titles = list("Expedition Lead" = /datum/alt_title/expedition_lead, "Exploration Manager" = /datum/alt_title/exploration_manager) - alt_titles = list("Surveyor" = /datum/alt_title/surveyor, "Offsite Scout" = /datum/alt_title/offsite_scout) - alt_titles = list("Expedition Medic" = /datum/alt_title/expedition_medic, "Offsite Medic" = /datum/alt_title/offsite_medic) - alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medical Director" = /datum/alt_title/medical_director, "Healthcare Manager" = /datum/alt_title/healthcare_manager) - alt_titles = list("Physician" = /datum/alt_title/physician, "Medical Practitioner" = /datum/alt_title/medical_practitioner, "Surgeon" = /datum/alt_title/surgeon, - "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Orderly" = /datum/alt_title/orderly, - JOB_ALT_VIROLOGIST = /datum/alt_title/virologist, "Medical Contractor" = /datum/alt_title/medical_contractor) - alt_titles = list("Psychologist" = /datum/alt_title/psychologist, "Psychoanalyst" = /datum/alt_title/psychoanalyst, "Psychotherapist" = /datum/alt_title/psychotherapist) - alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder, "Search and Rescue" = /datum/alt_title/sar) alt_titles = list( - "Surgeon" = /datum/alt_title/surgeon, - "Emergency Physician" = /datum/alt_title/emergency_physician, - "Nurse" = /datum/alt_title/nurse, - JOB_ALT_VIROLOGIST = /datum/alt_title/virologist) - alt_titles = list("Psychologist" = /datum/alt_title/psychologist) - alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt) - alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager, - "Head of Development" = /datum/alt_title/head_of_development,"Head Scientist" = /datum/alt_title/head_scientist) - alt_titles = list("Researcher" = /datum/alt_title/researcher, "Lab Assistant" = /datum/alt_title/lab_assistant, "Xenoarchaeologist" = /datum/alt_title/xenoarch, - "Xenopaleontologist" = /datum/alt_title/xenopaleontologist, "Anomalist" = /datum/alt_title/anomalist, "Phoron Researcher" = /datum/alt_title/phoron_research, - "Gas Physicist" = /datum/alt_title/gas_physicist, "Circuit Designer" = /datum/alt_title/circuit_designer, "Circuit Programmer" = /datum/alt_title/circuit_programmer) - alt_titles = list("Xenozoologist" = /datum/alt_title/xenozoologist, "Xenoanthropologist" = /datum/alt_title/xenoanthropologist) - alt_titles = list("Assembly Technician" = /datum/alt_title/assembly_tech, "Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech) - alt_titles = list("Xenohydroponicist" = /datum/alt_title/xenohydroponicist, "Xenoflorist" = /datum/alt_title/xenoflorist) - alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor) - alt_titles = list("Xenoarchaeologist" = /datum/alt_title/xenoarch, "Anomalist" = /datum/alt_title/anomalist, \ - "Phoron Researcher" = /datum/alt_title/phoron_research) - alt_titles = list("Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech) - alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent, "Master-at-Arms" = /datum/alt_title/master_at_arms) - alt_titles = list("Investigator" = /datum/alt_title/investigator, "Security Inspector" = /datum/alt_title/security_inspector, JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech) - alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, - "Security Deputy" = /datum/alt_title/security_guard, JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer, "Security Contractor" = /datum/alt_title/security_contractor) - alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief) - alt_titles = list("Jester" = /datum/alt_title/jester, "Fool" = /datum/alt_title/fool) - - - "Technical Assistant", - JOB_ALT_MEDICAL_INTERN, - "Research Assistant", - - - "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, - "Explorer Medic" = /decl/hierarchy/outfit/job/explorer2/medic) - +- "Supply Chief" +- "Logistics Manager" +- "Cargo Supervisor" +- "Cargo Loader" +- "Cargo Handler" +- "Supply Courier" +- "Disposals Sorter" +- "Deep Space Miner" +- "Drill Technician" +- "Prospector" +- "Excavator" +- "Custodian" +- "Sanitation Technician" +- "Maid" +- "Garbage Collector" +- "Journalist" +- "Reporter" +- "Writer" +- "Historian" +- "Archivist" +- "Professor" +- "Academic" +- "Philosopher" +- "Curator" +- "Internal Affairs Liaison" +- "Internal Affairs Delegate" +- "Internal Affairs Investigator" +- "Missionary" +- "Preacher" +- "Priest" +- "Nun" +- "Monk" +- "Guru" +- "Co-Pilot" +- "Navigator" +- "Helmsman" +- "Performer" +- "Musician" +- "Stagehand" +- "Actor" +- "Dancer" +- "Singer" +- "Magician" +- "Comedian" +- "Tragedian" +- "Artist" +- "Game Master" +- "Lawyer" +- "Private Eye" +- "Bodyguard" +- "Personal Physician" +- "Dentist" +- "Fitness Instructor" +- "Yoga Teacher" +- "Masseuse" +- "Tradesperson" +- "Streamer" +- "Influencer" +- "Paranormal Investigator" +- "Personal Secretary" +- "Stylist" +- "Fisher" +- "Fortune Teller" +- "Spirit Healer" +- "Barista" +- "Head Engineer" +- "Foreman" +- "Maintenance Manager" +- "Maintenance Technician" +- "Engine Technician" +- "Electrician" +- "Construction Engineer" +- "Engineering Contractor" +- "Atmospheric Engineer" +- "Atmospheric Maintainer" +- "Disposals Technician" +- "Fuel Technician" +- "Expedition Lead" +- "Exploration Manager" +- "Surveyor" +- "Offsite Scout" +- "Expedition Medic" +- "Offsite Medic" +- "Chief Physician" +- "Medical Director" +- "Healthcare Manager" +- "Physician" +- "Medical Practitioner" +- "Surgeon" +- "Emergency Physician" +- "Nurse" +- "Orderly" +- "Medical Contractor" +- "Psychologist" +- "Psychoanalyst" +- "Psychotherapist" +- "Emergency Medical Technician" +- "Medical Responder" +- "Search and Rescue" +- "Research Supervisor" +- "Research Manager" +- "Head of Development" +- "Head Scientist" +- "Researcher" +- "Lab Assistant" +- "Xenoarchaeologist" +- "Xenopaleontologist" +- "Anomalist" +- "Phoron Researcher" +- "Gas Physicist" +- "Circuit Designer" +- "Circuit Programmer" +- "Xenozoologist" +- "Xenoanthropologist" +- "Assembly Technician" +- "Biomechanical Engineer" +- "Mechatronic Engineer" +- "Xenohydroponicist" +- "Xenoflorist" +- "Brig Sentry" +- "Armory Superintendent" +- "Master-at-Arms" +- "Investigator" +- "Security Inspector" +- "Patrol Officer" +- "Security Guard" +- "Security Deputy" +- "Security Commander" +- "Chief of Security" +- "Jester" +- "Fool" +- "Technical Assistant" +- "Research Assistant" +- "Explorer Technician" +- "Explorer Medic" */ diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 0f751da5c5..5c9ba92869 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -514,12 +514,12 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, JOB_ALT_VIROLOGIST, JOB_ALT_APPRENTICE_ENGINEER, JOB_ALT_MEDICAL_INTERN, - "Research Intern", - "Security Cadet", - "Jr. Cargo Tech", - "Server", + JOB_ALT_RESEARCH_INTERN, + JOB_ALT_SECURITY_CADET, + JOB_ALT_JR_CARGO_TECH, + JOB_ALT_SERVER, "Electrician", - "Barista") + JOB_ALT_BARISTA) /var/global/list/existing_solargrubs = list() diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 47f05f18a4..9079769321 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -36,8 +36,8 @@ permit.set_name(H.real_name) /decl/hierarchy/outfit/job/service/bartender/barista - name = OUTFIT_JOB_NAME("Barista") - id_pda_assignment = "Barista" + name = OUTFIT_JOB_NAME(JOB_ALT_BARISTA) + id_pda_assignment = JOB_ALT_BARISTA backpack_contents = null /decl/hierarchy/outfit/job/service/chef @@ -49,13 +49,13 @@ pda_type = /obj/item/device/pda/chef /decl/hierarchy/outfit/job/service/chef/cook - name = OUTFIT_JOB_NAME("Cook") - id_pda_assignment = "Cook" + name = OUTFIT_JOB_NAME(JOB_ALT_COOK) + id_pda_assignment = JOB_ALT_COOK // Rykka adds Server Outfit /decl/hierarchy/outfit/job/service/server - name = OUTFIT_JOB_NAME("Server") + name = OUTFIT_JOB_NAME(JOB_ALT_SERVER) uniform = /obj/item/clothing/under/waiter // End Outfit addition diff --git a/code/datums/outfits/jobs/command.dm b/code/datums/outfits/jobs/command.dm index 30d04758dd..b562260635 100644 --- a/code/datums/outfits/jobs/command.dm +++ b/code/datums/outfits/jobs/command.dm @@ -1,5 +1,5 @@ /decl/hierarchy/outfit/job/captain - name = OUTFIT_JOB_NAME("Captain") // Keep Captain for now, not JOB_SITE_MANAGER + name = OUTFIT_JOB_NAME(JOB_ALT_CAPTAIN) // Keep Captain for now, not JOB_SITE_MANAGER glasses = /obj/item/clothing/glasses/sunglasses uniform = /obj/item/clothing/under/rank/captain l_ear = /obj/item/device/radio/headset/heads/captain diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index d440291f0e..ea51dc6a47 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -18,10 +18,10 @@ outfit_type = /decl/hierarchy/outfit/job/assistant/intern alt_titles = list(JOB_ALT_APPRENTICE_ENGINEER = /datum/alt_title/intern_eng, JOB_ALT_MEDICAL_INTERN = /datum/alt_title/intern_med, - "Research Intern" = /datum/alt_title/intern_sci, - "Security Cadet" = /datum/alt_title/intern_sec, - "Jr. Cargo Tech" = /datum/alt_title/intern_crg, - "Server" = /datum/alt_title/server, + JOB_ALT_RESEARCH_INTERN = /datum/alt_title/intern_sci, + JOB_ALT_SECURITY_CADET = /datum/alt_title/intern_sec, + JOB_ALT_JR_CARGO_TECH = /datum/alt_title/intern_crg, + JOB_ALT_SERVER = /datum/alt_title/server, JOB_ALT_ASSISTANT = /datum/alt_title/assistant) job_description = "An " + JOB_INTERN + " does whatever is requested of them, often doing so in process of learning \ another job. Though they are part of the crew, they have no real authority." @@ -41,21 +41,21 @@ title_outfit = /decl/hierarchy/outfit/job/assistant/medic /datum/alt_title/intern_sci - title = "Research Intern" - title_blurb = "A Research Intern attempts to provide whatever the Research department needs. They are not proper " + JOB_SCIENTIST + "s, and are \ - often in training to become a " + JOB_SCIENTIST + ". A Research Intern has no real authority." + title = JOB_ALT_RESEARCH_INTERN + title_blurb = "A " + JOB_ALT_RESEARCH_INTERN + " attempts to provide whatever the Research department needs. They are not proper " + JOB_SCIENTIST + "s, and are \ + often in training to become a " + JOB_SCIENTIST + ". A " + JOB_ALT_RESEARCH_INTERN + " has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/scientist /datum/alt_title/intern_sec - title = "Security Cadet" - title_blurb = "A Security Cadet attempts to provide whatever the Security department needs. They are not proper Officers, and are \ - often in training to become an Officer. A Security Cadet has no real authority." + title = JOB_ALT_SECURITY_CADET + title_blurb = "A " + JOB_ALT_SECURITY_CADET + " attempts to provide whatever the Security department needs. They are not proper Officers, and are \ + often in training to become an Officer. A " + JOB_ALT_SECURITY_CADET + " has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/officer /datum/alt_title/intern_crg - title = "Jr. Cargo Tech" - title_blurb = "A Jr. Cargo Tech attempts to provide whatever the Cargo department needs. They are not proper Cargo Technicians, and are \ - often in training to become a " + JOB_CARGO_TECHNICIAN + ". A Jr. Cargo Tech has no real authority." + title = JOB_ALT_JR_CARGO_TECH + title_blurb = "A " + JOB_ALT_JR_CARGO_TECH + " attempts to provide whatever the Cargo department needs. They are not proper Cargo Technicians, and are \ + often in training to become a " + JOB_CARGO_TECHNICIAN + ". A " + JOB_ALT_JR_CARGO_TECH + " has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/cargo /* /datum/alt_title/intern_exp @@ -65,8 +65,8 @@ title_outfit = /decl/hierarchy/outfit/job/assistant/explorer */ /datum/alt_title/server - title = "Server" - title_blurb = "A Server helps out kitchen and diner staff with various tasks, primarily food delivery. A Server has no real authority." + title = JOB_ALT_SERVER + title_blurb = "A " + JOB_ALT_SERVER + " helps out kitchen and diner staff with various tasks, primarily food delivery. A " + JOB_ALT_SERVER + " has no real authority." title_outfit = /decl/hierarchy/outfit/job/service/server /datum/alt_title/assistant diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 64c75487c8..6c16ac4376 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -32,7 +32,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) job_description = "The " + JOB_SITE_MANAGER + " manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \ they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The " + JOB_SITE_MANAGER + " is expected to \ have an understanding of Standard Operating Procedure, and is subject to it, and legal action, in the same way as every other crew member." - alt_titles = list("Overseer"= /datum/alt_title/overseer) + alt_titles = list(JOB_ALT_OVERSEER= /datum/alt_title/overseer) /* @@ -48,7 +48,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) // Captain Alt Titles /datum/alt_title/overseer - title = "Overseer" + title = JOB_ALT_OVERSEER ////////////////////////////////// // Head of Personnel @@ -79,7 +79,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) job_description = "The " + JOB_HEAD_OF_PERSONNEL + " manages the Service department, the Exploration team, and most other civilians. They also \ manage the Supply department, through the " + JOB_QUARTERMASTER + ". In addition, the " + JOB_HEAD_OF_PERSONNEL + " oversees the personal accounts \ of the crew, including their money and access. If necessary, the " + JOB_HEAD_OF_PERSONNEL + " is first in line to assume Acting Command." - alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro) + alt_titles = list(JOB_ALT_CREW_RESOURCE_OFFICER = /datum/alt_title/cro) access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, @@ -96,7 +96,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) // HOP Alt Titles /datum/alt_title/cro - title = "Crew Resources Officer" + title = JOB_ALT_CREW_RESOURCE_OFFICER ////////////////////////////////// // Command Secretary diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index 3e2541bdec..c127d8dfd4 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -2,17 +2,17 @@ disallow_jobhop = TRUE pto_type = PTO_CIVILIAN dept_time_required = 80 //Pending something more complicated - alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, - "Captain" = /datum/alt_title/captain) + alt_titles = list(JOB_ALT_OVERSEER= /datum/alt_title/overseer, JOB_ALT_FACILITY_DIRECTOR = /datum/alt_title/facility_director, JOB_ALT_CHIEF_SUPERVISOR = /datum/alt_title/chief_supervisor, + JOB_ALT_CAPTAIN = /datum/alt_title/captain) /datum/alt_title/facility_director - title = "Facility Director" + title = JOB_ALT_FACILITY_DIRECTOR /datum/alt_title/chief_supervisor - title = "Chief Supervisor" + title = JOB_ALT_CHIEF_SUPERVISOR /datum/alt_title/captain - title = "Captain" + title = JOB_ALT_CAPTAIN /datum/job/captain/get_request_reasons() return list("Training crew", "Assembling expedition team") @@ -24,8 +24,8 @@ departments_managed = list(DEPARTMENT_CIVILIAN, DEPARTMENT_CARGO, DEPARTMENT_PLANET) dept_time_required = 60 - alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, - "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) + alt_titles = list(JOB_ALT_CREW_RESOURCE_OFFICER = /datum/alt_title/cro, JOB_ALT_DEPUTY_MANAGER = /datum/alt_title/deputy_manager, JOB_ALT_STAFF_MANAGER = /datum/alt_title/staff_manager, + JOB_ALT_FACILITY_STEWARD = /datum/alt_title/facility_steward, JOB_ALT_FIRST_MATE = /datum/alt_title/first_mate) access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, @@ -41,16 +41,16 @@ access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway, access_entertainment) /datum/alt_title/deputy_manager - title = "Deputy Manager" + title = JOB_ALT_DEPUTY_MANAGER /datum/alt_title/staff_manager - title = "Staff Manager" + title = JOB_ALT_STAFF_MANAGER /datum/alt_title/facility_steward - title = "Facility Steward" + title = JOB_ALT_FACILITY_STEWARD /datum/alt_title/first_mate - title = "First Mate" + title = JOB_ALT_FIRST_MATE /datum/job/hop/get_request_reasons() return list("ID modification", "Training crew", "Assembling expedition team") @@ -59,20 +59,20 @@ /datum/job/secretary disallow_jobhop = TRUE pto_type = PTO_CIVILIAN - alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Command Assistant" = /datum/alt_title/command_assistant, "Command Intern" = /datum/alt_title/command_intern, - "Bridge Secretary" = /datum/alt_title/bridge_secretary, "Bridge Assistant" = /datum/alt_title/bridge_assistant) + alt_titles = list(JOB_ALT_COMMAND_LIAISON = /datum/alt_title/command_liaison, JOB_ALT_COMMAND_ASSISTANT = /datum/alt_title/command_assistant, JOB_ALT_COMMAND_INTERN = /datum/alt_title/command_intern, + JOB_ALT_BRIDGE_SECRETARY = /datum/alt_title/bridge_secretary, JOB_ALT_BRIDGE_ASSISTANT = /datum/alt_title/bridge_assistant) /datum/alt_title/command_liaison - title = "Command Liaison" + title = JOB_ALT_COMMAND_LIAISON /datum/alt_title/command_assistant - title = "Command Assistant" + title = JOB_ALT_COMMAND_ASSISTANT /datum/alt_title/command_intern - title = "Command Intern" + title = JOB_ALT_COMMAND_INTERN /datum/alt_title/bridge_secretary - title = "Bridge Secretary" + title = JOB_ALT_BRIDGE_SECRETARY /datum/alt_title/bridge_assistant - title = "Bridge Assistant" + title = JOB_ALT_BRIDGE_ASSISTANT diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 745eed5376..2d0f3363d6 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -19,12 +19,12 @@ outfit_type = /decl/hierarchy/outfit/job/service/bartender job_description = "A " + JOB_BARTENDER + " mixes drinks for the crew. They generally have permission to charge for drinks or deny service to unruly patrons." - alt_titles = list("Barista" = /datum/alt_title/barista) + alt_titles = list(JOB_ALT_BARISTA = /datum/alt_title/barista) // Bartender Alt Titles /datum/alt_title/barista - title = "Barista" - title_blurb = "A barista mans the Cafe, serving primarily non-alcoholic drinks to the crew. They generally have permission to charge for drinks \ + title = JOB_ALT_BARISTA + title_blurb = "A " + JOB_ALT_BARISTA + " mans the Cafe, serving primarily non-alcoholic drinks to the crew. They generally have permission to charge for drinks \ or deny service to unruly patrons." title_outfit = /decl/hierarchy/outfit/job/service/bartender/barista @@ -47,12 +47,12 @@ outfit_type = /decl/hierarchy/outfit/job/service/chef job_description = "A " + JOB_CHEF + " cooks food for the crew. They generally have permission to charge for food or deny service to unruly diners." - alt_titles = list("Cook" = /datum/alt_title/cook) + alt_titles = list(JOB_ALT_COOK = /datum/alt_title/cook) // Chef Alt Titles /datum/alt_title/cook - title = "Cook" - title_blurb = "A Cook has the same duties, though they may be less experienced." + title = JOB_ALT_COOK + title_blurb = "A " + JOB_ALT_COOK + " has the same duties, though they may be less experienced." ////////////////////////////////// // Botanist diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 87fe566151..afeac415c9 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -14,12 +14,12 @@ outfit_type = /decl/hierarchy/outfit/job/chaplain job_description = "The " + JOB_CHAPLAIN + " ministers to the spiritual needs of the crew." - alt_titles = list("Counselor" = /datum/alt_title/counselor) + alt_titles = list(JOB_ALT_COUNSELOR = /datum/alt_title/counselor) // Chaplain Alt Titles /datum/alt_title/counselor - title = "Counselor" - title_blurb = "The Counselor attends to the emotional needs of the crew, without a specific medicinal or spiritual focus." + title = JOB_ALT_COUNSELOR + title_blurb = "The " + JOB_ALT_COUNSELOR + " attends to the emotional needs of the crew, without a specific medicinal or spiritual focus." /datum/job/chaplain/equip(var/mob/living/carbon/human/H, var/alt_title, var/ask_questions = TRUE) . = ..() diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index b556918737..fb71c85b53 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -1,53 +1,53 @@ /datum/job/bartender pto_type = PTO_CIVILIAN - alt_titles = list("Barkeeper" = /datum/alt_title/barkeeper, "Barmaid" = /datum/alt_title/barmaid, "Barista" = /datum/alt_title/barista, "Mixologist" = /datum/alt_title/mixologist) + alt_titles = list(JOB_ALT_BARKEEPR = /datum/alt_title/barkeeper, JOB_ALT_BARMAID = /datum/alt_title/barmaid, JOB_ALT_BARISTA = /datum/alt_title/barista, JOB_ALT_MIXOLOGIST = /datum/alt_title/mixologist) /datum/alt_title/barkeeper - title = "Barkeeper" + title = JOB_ALT_BARKEEPR /datum/alt_title/barmaid - title = "Barmaid" + title = JOB_ALT_BARMAID /datum/alt_title/mixologist - title = "Mixologist" + title = JOB_ALT_MIXOLOGIST /datum/job/chef total_positions = 2 //IT TAKES A LOT TO MAKE A STEW spawn_positions = 2 //A PINCH OF SALT AND LAUGHTER, TOO pto_type = PTO_CIVILIAN - alt_titles = list("Sous-chef" = /datum/alt_title/souschef,"Cook" = /datum/alt_title/cook, "Kitchen Worker" = /datum/alt_title/kitchen_worker) + alt_titles = list(JOB_ALT_SOUSCHEF = /datum/alt_title/souschef, JOB_ALT_COOK = /datum/alt_title/cook, JOB_ALT_KITCHEN_WORKER = /datum/alt_title/kitchen_worker) /datum/alt_title/souschef - title = "Sous-chef" + title = JOB_ALT_SOUSCHEF /datum/alt_title/kitchen_worker - title = "Kitchen Worker" - title_blurb = "A Kitchen Worker has the same duties, though they may be less experienced." + title = JOB_ALT_KITCHEN_WORKER + title_blurb = "A " + JOB_ALT_KITCHEN_WORKER + " has the same duties, though they may be less experienced." /datum/job/hydro spawn_positions = 2 pto_type = PTO_CIVILIAN - alt_titles = list("Hydroponicist" = /datum/alt_title/hydroponicist, "Cultivator" = /datum/alt_title/cultivator, "Farmer" = /datum/alt_title/farmer, - JOB_ALT_GARDENER = /datum/alt_title/gardener, "Florist" = /datum/alt_title/florsit, "Rancher" = /datum/alt_title/rancher) + alt_titles = list(JOB_ALT_HYDROPONICIST = /datum/alt_title/hydroponicist, JOB_ALT_CULTIVATOR = /datum/alt_title/cultivator, JOB_ALT_FARMER = /datum/alt_title/farmer, + JOB_ALT_GARDENER = /datum/alt_title/gardener, JOB_ALT_FLORIST = /datum/alt_title/florsit, JOB_ALT_RANCHER = /datum/alt_title/rancher) /datum/alt_title/hydroponicist - title = "Hydroponicist" + title = JOB_ALT_HYDROPONICIST /datum/alt_title/cultivator - title = "Cultivator" + title = JOB_ALT_CULTIVATOR /datum/alt_title/farmer - title = "Farmer" + title = JOB_ALT_FARMER /datum/alt_title/florsit - title = "Florist" - title_blurb = "A Florist may be less professional than their counterparts, and are more likely to tend to the public gardens if they aren't needed elsewhere." + title = JOB_ALT_FLORIST + title_blurb = "A " + JOB_ALT_FLORIST + " may be less professional than their counterparts, and are more likely to tend to the public gardens if they aren't needed elsewhere." /datum/alt_title/rancher - title = "Rancher" - title_blurb = "A Rancher is tasked with the care, feeding, raising, and harvesting of livestock." + title = JOB_ALT_RANCHER + title_blurb = "A " + JOB_ALT_RANCHER + " is tasked with the care, feeding, raising, and harvesting of livestock." /datum/job/qm @@ -183,7 +183,7 @@ /datum/job/chaplain pto_type = PTO_CIVILIAN alt_titles = list("Missionary" = /datum/alt_title/missionary, "Preacher" = /datum/alt_title/preacher, "Priest" = /datum/alt_title/priest, - "Nun" = /datum/alt_title/nun, "Monk" = /datum/alt_title/monk, "Counselor" = /datum/alt_title/counselor, + "Nun" = /datum/alt_title/nun, "Monk" = /datum/alt_title/monk, JOB_ALT_COUNSELOR = /datum/alt_title/counselor, "Guru" = /datum/alt_title/guru) /datum/alt_title/guru diff --git a/code/game/jobs/job/offduty_vr.dm b/code/game/jobs/job/offduty_vr.dm index a3cda63230..951869d5b0 100644 --- a/code/game/jobs/job/offduty_vr.dm +++ b/code/game/jobs/job/offduty_vr.dm @@ -3,7 +3,7 @@ // /datum/job/offduty_civilian - title = "Off-duty Worker" + title = JOB_OFFDUTY_WORKER latejoin_only = TRUE timeoff_factor = -1 total_positions = -1 @@ -19,7 +19,7 @@ economic_modifier = 2 /datum/job/offduty_cargo - title = "Off-duty Cargo" + title = JOB_OFFDUTY_CARGO latejoin_only = TRUE timeoff_factor = -1 total_positions = -1 @@ -35,7 +35,7 @@ economic_modifier = 2 /datum/job/offduty_engineering - title = "Off-duty Engineer" + title = JOB_OFFDUTY_ENGINEER latejoin_only = TRUE timeoff_factor = -1 total_positions = -1 @@ -51,7 +51,7 @@ economic_modifier = 5 /datum/job/offduty_medical - title = "Off-duty Medic" + title = JOB_OFFDUTY_MEDIC latejoin_only = TRUE timeoff_factor = -1 total_positions = -1 @@ -67,7 +67,7 @@ economic_modifier = 5 /datum/job/offduty_science - title = "Off-duty Scientist" + title = JOB_OFFDUTY_SCIENTIST latejoin_only = TRUE timeoff_factor = -1 total_positions = -1 @@ -83,7 +83,7 @@ economic_modifier = 5 /datum/job/offduty_security - title = "Off-duty Officer" + title = JOB_OFFDUTY_OFFICER latejoin_only = TRUE timeoff_factor = -1 total_positions = -1 @@ -99,7 +99,7 @@ economic_modifier = 4 /datum/job/offduty_exploration - title = "Off-duty Explorer" + title = JOB_OFFDUTY_EXPLORER latejoin_only = TRUE timeoff_factor = -1 total_positions = -1 diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index 754ee53b58..d5c5a1d082 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -244,6 +244,7 @@ /obj/item/weapon/card/id/civilian/internal_affairs name = "Internal Affairs ID" initial_sprite_stack = list("base-stamp", "top-blue", "stamp-n", "stripe-black") + rank = JOB_INTERNAL_AFFAIRS_AGENT //Service @@ -302,10 +303,12 @@ /obj/item/weapon/card/id/talon/engineer name = "Talon Engineering ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-orange", "stripe-orange") + rank = JOB_TALON_ENGINEER /obj/item/weapon/card/id/talon/officer name = "Talon Security ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-red", "stripe-red") + rank = JOB_TALON_GUARD /obj/item/weapon/card/id/talon/pilot name = JOB_TALON_PILOT + " ID" @@ -315,6 +318,7 @@ /obj/item/weapon/card/id/talon/miner name = "Talon Mining ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-brown", "stripe-brown") + rank = JOB_TALON_MINER /obj/item/weapon/card/id/talon/captain name = JOB_TALON_CAPTAIN + " ID" diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index a6a8e3b38f..b6bd90e1cc 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -409,10 +409,10 @@ rank = JOB_PILOT /obj/item/weapon/card/id/event/accessset/itg/crew/service - name = "\improper ITG Cook's ID" - desc = "An ID card belonging to the Cook of an ITG vessel. The Cook's responsibility is primarily to provide sustinence to the crew and passengers. The Cook answers to the Passenger Liason. In the absence of a Passenger Liason, the Cook is also responsible for tending to passenger related care and duties." - assignment = "Cook" - rank = "Cook" + name = "\improper ITG " + JOB_ALT_COOK + "'s ID" + desc = "An ID card belonging to the " + JOB_ALT_COOK + " of an ITG vessel. The " + JOB_ALT_COOK + "'s responsibility is primarily to provide sustinence to the crew and passengers. The " + JOB_ALT_COOK + " answers to the Passenger Liason. In the absence of a Passenger Liason, the " + JOB_ALT_COOK + " is also responsible for tending to passenger related care and duties." + assignment = JOB_ALT_COOK + rank = JOB_ALT_COOK icon_state = "itg_green" /obj/item/weapon/card/id/event/accessset/itg/crew/security @@ -451,10 +451,10 @@ icon_state = "itg_blue" /obj/item/weapon/card/id/event/accessset/itg/crew/captain - name = "\improper ITG Captain's ID" + name = "\improper ITG " + JOB_ALT_CAPTAIN + "'s ID" desc = "An ID card belonging to the Captain of an ITG vessel. The Captain's responsibility is primarily to manage crew to ensure smooth ship operations. Captains often also often pilot the vessel when no dedicated pilot is assigned." - assignment = "Captain" - rank = "Captain" + assignment = JOB_ALT_CAPTAIN + rank = JOB_ALT_CAPTAIN icon_state = "itg_blue" access = list(777, 778) @@ -556,13 +556,13 @@ JOB_TALON_DOCTOR = "itg_white", JOB_ATMOSPHERIC_TECHNICIAN = "itg_orange", JOB_ENGINEER = "itg_orange", - "Off-duty Officer" = "itg_red", - "Off-duty Engineer" = "itg_orange", - "Off-duty Medic" = "itg_white", - "Off-duty Scientist" = "itg_purple", - "Off-duty Cargo" = "itg", - "Off-duty Explorer" = "itg_purple", - "Off-duty Worker" = "itg_green" + JOB_OFFDUTY_OFFICER = "itg_red", + JOB_OFFDUTY_ENGINEER = "itg_orange", + JOB_OFFDUTY_MEDIC = "itg_white", + JOB_OFFDUTY_SCIENTIST = "itg_purple", + JOB_OFFDUTY_CARGO = "itg", + JOB_OFFDUTY_EXPLORER = "itg_purple", + JOB_OFFDUTY_WORKER = "itg_green" ) var/guess = jobs_to_icon[user.job] diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 6b48b90258..2252c5a58b 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -296,11 +296,11 @@ corpseidjob = "Mercenary" /obj/effect/landmark/corpse/vintage/officer - name = "Unknown Captain" + name = "Unknown " + JOB_ALT_CAPTAIN corpsesuit = /obj/item/clothing/suit/space/void/refurb/officer corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/officer corpseback = /obj/item/weapon/tank/oxygen/yellow - corpseidjob = "Captain" + corpseidjob = JOB_ALT_CAPTAIN /obj/effect/landmark/corpse/vintage/pilot name = "Unknown " + JOB_PILOT @@ -325,7 +325,7 @@ corpseglasses = /obj/item/clothing/glasses/sunglasses corpseid = 1 corpseidjob = "Bridge Officer" - corpseidaccess = "Captain" + corpseidaccess = JOB_ALT_CAPTAIN /obj/effect/landmark/corpse/commander name = "Commander" @@ -340,7 +340,7 @@ corpsepocket1 = /obj/item/weapon/flame/lighter/zippo corpseid = 1 corpseidjob = "Commander" - corpseidaccess = "Captain" + corpseidaccess = JOB_ALT_CAPTAIN /////////////////Lore Factions////////////////////// diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 3eb13d784c..9bd3b321ee 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -1505,7 +1505,7 @@ slot = slot_glasses ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, "Off-duty Medic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, JOB_OFFDUTY_MEDIC) /datum/gear/fluff/tempest_hypospray path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest @@ -1513,7 +1513,7 @@ slot = slot_belt ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, "Off-duty Medic") + allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC, JOB_OFFDUTY_MEDIC) /datum/gear/fluff/tempest_backpack path = /obj/item/weapon/storage/backpack/saddlebag/tempest