diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 0b32747f03..d3b9adc0a5 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -1,64 +1,264 @@ // Station Command jobs #define JOB_SITE_MANAGER "Site Manager" + // Site Manager alt titles + #define JOB_ALT_OVERSEER "Overseer" + #define JOB_ALT_FACILITY_DIRECTOR "Facility Director" + #define JOB_ALT_CHIEF_SUPERVISOR "Chief Supervisor" + #define JOB_ALT_CAPTAIN "Captain" + #define JOB_HEAD_OF_PERSONNEL "Head of Personnel" + // Head of Personnel alt titles + #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" + #define JOB_COMMAND_SECRETARY "Command Secretary" + // Command Secretary alt titles + #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" + #define JOB_HEAD_OF_SECURITY "Head of Security" + // Head of Security alt titles + #define JOB_ALT_SECURITY_COMMANDER "Security Commander" + #define JOB_ALT_CHIEF_OF_SECURITY "Chief of Security" + #define JOB_ALT_SECURITY_MANAGER "Security Manager" + #define JOB_CHIEF_ENGINEER "Chief Engineer" + // Cheif Engineer alt titles + #define JOB_ALT_HEAD_ENGINEER "Head Engineer" + #define JOB_ALT_FOREMAN "Foreman" + #define JOB_ALT_MAINTENANCE_MANAGER "Maintenance Manager" + #define JOB_RESEARCH_DIRECTOR "Research Director" + // Research Director alt titles + #define JOB_ALT_RESEARCH_SUPERVISOR "Research Supervisor" + #define JOB_ALT_RESEARCH_MANAGER "Research Manager" + #define JOB_ALT_HEAD_OF_DEVELOPMENT "Head of Development" + #define JOB_ALT_HEAD_SCIENTIST "Head Scientist" + #define JOB_CHIEF_MEDICAL_OFFICER "Chief Medical Officer" + // Chief Medical Officer alt titles + #define JOB_ALT_CHIEF_PHYSICIAN "Chief Physician" + #define JOB_ALT_MEDICAL_DIRECTOR "Medical Director" + #define JOB_ALT_HEALTHCARE_MANAGER "Healthcare Manager" + #define JOB_QUARTERMASTER "Quartermaster" + // Quartermaster alt titles + #define JOB_ALT_SUPPLY_CHIEF "Supply Chief" + #define JOB_ALT_LOGISTICS_MANAGER "Logistics Manager" + #define JOB_ALT_CARGO_SUPERVISOR "Cargo Supervisor" + #define JOB_PATHFINDER "Away Team Leader" // was Pathfinder + // Pathfinder alt titles + #define JOB_ALT_EXPEDITION_LEAD "Expedition Lead" + #define JOB_ALT_EXPLORATION_MANAGER "Exploration Manager" +//___________________________________________________________ -// Station Security jobs -#define JOB_WARDEN "Warden" -#define JOB_DETECTIVE "Detective" -#define JOB_SECURITY_OFFICER "Security Officer" -// Station Engineering jobs -#define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" -#define JOB_ENGINEER "Engineer" +// Station Assistant jobs +#define JOB_INTERN "Intern" + // Intern alt titles + #define JOB_ALT_APPRENTICE_ENGINEER "Apprentice Engineer" + #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" + //Assistant/Visitor/Whatever + #define JOB_ALT_TECHNICAL_ASSISTANT "Technical Assistant" + #define JOB_ALT_MEDICAL_INTERN "Medical Intern" + #define JOB_ALT_RESEARCH_ASSISTANT "Research Assistant" + #define JOB_ALT_VISITOR "Visitor" + #define JOB_ALT_RESIDENT "Resident" +//___________________________________________________________ -// Station Medical jobs -#define JOB_CHEMIST "Chemist" -#define JOB_MEDICAL_DOCTOR "Medical Doctor" -#define JOB_PARAMEDIC "Paramedic" -#define JOB_PSYCHIATRIST "Psychiatrist" -#define JOB_GENETICIST "Geneticist" //Disabled atm - -// Station Science jobs -#define JOB_ROBOTICIST "Roboticist" -#define JOB_SCIENTIST "Scientist" -#define JOB_XENOBIOLOGIST "Xenobiologist" -#define JOB_XENOBOTANIST "Xenobotanist" - -// Station Cargo jobs -#define JOB_SHAFT_MINER "Shaft Miner" -#define JOB_CARGO_TECHNICIAN "Cargo Technician" - -// Section Explo jobs -#define JOB_EXPLORER "Away Team" // was Explorer -#define JOB_FIELD_MEDIC "Away Team Medic" // was Field Medic // Station Civilian jobs #define JOB_BARTENDER "Bartender" -#define JOB_BOTANIST "Botanist" -#define JOB_CHAPLAIN "Chaplain" + // Bartender alt titles + #define JOB_ALT_BARKEEPR "Barkeeper" + #define JOB_ALT_BARMAID "Barmaid" + #define JOB_ALT_BARISTA "Barista" + #define JOB_ALT_MIXOLOGIST "Mixologist" + #define JOB_CHEF "Chef" -#define JOB_CLOWN "Clown" -#define JOB_ENTERTAINER "Entertainer" -#define JOB_ENTREPRENEUR "Entrepreneur" -#define JOB_INTERN "Intern" -#define JOB_INTERNAL_AFFAIRS_AGENT "Internal Affairs Agent" + // Chef alt titles + #define JOB_ALT_SOUSCHEF "Sous-chef" + #define JOB_ALT_COOK "Cook" + #define JOB_ALT_KITCHEN_WORKER "Kitchen Worker" + +#define JOB_BOTANIST "Botanist" + // Botanist alt titles + #define JOB_ALT_HYDROPONICIST "Hydroponicist" + #define JOB_ALT_GARDENER "Gardener" + #define JOB_ALT_CULTIVATOR "Cultivator" + #define JOB_ALT_FARMER "Farmer" + #define JOB_ALT_FLORIST "Florist" + #define JOB_ALT_RANCHER "Rancher" + +#define JOB_CARGO_TECHNICIAN "Cargo Technician" + // Cargo Technician alt titles + #define JOB_ALT_CARGO_LOADER "Cargo Loader" + #define JOB_ALT_CARGO_HANDLER "Cargo Handler" + #define JOB_ALT_SUPPLY_COURIER "Supply Courier" + #define JOB_ALT_DISPOSALS_SORTER "Disposals Sorter" + +#define JOB_SHAFT_MINER "Shaft Miner" + // Shaft Miner alt titles + #define JOB_ALT_DEEP_SPACE_MINER "Deep Space Miner" + #define JOB_ALT_DRILL_TECHNICIAN "Drill Technician" + #define JOB_ALT_PROSPECTOR "Prospector" + #define JOB_ALT_EXCAVATOR "Excavator" + #define JOB_JANITOR "Janitor" + // Janitor alt titles + #define JOB_ALT_CUSTODIAN "Custodian" + #define JOB_ALT_SANITATION_TECHNICIAN "Sanitation Technician" + #define JOB_ALT_MAID "Maid" + #define JOB_ALT_GARBAGE_COLLECTOR "Garbage Collector" + #define JOB_LIBRARIAN "Librarian" -#define JOB_MIME "Mime" + // Librarian alt titles + #define JOB_ALT_JOURNALIST "Journalist" + #define JOB_ALT_REPORTER "Reporter" + #define JOB_ALT_WRITER "Writer" + #define JOB_ALT_HISTORIAN "Historian" + #define JOB_ALT_ARCHIVIST "Archivist" + #define JOB_ALT_PROFESSOR "Professor" + #define JOB_ALT_ACADEMIC "Academic" + #define JOB_ALT_PHILOSOPHER "Philosopher" + #define JOB_ALT_CURATOR "Curator" + +#define JOB_INTERNAL_AFFAIRS_AGENT "Internal Affairs Agent" + // Internal Affairs Agent alt titles + #define JOB_ALT_INTERNAL_AFFAIRS_LIAISON "Internal Affairs Liaison" + #define JOB_ALT_INTERNAL_AFFAIRS_DELEGATE "Internal Affairs Delegate" + #define JOB_ALT_INTERNAL_AFFAIRS_INVESTIGATOR "Internal Affairs Investigator" + +#define JOB_CHAPLAIN "Chaplain" + // Chaplain alt titles + #define JOB_ALT_MISSIONARY "Missionary" + #define JOB_ALT_PREACHER "Preacher" + #define JOB_ALT_PRIEST "Priest" + #define JOB_ALT_NUN "Nun" + #define JOB_ALT_MONK "Monk" + #define JOB_ALT_COUNSELOR "Counselor" + #define JOB_ALT_GURU "Guru" + #define JOB_PILOT "Pilot" + // Pilot alt titles + #define JOB_ALT_COPILOT "Co-Pilot" + #define JOB_ALT_NAVIGATOR "Navigator" + #define JOB_ALT_HELMSMAN "Helmsman" -// Station Robot jobs -#define JOB_AI "AI" -#define JOB_CYBORG "Cyborg" +#define JOB_ENTERTAINER "Entertainer" + // Entertainer alt titles + #define JOB_ALT_PERFORMER "Performer" + #define JOB_ALT_MUSICIAN "Musician" + #define JOB_ALT_STAGEHAND "Stagehand" + #define JOB_ALT_ACTOR "Actor" + #define JOB_ALT_DANCER "Dancer" + #define JOB_ALT_SINGER "Singer" + #define JOB_ALT_MAGICIAN "Magician" + #define JOB_ALT_COMEDIAN "Comedian" + #define JOB_ALT_TRAGEDIAN "Tragedian" + #define JOB_ALT_ARTIST "Artist" + #define JOB_ALT_GAME_MASTER "Game Master" -// Offduty jobs +#define JOB_ENTREPRENEUR "Entrepreneur" + // Entrepreneur alt titles + #define JOB_ALT_LAWYER "Lawyer" + #define JOB_ALT_PRIVATE_EYE "Private Eye" + #define JOB_ALT_BODYGUARD "Bodyguard" + #define JOB_ALT_PERSONAL_PHYSICIAN "Personal Physician" + #define JOB_ALT_DENTIST "Dentist" + #define JOB_ALT_FITNESS_INSTRUCTOR "Fitness Instructor" + #define JOB_ALT_YOGA_TEACHER "Yoga Teacher" + #define JOB_ALT_MASSEUSE "Masseuse" + #define JOB_ALT_TRADESPERSON "Tradesperson" + #define JOB_ALT_STREAMER "Streamer" + #define JOB_ALT_INFLUENCER "Influencer" + #define JOB_ALT_PARANORMAL_INVESTIGATOR "Paranormal Investigator" + #define JOB_ALT_PERSONAL_SECRETARY "Personal Secretary" + #define JOB_ALT_STYLIST "Stylist" + #define JOB_ALT_FISHER "Fisher" + #define JOB_ALT_FORTUNE_TELLER "Fortune Teller" + #define JOB_ALT_SPIRIT_HEALER "Spirit Healer" +//___________________________________________________________ + + +// Station Engineering jobs +#define JOB_ENGINEER "Engineer" + // Engineer alt titles + #define JOB_ALT_MAINTENANCE_TECHNICIAN "Maintenance Technician" + #define JOB_ALT_ENGINE_TECHNICIAN "Engine Technician" + #define JOB_ALT_ELECTRICIAN "Electrician" + #define JOB_ALT_CONSTRUCTION_ENGINEER "Construction Engineer" + #define JOB_ALT_ENGINEERING_CONTRACTOR "Engineering Contractor" + +#define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician" + // Atmospheric Technician alt titles + #define JOB_ALT_ATMOSPHERIC_ENGINEER "Atmospheric Engineer" + #define JOB_ALT_ATMOSPHERIC_MAINTAINER "Atmospheric Maintainer" + #define JOB_ALT_DISPOSALS_TECHNICIAN "Disposals Technician" + #define JOB_ALT_FUEL_TECHNICIAN "Fuel Technician" +//___________________________________________________________ + + +// Station Away Team / Explorer jobs +#define JOB_EXPLORER "Away Team" // was Explorer + // Explorer alt titles + #define JOB_ALT_SURVEYOR "Surveyor" + #define JOB_ALT_OFFSITE_SCOUT "Offsite Scout" + #define JOB_ALT_EXPLORER_MEDIC "Explorer Medic" // Unused + #define JOB_ALT_EXPLORERE_TECHNICIAN "Explorer Technician" // Unused + +#define JOB_FIELD_MEDIC "Away Team Medic" // was Field Medic + // Field Medic alt titles + #define JOB_ALT_EXPEDITION_MEDIC "Expedition Medic" + #define JOB_ALT_OFFSITE_MEDIC "Offsite Medic" +//___________________________________________________________ + + +// Station Medical jobs +#define JOB_MEDICAL_DOCTOR "Medical Doctor" + // Medical Doctor alt titles + #define JOB_ALT_PHYSICIAN "Physician" + #define JOB_ALT_MEDICAL_PRACTITIONER "Medical Practitioner" + #define JOB_ALT_SURGEON "Surgeon" + #define JOB_ALT_EMERGENCY_PHYSICIAN "Emergency Physician" + #define JOB_ALT_NURSE "Nurse" + #define JOB_ALT_ORDERLY "Orderly" + #define JOB_ALT_VIROLOGIST "Virologist" + #define JOB_ALT_MEDICAL_CONTRACTOR "Medical Contractor" + +#define JOB_CHEMIST "Chemist" + // Chemist alt titles + #define JOB_ALT_PHARMACIST "Pharmacist" + #define JOB_ALT_PHARMACOLOGIST "Pharmacologist" + +#define JOB_PSYCHIATRIST "Psychiatrist" + // Psychiatrist alt titles + #define JOB_ALT_PSYCHOLOGIST "Psychologist" + #define JOB_ALT_PSYCHOANALYST "Psychoanalyst" + #define JOB_ALT_PSYCHOTHERAPIST "Psychotherapist" + +#define JOB_PARAMEDIC "Paramedic" + // Paramedic alt titles + #define JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN "Emergency Medical Technician" + #define JOB_ALT_MEDICAL_RESPONDER "Medical Responder" + #define JOB_ALT_SEARCH_AND_RESCUE "Search and Rescue" + +#define JOB_GENETICIST "Geneticist" //Disabled atm +//___________________________________________________________ + + +// Station Offduty jobs #define JOB_OFFDUTY_OFFICER "Off-duty Officer" #define JOB_OFFDUTY_ENGINEER "Off-duty Engineer" #define JOB_OFFDUTY_MEDIC "Off-duty Medic" @@ -66,94 +266,109 @@ #define JOB_OFFDUTY_CARGO "Off-duty Cargo" #define JOB_OFFDUTY_EXPLORER "Off-duty Explorer" #define JOB_OFFDUTY_WORKER "Off-duty Worker" +//___________________________________________________________ + + +// Station Science jobs +#define JOB_SCIENTIST "Scientist" + // Scientist alt titles + #define JOB_ALT_RESEARCHER "Researcher" + #define JOB_ALT_LAB_ASSISTANT "Lab Assistant" + #define JOB_ALT_XENOARCHAEOLOGIST "Xenoarchaeologist" + #define JOB_ALT_XENOPALEONTOLOGIST "Xenopaleontologist" + #define JOB_ALT_ANOMALIST "Anomalist" + #define JOB_ALT_PHORON_RESEARCHER "Phoron Researcher" + #define JOB_ALT_GAS_PHYSICIST "Gas Physicist" + #define JOB_ALT_CIRCUIT_DESIGNER "Circuit Designer" + #define JOB_ALT_CIRCUIT_PROGRAMMER "Circuit Programmer" + +#define JOB_XENOBIOLOGIST "Xenobiologist" + // Xenobiologist alt titles + #define JOB_ALT_XENOZOOLOGIST "Xenozoologist" + #define JOB_ALT_XENOANTHROPOLOGIST "Xenoanthropologist" + +#define JOB_ROBOTICIST "Roboticist" + // Roboticist alt titles + #define JOB_ALT_ASSEMBLY_TECHNICIAN "Assembly Technician" + #define JOB_ALT_BIOMECHANICAL_ENGINEER "Biomechanical Engineer" + #define JOB_ALT_MECHATRONIC_ENGINEER "Mechatronic Engineer" + +#define JOB_XENOBOTANIST "Xenobotanist" + // Xenobotanist alt titles + #define JOB_ALT_XENOHYDROPONICIST "Xenohydroponicist" + #define JOB_ALT_XENOFLORIST "Xenoflorist" +//___________________________________________________________ + + +// Station Security jobs +#define JOB_WARDEN "Warden" + // Warden alt titles + #define JOB_ALT_BRIG_SENTRY "Brig Sentry" + #define JOB_ALT_ARMORY_SUPERINTENDENT "Armory Superintendent" + #define JOB_ALT_MASTERATARMS "Master-at-Arms" + +#define JOB_DETECTIVE "Detective" + // Detective alt titles + #define JOB_ALT_INVESTIGATOR "Investigator" + #define JOB_ALT_SECURITY_INSPECTOR "Security Inspector" + #define JOB_ALT_FORENSIC_TECHNICIAN "Forensic Technician" + +#define JOB_SECURITY_OFFICER "Security Officer" + // Security Officer alt titles + #define JOB_ALT_PATROL_OFFICER "Patrol Officer" + #define JOB_ALT_SECURITY_GUARD "Security Guard" + #define JOB_ALT_SECURITY_DEPUTY "Security Deputy" + #define JOB_ALT_JUNIOR_OFFICER "Junior Officer" + #define JOB_ALT_SECURITY_CONTRACTOR "Security Contractor" +//___________________________________________________________ + + +// Station Robot jobs +#define JOB_AI "AI" + +#define JOB_CYBORG "Cyborg" + // Cyborg alt titles + #define JOB_ALT_ROBOT "Robot" + #define JOB_ALT_DRONE "Drone" +//___________________________________________________________ + + +// Station Sepcial jobs +#define JOB_CLOWN "Clown" + #define JOB_ALT_JESTER "Jester" + #define JOB_ALT_FOOL "Fool" +#define JOB_MIME "Mime" + // Mime alt titles + #define JOB_ALT_PASEUR "Poseur" +//___________________________________________________________ + // Talom jobs #define JOB_TALON_CAPTAIN "Talon Captain" + // Talon Captain alt titles + #define JOB_ALT_TALON_COMMANDER "Talon Commander" + #define JOB_TALON_DOCTOR "Talon Doctor" + // Talon Doctor alt titles + #define JOB_ALT_TALON_MEDIC "Talon Medic" + #define JOB_TALON_ENGINEER "Talon Engineer" + // Talon Engineer alt titles + #define JOB_ALT_TALON_TECHNICIAN "Talon Technician" + #define JOB_TALON_GUARD "Talon Guard" + // Talon Guard alt titles + #define JOB_ALT_TALON_SECURITY "Talon Security" + #define JOB_TALON_PILOT "Talon Pilot" + // Talon Pilot alt titles + #define JOB_ALT_TALON_HELMSMAN "Talon Helmsman" + #define JOB_TALON_MINER "Talon Miner" + // Talon Miner alt titles + #define JOB_ALT_TALON_EXCAVATOR "Talon Excavator" +//___________________________________________________________ -// 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" - -// Medical alt titles -#define JOB_ALT_PHARMACIST "Pharmacist" -#define JOB_ALT_PHARMACOLOGIST "Pharmacologist" -#define JOB_ALT_VIROLOGIST "Virologist" - -// 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" -#define JOB_ALT_DRONE "Drone" - -// Talon alt jobs -#define JOB_ALT_TALON_COMMANDER "Talon Commander" -#define JOB_ALT_TALON_MEDIC "Talon Medic" -#define JOB_ALT_TALON_TECHNICIAN "Talon Technician" -#define JOB_ALT_TALON_SECURITY "Talon Security" -#define JOB_ALT_TALON_HELMSMAN "Talon Helmsman" -#define JOB_ALT_TALON_EXCAVATOR "Talon Excavator" - -//Assistant/Visitor/Whatever -#define USELESS_JOB "Visitor" // Mind jobs #define JOB_SLIME "slime" @@ -200,142 +415,3 @@ #define JOB_XENOMORPH "Xenomorph" #define JOB_BORER "Borer" #define JOB_EMERGENCY_RESPONSE_TEAM "Emergency Response Team" - -/* TODO - -- "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/__defines/radio.dm b/code/__defines/radio.dm index 34934bedae..b39e6a90cc 100644 --- a/code/__defines/radio.dm +++ b/code/__defines/radio.dm @@ -13,7 +13,7 @@ #define CHANNEL_SCIENCE "Science" #define CHANNEL_MEDICAL "Medical" #define CHANNEL_MEDICAL_1 "Medical(I)" -#define CHANNEL_EXPLORATION "Away Team" +#define CHANNEL_EXPLORATION "Away Team" // was Explorer // Special Channels #define CHANNEL_RESPONSE_TEAM "Response Team" diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 5c9ba92869..af847b9349 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -518,7 +518,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, JOB_ALT_SECURITY_CADET, JOB_ALT_JR_CARGO_TECH, JOB_ALT_SERVER, - "Electrician", + JOB_ALT_ELECTRICIAN, JOB_ALT_BARISTA) /var/global/list/existing_solargrubs = list() diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 840ce63895..4369217c48 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -522,7 +522,7 @@ /mob/living/carbon/human/mind_initialize() . = ..() if(!mind.assigned_role) - mind.assigned_role = USELESS_JOB //defualt //VOREStation Edit - Visitor not Assistant + mind.assigned_role = JOB_ALT_VISITOR //defualt //VOREStation Edit - Visitor not Assistant //slime /mob/living/simple_mob/slime/mind_initialize() diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 9079769321..467deae4bf 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -1,10 +1,10 @@ /decl/hierarchy/outfit/job/assistant - name = OUTFIT_JOB_NAME(USELESS_JOB) //VOREStation Edit - Visitor not Assistant + name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant id_type = /obj/item/weapon/card/id/generic //VOREStation Edit /decl/hierarchy/outfit/job/assistant/visitor - name = OUTFIT_JOB_NAME(USELESS_JOB) - id_pda_assignment = USELESS_JOB + name = OUTFIT_JOB_NAME(JOB_ALT_VISITOR) + id_pda_assignment = JOB_ALT_VISITOR uniform = /obj/item/clothing/under/assistantformal //VOREStation Add - Interns diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index cda566b951..f0b370d8af 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -28,11 +28,11 @@ id_type = /obj/item/weapon/card/id/medical /decl/hierarchy/outfit/job/medical/doctor/emergency_physician - name = OUTFIT_JOB_NAME("Emergency Physician") + name = OUTFIT_JOB_NAME(JOB_ALT_EMERGENCY_PHYSICIAN) suit = /obj/item/clothing/suit/storage/toggle/fr_jacket /decl/hierarchy/outfit/job/medical/doctor/surgeon - name = OUTFIT_JOB_NAME("Surgeon") + name = OUTFIT_JOB_NAME(JOB_ALT_SURGEON) uniform = /obj/item/clothing/under/rank/medical/scrubs head = /obj/item/clothing/head/surgery/blue @@ -45,7 +45,7 @@ satchel_one = /obj/item/weapon/storage/backpack/satchel/vir /decl/hierarchy/outfit/job/medical/doctor/nurse - name = OUTFIT_JOB_NAME("Nurse") + name = OUTFIT_JOB_NAME(JOB_ALT_NURSE) suit = null /decl/hierarchy/outfit/job/medical/doctor/nurse/pre_equip(mob/living/carbon/human/H) @@ -87,7 +87,7 @@ id_type = /obj/item/weapon/card/id/medical/psych /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist - name = OUTFIT_JOB_NAME("Psychologist") + name = OUTFIT_JOB_NAME(JOB_ALT_PSYCHOLOGIST) uniform = /obj/item/clothing/under/rank/psych/turtleneck /decl/hierarchy/outfit/job/medical/paramedic @@ -102,6 +102,6 @@ flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL /decl/hierarchy/outfit/job/medical/paramedic/emt - name = OUTFIT_JOB_NAME("Emergency Medical Technician") + name = OUTFIT_JOB_NAME(JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN) uniform = /obj/item/clothing/under/rank/medical/paramedic_alt suit = /obj/item/clothing/suit/storage/toggle/labcoat/emt diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index 8dfb26a661..5337ec9a0c 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -227,9 +227,9 @@ var/datum/antagonist/raider/raiders player.equip_to_slot_or_del(new new_suit(player),slot_wear_suit) equip_weapons(player) - var/obj/item/weapon/card/id/id = create_id(USELESS_JOB, player, equip = 0) + var/obj/item/weapon/card/id/id = create_id(JOB_ALT_VISITOR, player, equip = 0) id.name = "[player.real_name]'s Passport" - id.assignment = USELESS_JOB + id.assignment = JOB_ALT_VISITOR var/obj/item/weapon/storage/wallet/W = new(player) W.handle_item_insertion(id) player.equip_to_slot_or_del(W, slot_wear_id) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 200041c02d..b86f2ad0cd 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -150,7 +150,7 @@ var/global/list/all_objectives = list() if(!istype(I)) return 1 - if(I.assignment == USELESS_JOB) //VOREStation Edit - Visitor not Assistant + if(I.assignment == JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant return 1 else return 0 diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index accb501bda..9b2f4ef277 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -2,7 +2,7 @@ // Assistant ////////////////////////////////// /datum/job/assistant - title = "Assistant" + title = JOB_ALT_ASSISTANT flag = ASSISTANT departments = list(DEPARTMENT_CIVILIAN) sorting_order = -1 @@ -18,9 +18,9 @@ outfit_type = /decl/hierarchy/outfit/job/assistant job_description = "An Assistant does whatever is requested of them. Though they are part of the crew, they have no real authority." -/* alt_titles = list("Technical Assistant" = /datum/alt_title/tech_assist, - JOB_ALT_MEDICAL_INTERN= /datum/alt_title/med_intern, "Research Assistant" = /datum/alt_title/research_assist, - "Visitor" = /datum/alt_title/visitor) +/* alt_titles = list(JOB_ALT_TECHNICAL_ASSISTANT = /datum/alt_title/tech_assist, + JOB_ALT_MEDICAL_INTERN= /datum/alt_title/med_intern, JOB_ALT_RESEARCH_ASSISTANT = /datum/alt_title/research_assist, + JOB_ALT_VISITOR = /datum/alt_title/visitor) ) */ //VOREStation Removal: no alt-titles for visitors /datum/job/assistant/get_access() @@ -31,9 +31,9 @@ // Assistant Alt Titles /datum/alt_title/tech_assist - title = "Technical Assistant" - title_blurb = "A Technical Assistant attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \ - often in training to become an " + JOB_ENGINEER + ". A Technical Assistant has no real authority." + title = JOB_ALT_TECHNICAL_ASSISTANT + title_blurb = "A " + JOB_ALT_TECHNICAL_ASSISTANT + " attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \ + often in training to become an " + JOB_ENGINEER + ". A " + JOB_ALT_TECHNICAL_ASSISTANT + " has no real authority." /datum/alt_title/med_intern title = JOB_ALT_MEDICAL_INTERN @@ -41,13 +41,13 @@ the suit sensors console. A " + JOB_ALT_MEDICAL_INTERN + " has no real authority." /datum/alt_title/research_assist - title = "Research Assistant" - title_blurb = "A Research Assistant attempts to assist anyone working in the Research department. They are expected to follow the instruction \ - of proper Research staff, as it is frequently a matter of safety. A Research Assistant has no real authority." + title = JOB_ALT_RESEARCH_ASSISTANT + title_blurb = "A " + JOB_ALT_RESEARCH_ASSISTANT + " attempts to assist anyone working in the Research department. They are expected to follow the instruction \ + of proper Research staff, as it is frequently a matter of safety. A " + JOB_ALT_RESEARCH_ASSISTANT + " has no real authority." /datum/alt_title/visitor - title = "Visitor" - title_blurb = "A Visitor is anyone who has arrived on the station but does not have a specific job to do. Many off-duty crewmembers \ + title = JOB_ALT_VISITOR + title_blurb = "A " + JOB_ALT_VISITOR + " is anyone who has arrived on the station but does not have a specific job to do. Many off-duty crewmembers \ who care to make use of the station's facilities arrive as Visitors. Properly registered Vistors are considered \ to be part of the crew for most if not all purposes, but they have no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/visitor diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index ea51dc6a47..b52c28e635 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -92,9 +92,9 @@ ////////////////////////////////// /datum/job/assistant // Visitor - title = USELESS_JOB + title = JOB_ALT_VISITOR supervisors = "nobody! You don't work here" - job_description = "A " + USELESS_JOB + " is just there to visit the place. They have no real authority or responsibility." + job_description = "A " + JOB_ALT_VISITOR + " is just there to visit the place. They have no real authority or responsibility." timeoff_factor = 0 requestable = FALSE alt_titles = list("Guest" = /datum/alt_title/guest, "Traveler" = /datum/alt_title/traveler) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 2d0f3363d6..663edab0a4 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -105,11 +105,11 @@ outfit_type = /decl/hierarchy/outfit/job/cargo/qm job_description = "The " + JOB_QUARTERMASTER + " manages the Supply department, checking cargo orders and ensuring supplies get to where they are needed." - alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief) + alt_titles = list(JOB_ALT_SUPPLY_CHIEF = /datum/alt_title/supply_chief) // Quartermaster Alt Titles /datum/alt_title/supply_chief - title = "Supply Chief" + title = JOB_ALT_SUPPLY_CHIEF ////////////////////////////////// // Cargo Tech @@ -151,11 +151,11 @@ outfit_type = /decl/hierarchy/outfit/job/cargo/mining job_description = "A " + JOB_SHAFT_MINER + " mines and processes minerals to be delivered to departments that need them." - alt_titles = list("Drill Technician" = /datum/alt_title/drill_tech) + alt_titles = list(JOB_ALT_DRILL_TECHNICIAN = /datum/alt_title/drill_tech) /datum/alt_title/drill_tech - title = "Drill Technician" - title_blurb = "A Drill Technician specializes in operating and maintaining the machinery needed to extract ore from veins deep below the surface." + title = JOB_ALT_DRILL_TECHNICIAN + title_blurb = "A " + JOB_ALT_DRILL_TECHNICIAN + " specializes in operating and maintaining the machinery needed to extract ore from veins deep below the surface." //Service ////////////////////////////////// @@ -176,11 +176,11 @@ outfit_type = /decl/hierarchy/outfit/job/service/janitor job_description = "A " + JOB_JANITOR + " keeps the station clean, as long as it doesn't interfere with active crime scenes." - alt_titles = list("Custodian" = /datum/alt_title/custodian) + alt_titles = list(JOB_ALT_CUSTODIAN = /datum/alt_title/custodian) // Janitor Alt Titles /datum/alt_title/custodian - title = "Custodian" + title = JOB_ALT_CUSTODIAN //More or less assistants ////////////////////////////////// @@ -201,17 +201,17 @@ outfit_type = /decl/hierarchy/outfit/job/librarian job_description = "The " + JOB_LIBRARIAN + " curates the book selection in the Library, so the crew might enjoy it." - alt_titles = list("Journalist" = /datum/alt_title/journalist, "Writer" = /datum/alt_title/writer) + alt_titles = list(JOB_ALT_JOURNALIST = /datum/alt_title/journalist, JOB_ALT_WRITER = /datum/alt_title/writer) // Librarian Alt Titles /datum/alt_title/journalist - title = "Journalist" + title = JOB_ALT_JOURNALIST title_outfit = /decl/hierarchy/outfit/job/librarian/journalist - title_blurb = "The Journalist uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera." + title_blurb = "The " + JOB_ALT_JOURNALIST + " uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera." /datum/alt_title/writer - title = "Writer" - title_blurb = "The Writer uses the Library as a quiet place to write whatever it is they choose to write." + title = JOB_ALT_WRITER + title_blurb = "The " + JOB_ALT_WRITER + " uses the Library as a quiet place to write whatever it is they choose to write." ////////////////////////////////// // Internal Affairs Agent diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index fb71c85b53..c7e2a2c785 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -53,13 +53,13 @@ /datum/job/qm pto_type = PTO_CARGO dept_time_required = 20 - 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(JOB_ALT_SUPPLY_CHIEF = /datum/alt_title/supply_chief, JOB_ALT_LOGISTICS_MANAGER = /datum/alt_title/logistics_manager, JOB_ALT_CARGO_SUPERVISOR = /datum/alt_title/cargo_supervisor) /datum/alt_title/logistics_manager - title = "Logistics Manager" + title = JOB_ALT_LOGISTICS_MANAGER /datum/alt_title/cargo_supervisor - title = "Cargo Supervisor" + title = JOB_ALT_CARGO_SUPERVISOR /datum/job/qm/get_request_reasons() return list("Training crew") @@ -69,42 +69,42 @@ total_positions = 3 spawn_positions = 3 pto_type = PTO_CARGO - 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(JOB_ALT_CARGO_LOADER = /datum/alt_title/cargo_loader, JOB_ALT_CARGO_HANDLER = /datum/alt_title/cargo_handler, JOB_ALT_SUPPLY_COURIER = /datum/alt_title/supply_courier, + JOB_ALT_DISPOSALS_SORTER = /datum/alt_title/disposal_sorter) /datum/alt_title/supply_courier - title = "Supply Courier" - title_blurb = "A Supply Courier is usually tasked with devlivering packages or cargo directly to whoever requires it." + title = JOB_ALT_SUPPLY_COURIER + title_blurb = "A " + JOB_ALT_SUPPLY_COURIER + " is usually tasked with devlivering packages or cargo directly to whoever requires it." /datum/alt_title/cargo_loader - title = "Cargo Loader" - title_blurb = "A Cargo Loader is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle." + title = JOB_ALT_CARGO_LOADER + title_blurb = "A " + JOB_ALT_CARGO_LOADER + " is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle." /datum/alt_title/cargo_handler - title = "Cargo Handler" - title_blurb = "A Cargo Loader is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle." + title = JOB_ALT_CARGO_HANDLER + title_blurb = "A " + JOB_ALT_CARGO_HANDLER + " is usually tasked with more menial labor within Supply department, such as loading and unloading supply shuttle." /datum/alt_title/disposal_sorter - title = "Disposals Sorter" - title_blurb = "A Disposals Sorter is usually tasked with operating disposals delivery system, sorting the trash and tagging parcels for delivery." + title = JOB_ALT_DISPOSALS_SORTER + title_blurb = "A " + JOB_ALT_DISPOSALS_SORTER + " is usually tasked with operating disposals delivery system, sorting the trash and tagging parcels for delivery." /datum/job/mining total_positions = 4 spawn_positions = 4 pto_type = PTO_CARGO - 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(JOB_ALT_DEEP_SPACE_MINER = /datum/alt_title/deep_space_miner, JOB_ALT_DRILL_TECHNICIAN = /datum/alt_title/drill_tech, JOB_ALT_PROSPECTOR = /datum/alt_title/prospector, + JOB_ALT_EXCAVATOR = /datum/alt_title/excavator) /datum/alt_title/deep_space_miner - title = "Deep Space Miner" - title_blurb = "A Deep Space Miner specializes primarily in mining operations in zero-g environments, mostly in asteroid and debris fields." + title = JOB_ALT_DEEP_SPACE_MINER + title_blurb = "A " + JOB_ALT_DEEP_SPACE_MINER + " specializes primarily in mining operations in zero-g environments, mostly in asteroid and debris fields." /datum/alt_title/prospector - title = "Prospector" + title = JOB_ALT_PROSPECTOR /datum/alt_title/excavator - title = "Excavator" + title = JOB_ALT_EXCAVATOR /datum/job/mining/get_request_reasons() return list("Assembling expedition team") @@ -114,96 +114,96 @@ total_positions = 3 spawn_positions = 3 pto_type = PTO_CIVILIAN - 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(JOB_ALT_CUSTODIAN = /datum/alt_title/custodian, JOB_ALT_SANITATION_TECHNICIAN = /datum/alt_title/sanitation_tech, + JOB_ALT_MAID = /datum/alt_title/maid, JOB_ALT_GARBAGE_COLLECTOR = /datum/alt_title/garbage_collector) /datum/alt_title/sanitation_tech - title = "Sanitation Technician" + title = JOB_ALT_SANITATION_TECHNICIAN /datum/alt_title/maid - title = "Maid" + title = JOB_ALT_MAID /datum/alt_title/garbage_collector - title = "Garbage Collector" - title_blurb = "A Garbage Collector keeps the station clean, though focuses moreso on collecting larger trash, with wet cleaning being secondary task." + title = JOB_ALT_GARBAGE_COLLECTOR + title_blurb = "A " + JOB_ALT_GARBAGE_COLLECTOR + " keeps the station clean, though focuses moreso on collecting larger trash, with wet cleaning being secondary task." /datum/job/librarian total_positions = 2 spawn_positions = 2 - 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(JOB_ALT_JOURNALIST = /datum/alt_title/journalist, JOB_ALT_REPORTER = /datum/alt_title/reporter, JOB_ALT_WRITER = /datum/alt_title/writer, + JOB_ALT_HISTORIAN = /datum/alt_title/historian, JOB_ALT_ARCHIVIST = /datum/alt_title/archivist, JOB_ALT_PROFESSOR = /datum/alt_title/professor, + JOB_ALT_ACADEMIC = /datum/alt_title/academic, JOB_ALT_PHILOSOPHER = /datum/alt_title/philosopher, JOB_ALT_CURATOR = /datum/alt_title/curator) pto_type = PTO_CIVILIAN /datum/alt_title/reporter - title = "Reporter" - title_blurb = "The Reporter uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera." + title = JOB_ALT_REPORTER + title_blurb = "The " + JOB_ALT_REPORTER + " uses the Library as a base of operations, from which they can report the news and goings-on on the station with their camera." /datum/alt_title/historian - title = "Historian" - title_blurb = "The Historian uses the Library as a base of operation to record any important events occurring on station." + title = JOB_ALT_HISTORIAN + title_blurb = "The " + JOB_ALT_HISTORIAN + " uses the Library as a base of operation to record any important events occurring on station." /datum/alt_title/archivist - title = "Archivist" - title_blurb = "The Archivist uses the Library as a base of operation to record any important events occurring on station." + title = JOB_ALT_ARCHIVIST + title_blurb = "The " + JOB_ALT_ARCHIVIST + " uses the Library as a base of operation to record any important events occurring on station." /datum/alt_title/professor - title = "Professor" - title_blurb = "The Professor uses the Library as a base of operations to share their vast knowledge with the crew." + title = JOB_ALT_PROFESSOR + title_blurb = "The " + JOB_ALT_PROFESSOR + " uses the Library as a base of operations to share their vast knowledge with the crew." /datum/alt_title/academic - title = "Academic" - title_blurb = "The Academic uses the Library as a base of operations to share their vast knowledge with the crew." + title = JOB_ALT_ACADEMIC + title_blurb = "The " + JOB_ALT_ACADEMIC + " uses the Library as a base of operations to share their vast knowledge with the crew." /datum/alt_title/philosopher - title = "Philosopher" - title_blurb = "The Philosopher uses the Library as a base of operation to ruminate on nature of life and other great questions, and share their opinions with the crew." + title = JOB_ALT_PHILOSOPHER + title_blurb = "The " + JOB_ALT_PHILOSOPHER + " uses the Library as a base of operation to ruminate on nature of life and other great questions, and share their opinions with the crew." /datum/alt_title/curator - title = "Curator" - title_blurb = "The Curator uses the Library as a base of operation to gather the finest of art for display and preservation." + title = JOB_ALT_CURATOR + title_blurb = "The " + JOB_ALT_CURATOR + " uses the Library as a base of operation to gather the finest of art for display and preservation." /datum/job/lawyer disallow_jobhop = TRUE pto_type = PTO_CIVILIAN - 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(JOB_ALT_INTERNAL_AFFAIRS_LIAISON = /datum/alt_title/ia_liaison, JOB_ALT_INTERNAL_AFFAIRS_DELEGATE = /datum/alt_title/ia_delegate, + JOB_ALT_INTERNAL_AFFAIRS_INVESTIGATOR = /datum/alt_title/ia_investigator) /datum/alt_title/ia_liaison - title = "Internal Affairs Liaison" + title = JOB_ALT_INTERNAL_AFFAIRS_LIAISON /datum/alt_title/ia_delegate - title = "Internal Affairs Delegate" + title = JOB_ALT_INTERNAL_AFFAIRS_DELEGATE /datum/alt_title/ia_investigator - title = "Internal Affairs Investigator" + title = JOB_ALT_INTERNAL_AFFAIRS_INVESTIGATOR /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, JOB_ALT_COUNSELOR = /datum/alt_title/counselor, - "Guru" = /datum/alt_title/guru) + alt_titles = list(JOB_ALT_MISSIONARY = /datum/alt_title/missionary, JOB_ALT_PREACHER = /datum/alt_title/preacher, JOB_ALT_PRIEST = /datum/alt_title/priest, + JOB_ALT_NUN = /datum/alt_title/nun, JOB_ALT_MONK = /datum/alt_title/monk, JOB_ALT_COUNSELOR = /datum/alt_title/counselor, + JOB_ALT_GURU = /datum/alt_title/guru) /datum/alt_title/guru - title = "Guru" - title_blurb = "The Guru primarily tries to offer spiritual guidance to those who come seeking it." + title = JOB_ALT_GURU + title_blurb = "The " + JOB_ALT_GURU + " primarily tries to offer spiritual guidance to those who come seeking it." /datum/alt_title/missionary - title = "Missionary" + title = JOB_ALT_MISSIONARY /datum/alt_title/preacher - title = "Preacher" + title = JOB_ALT_PREACHER /datum/alt_title/priest - title = "Priest" + title = JOB_ALT_PRIEST /datum/alt_title/nun - title = "Nun" + title = JOB_ALT_NUN /datum/alt_title/monk - title = "Monk" + title = JOB_ALT_MONK ////////////////////////////////// @@ -227,17 +227,17 @@ minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot) outfit_type = /decl/hierarchy/outfit/job/pilot job_description = "A " + JOB_PILOT + " flies the various shuttles in the Virgo-Erigone System." - alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman) + alt_titles = list(JOB_ALT_COPILOT = /datum/alt_title/co_pilot, JOB_ALT_NAVIGATOR = /datum/alt_title/navigator, JOB_ALT_HELMSMAN = /datum/alt_title/helmsman) /datum/alt_title/co_pilot - title = "Co-Pilot" - title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" + title = JOB_ALT_COPILOT + title_blurb = "A Co-" + JOB_ALT_COPILOT + " is there primarily to assist main pilot as well as learn from them" /datum/alt_title/navigator - title = "Navigator" + title = JOB_ALT_NAVIGATOR /datum/alt_title/helmsman - title = "Helmsman" + title = JOB_ALT_HELMSMAN /datum/job/pilot/get_request_reasons() return list("Assembling expedition team") @@ -262,55 +262,55 @@ outfit_type = /decl/hierarchy/outfit/job/assistant/entertainer job_description = "An " + JOB_ENTERTAINER + " does just that, entertains! Put on plays, play music, sing songs, tell stories, or read your favorite fanfic." - 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(JOB_ALT_PERFORMER = /datum/alt_title/performer, JOB_ALT_MUSICIAN = /datum/alt_title/musician, JOB_ALT_STAGEHAND = /datum/alt_title/stagehand, + JOB_ALT_ACTOR = /datum/alt_title/actor, JOB_ALT_DANCER = /datum/alt_title/dancer, JOB_ALT_SINGER = /datum/alt_title/singer, + JOB_ALT_MAGICIAN = /datum/alt_title/magician, JOB_ALT_COMEDIAN = /datum/alt_title/comedian, JOB_ALT_ARTIST = /datum/alt_title/tragedian, + JOB_ALT_ARTIST = /datum/alt_title/artist, JOB_ALT_GAME_MASTER = /datum/alt_title/game_master) // Entertainer Alt Titles /datum/alt_title/actor - title = "Actor" - title_blurb = "An Actor is someone who acts out a role! Whatever sort of character it is, get into it and impress people with power of comedy and tragedy!" + title = JOB_ALT_ACTOR + title_blurb = "An " + JOB_ALT_ACTOR + " is someone who acts out a role! Whatever sort of character it is, get into it and impress people with power of comedy and tragedy!" /datum/alt_title/performer - title = "Performer" - title_blurb = "A Performer is someone who performs! Whatever sort of performance will come to your mind, the world's a stage!" + title = JOB_ALT_PERFORMER + title_blurb = "A " + JOB_ALT_PERFORMER + " is someone who performs! Whatever sort of performance will come to your mind, the world's a stage!" /datum/alt_title/musician - title = "Musician" - title_blurb = "A Musician is someone who makes music with a wide variety of musical instruments!" + title = JOB_ALT_MUSICIAN + title_blurb = "A " + JOB_ALT_MUSICIAN + " is someone who makes music with a wide variety of musical instruments!" /datum/alt_title/stagehand - title = "Stagehand" - title_blurb = "A Stagehand typically performs everything the rest of the entertainers don't. Operate lights, shutters, windows, or narrate through your voicebox!" + title = JOB_ALT_STAGEHAND + title_blurb = "A " + JOB_ALT_STAGEHAND + " typically performs everything the rest of the entertainers don't. Operate lights, shutters, windows, or narrate through your voicebox!" /datum/alt_title/dancer - title = "Dancer" - title_blurb = "A Dancer is someone who impresses people through power of their own body! From waltz to breakdance, as long as crowd as cheering!" + title = JOB_ALT_DANCER + title_blurb = "A " + JOB_ALT_DANCER + " is someone who impresses people through power of their own body! From waltz to breakdance, as long as crowd as cheering!" /datum/alt_title/singer - title = "Singer" - title_blurb = "A Singer is someone with gift of melodious voice! Impress people with your vocal range!" + title = JOB_ALT_SINGER + title_blurb = "A " + JOB_ALT_SINGER + " is someone with gift of melodious voice! Impress people with your vocal range!" /datum/alt_title/magician - title = "Magician" - title_blurb = "A Magician is someone who awes those around them with impossible! Show off your repertoire of magic tricks, while keeping the secret hidden!" + title = JOB_ALT_MAGICIAN + title_blurb = "A " + JOB_ALT_MAGICIAN + " is someone who awes those around them with impossible! Show off your repertoire of magic tricks, while keeping the secret hidden!" /datum/alt_title/comedian - title = "Comedian" - title_blurb = "A Comedian will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!" + title = JOB_ALT_COMEDIAN + title_blurb = "A " + JOB_ALT_COMEDIAN + " will focus on making people laugh with the power of wit! Telling jokes, stand-up comedy, you are here to make others smile!" /datum/alt_title/tragedian - title = "Tragedian" - title_blurb = "A Tragedian will focus on making people think about life and world around them! Life is a tragedy, and who's better to convey its emotions than you?" + title = JOB_ALT_ARTIST + title_blurb = "A " + JOB_ALT_ARTIST + " will focus on making people think about life and world around them! Life is a tragedy, and who's better to convey its emotions than you?" /datum/alt_title/artist - title = "Artist" - title_blurb = "An Artist's calling is to create beautiful arts! Whatever form may they take, create and have people astonished with your creativity." + title = JOB_ALT_ARTIST + title_blurb = "An " + JOB_ALT_ARTIST + "'s calling is to create beautiful arts! Whatever form may they take, create and have people astonished with your creativity." /datum/alt_title/game_master - title = "Game Master" - title_blurb = "A Game Master provides recreation for the crew by hosting variety of games. From cards to roleplaying to something more personalized." + title = JOB_ALT_GAME_MASTER + title_blurb = "A " + JOB_ALT_GAME_MASTER + " provides recreation for the crew by hosting variety of games. From cards to roleplaying to something more personalized." ////////////////////////////////// // Entrepreneur @@ -333,94 +333,94 @@ outfit_type = /decl/hierarchy/outfit/job/assistant/entrepreneur job_description = "An " + JOB_ENTREPRENEUR + " is basically a visitor that obtained special permission to offer personal services to people on station. \ They will offer people these services and, potentially, even demand payment!" - 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(JOB_ALT_LAWYER = /datum/alt_title/lawyer, JOB_ALT_PRIVATE_EYE = /datum/alt_title/private_eye, JOB_ALT_BODYGUARD = /datum/alt_title/bodyguard, + JOB_ALT_PERSONAL_PHYSICIAN = /datum/alt_title/personal_physician, JOB_ALT_DENTIST = /datum/alt_title/dentist, JOB_ALT_FITNESS_INSTRUCTOR = /datum/alt_title/fitness_instructor, + JOB_ALT_YOGA_TEACHER = /datum/alt_title/yoga_teacher, JOB_ALT_MASSEUSE = /datum/alt_title/masseuse, JOB_ALT_TRADESPERSON = /datum/alt_title/tradesperson, + JOB_ALT_STREAMER = /datum/alt_title/streamer, JOB_ALT_INFLUENCER = /datum/alt_title/influencer, JOB_ALT_PARANORMAL_INVESTIGATOR = /datum/alt_title/paranormal_investigator, + JOB_ALT_PERSONAL_SECRETARY = /datum/alt_title/personal_secretary, JOB_ALT_STYLIST = /datum/alt_title/stylist, JOB_ALT_FISHER = /datum/alt_title/fisher, + JOB_ALT_FORTUNE_TELLER = /datum/alt_title/fortune_teller, JOB_ALT_SPIRIT_HEALER = /datum/alt_title/spirit_healer) /datum/alt_title/lawyer - title = "Lawyer" - title_blurb = "A Lawyer is knowledgable in various legal systems, including station's operations. They can try to offer their legal counsel, although nobody is really obliged to listen." + title = JOB_ALT_LAWYER + title_blurb = "A " + JOB_ALT_LAWYER + " is knowledgable in various legal systems, including station's operations. They can try to offer their legal counsel, although nobody is really obliged to listen." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary /datum/alt_title/private_eye - title = "Private Eye" - title_blurb = "A Private Eye is a detective that has no credentials or equipment. But if someone wants something found without security's knowledge, they are the one to go to." + title = JOB_ALT_PRIVATE_EYE + title_blurb = "A " + JOB_ALT_PRIVATE_EYE + " is a detective that has no credentials or equipment. But if someone wants something found without security's knowledge, they are the one to go to." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/private_eye /datum/alt_title/bodyguard - title = "Bodyguard" - title_blurb = "A Bodyguard offers service of personal protection. They may not be allowed any weapons, but their own body is weapon enough." + title = JOB_ALT_BODYGUARD + title_blurb = "A " + JOB_ALT_BODYGUARD + " offers service of personal protection. They may not be allowed any weapons, but their own body is weapon enough." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/bodyguard /datum/alt_title/personal_physician - title = "Personal Physician" - title_blurb = "A Personal Physicial is a doctor dedicated less to Hippocratic Oath and more to the moneymaking grind. Their license may be expired, but the grindset never will be." + title = JOB_ALT_PERSONAL_PHYSICIAN + title_blurb = "A " + JOB_ALT_PERSONAL_PHYSICIAN + " is a doctor dedicated less to Hippocratic Oath and more to the moneymaking grind. Their license may be expired, but the grindset never will be." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_physician /datum/alt_title/dentist - title = "Dentist" - title_blurb = "A Dentist is a doctor that specializes in oral care. Company may not recognize them as a proper doctor, but surely their customers will." + title = JOB_ALT_DENTIST + title_blurb = "A " + JOB_ALT_DENTIST + " is a doctor that specializes in oral care. Company may not recognize them as a proper doctor, but surely their customers will." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/dentist /datum/alt_title/fitness_instructor - title = "Fitness Instructor" - title_blurb = "A Fitness Instructor dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help." + title = JOB_ALT_FITNESS_INSTRUCTOR + title_blurb = "A " + JOB_ALT_FITNESS_INSTRUCTOR + " dedicates themselves to improving the health of the crew through physical activity, and boy, do they need the help." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fitness_instructor /datum/alt_title/yoga_teacher - title = "Yoga Teacher" - title_blurb = "A Yoga Teacher is similar to fitness instructor, but rather than turning the round bodies into firm ones, they focus on helping people find balance and harmony." + title = JOB_ALT_YOGA_TEACHER + title_blurb = "A " + JOB_ALT_YOGA_TEACHER + " is similar to a fitness instructor, but rather than turning the round bodies into firm ones, they focus on helping people find balance and harmony." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/yoga_teacher /datum/alt_title/masseuse - title = "Masseuse" - title_blurb = "A Masseuse is master of physical therapy and working others' bodies with their hands." + title = JOB_ALT_MASSEUSE + title_blurb = "A " + JOB_ALT_MASSEUSE + " is master of physical therapy and working others' bodies with their hands." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/masseuse /datum/alt_title/tradesperson - title = "Tradesperson" - title_blurb = "A Tradesperson is someone attempting to make money via the most obvious act of all - buying and selling. Now if only customs allowed you to bring your goods along..." + title = JOB_ALT_TRADESPERSON + title_blurb = "A " + JOB_ALT_TRADESPERSON + " is someone attempting to make money via the most obvious act of all - buying and selling. Now if only customs allowed you to bring your goods along..." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/tradesperson /datum/alt_title/streamer - title = "Streamer" - title_blurb = "A Streamer is here to entertain. Not the crew! Their audience across exonet!" + title = JOB_ALT_STREAMER + title_blurb = "A " + JOB_ALT_STREAMER + " is here to entertain. Not the crew! Their audience across exonet!" title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/streamer /datum/alt_title/influencer - title = "Influencer" - title_blurb = "An Influencer has lucked out with some exonet following, and was given permission to go onstation to provide free exposure. Don't let it go to your head." + title = JOB_ALT_INFLUENCER + title_blurb = "An " + JOB_ALT_INFLUENCER + " has lucked out with some exonet following, and was given permission to go onstation to provide free exposure. Don't let it go to your head." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/influencer /datum/alt_title/paranormal_investigator - title = "Paranormal Investigator" - title_blurb = "A Paranormal Investigator looks beyond what is accepted by modern science, and searches for the true unknown. Aliens, alternate dimensions, ghosts... The truth is out there!" + title = JOB_ALT_PARANORMAL_INVESTIGATOR + title_blurb = "A " + JOB_ALT_PARANORMAL_INVESTIGATOR + " looks beyond what is accepted by modern science, and searches for the true unknown. Aliens, alternate dimensions, ghosts... The truth is out there!" title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/paranormal_investigator /datum/alt_title/personal_secretary - title = "Personal Secretary" - title_blurb = "A Personal Secretary offers services of general assistance. Although it's doubtful anyone will ever actually need those." + title = JOB_ALT_PERSONAL_SECRETARY + title_blurb = "A " + JOB_ALT_PERSONAL_SECRETARY + " offers services of general assistance. Although it's doubtful anyone will ever actually need those." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/personal_secretary /datum/alt_title/stylist - title = "Stylist" - title_blurb = "A Stylist offers fashion advice, as well as helps with adjusting appearance of the crew to better suit their beauty standards." + title = JOB_ALT_STYLIST + title_blurb = "A " + JOB_ALT_STYLIST + " offers fashion advice, as well as helps with adjusting appearance of the crew to better suit their beauty standards." title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/stylist /datum/alt_title/fisher - title = "Fisher" - title_blurb = "A Fisher is a capable angler, who is good at obtaining large amounts of marine goods. Whether you generously give them to station or attempt to make a quick thaler by selling, it's up to you!" + title = JOB_ALT_FISHER + title_blurb = "A " + JOB_ALT_FISHER + " is a capable angler, who is good at obtaining large amounts of marine goods. Whether you generously give them to station or attempt to make a quick thaler by selling, it's up to you!" title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fisher /datum/alt_title/fortune_teller - title = "Fortune Teller" - title_blurb = "A Fortune Teller peers into the future, and offers these visions to others. Occasionally those visions may even come true!" + title = JOB_ALT_FORTUNE_TELLER + title_blurb = "A " + JOB_ALT_FORTUNE_TELLER + " peers into the future, and offers these visions to others. Occasionally those visions may even come true!" title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/fortune_teller /datum/alt_title/spirit_healer - title = "Spirit Healer" - title_blurb = "A Spirit Healer offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?" + title = JOB_ALT_SPIRIT_HEALER + title_blurb = "A " + JOB_ALT_SPIRIT_HEALER + " offers alternative forms of medicine. Rituals, magic rocks, seances... It totally works. What's that about placebo?" title_outfit = /decl/hierarchy/outfit/job/assistant/entrepreneur/spirit_healer diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index fcb201c7af..576739d659 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -54,8 +54,8 @@ economic_modifier = 5 access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics) minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction) - 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(JOB_ALT_MAINTENANCE_TECHNICIAN = /datum/alt_title/maint_tech, + JOB_ALT_ENGINE_TECHNICIAN = /datum/alt_title/engine_tech, JOB_ALT_ELECTRICIAN = /datum/alt_title/electrician) minimal_player_age = 3 min_age_by_species = list(SPECIES_PROMETHEAN = 2) @@ -66,18 +66,18 @@ // Engineer Alt Titles /datum/alt_title/maint_tech - title = "Maintenance Technician" - title_blurb = "A Maintenance Technician is generally a junior Engineer, and can be expected to run the mildly unpleasant or boring tasks that other \ + title = JOB_ALT_MAINTENANCE_TECHNICIAN + title_blurb = "A " + JOB_ALT_MAINTENANCE_TECHNICIAN + " is generally a junior Engineer, and can be expected to run the mildly unpleasant or boring tasks that other \ Engineers don't care to do." /datum/alt_title/engine_tech - title = "Engine Technician" - title_blurb = "An Engine Technician tends to the engine, most commonly a Supermatter crystal. They are expected to be able to keep it stable, and \ + title = JOB_ALT_ENGINE_TECHNICIAN + title_blurb = "An " + JOB_ALT_ENGINE_TECHNICIAN + " tends to the engine, most commonly a Supermatter crystal. They are expected to be able to keep it stable, and \ possibly even run it beyond normal tolerances." /datum/alt_title/electrician - title = "Electrician" - title_blurb = "An Electrician's primary duty is making sure power is properly distributed thoughout the station, utilizing solars, substations, and other \ + title = JOB_ALT_ELECTRICIAN + title_blurb = "An " + JOB_ALT_ELECTRICIAN + "'s primary duty is making sure power is properly distributed thoughout the station, utilizing solars, substations, and other \ methods to ensure every department has power in an emergency." ////////////////////////////////// diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 3cc1989377..ed872fd85b 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -12,16 +12,16 @@ access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_heads, access_construction, access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway) - 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(JOB_ALT_HEAD_ENGINEER = /datum/alt_title/head_engineer, JOB_ALT_FOREMAN = /datum/alt_title/foreman, JOB_ALT_MAINTENANCE_MANAGER = /datum/alt_title/maintenance_manager) /datum/alt_title/head_engineer - title = "Head Engineer" + title = JOB_ALT_HEAD_ENGINEER /datum/alt_title/foreman - title = "Foreman" + title = JOB_ALT_FOREMAN /datum/alt_title/maintenance_manager - title = "Maintenance Manager" + title = JOB_ALT_MAINTENANCE_MANAGER /datum/job/chief_engineer/get_request_reasons() return list("Engine setup", "Construction project", "Repairs necessary", "Training crew", "Assembling expedition team") @@ -29,17 +29,17 @@ /datum/job/engineer pto_type = PTO_ENGINEERING - 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(JOB_ALT_MAINTENANCE_TECHNICIAN = /datum/alt_title/maint_tech, JOB_ALT_ENGINE_TECHNICIAN = /datum/alt_title/engine_tech, + JOB_ALT_ELECTRICIAN = /datum/alt_title/electrician, JOB_ALT_CONSTRUCTION_ENGINEER = /datum/alt_title/construction_engi, JOB_ALT_ENGINEERING_CONTRACTOR = /datum/alt_title/engineering_contractor) /datum/alt_title/construction_engi - title = "Construction Engineer" - title_blurb = "A Construction Engineer fulfills similar duties to other engineers, but usually occupies spare time with construction of extra facilities in dedicated areas or \ + title = JOB_ALT_CONSTRUCTION_ENGINEER + title_blurb = "A " + JOB_ALT_CONSTRUCTION_ENGINEER + " fulfills similar duties to other engineers, but usually occupies spare time with construction of extra facilities in dedicated areas or \ as additions to station layout." /datum/alt_title/engineering_contractor - title = "Engineering Contractor" - title_blurb = "An Engineering Contractor fulfills similar duties to other engineers, but isn't directly employed by NT proper." + title = JOB_ALT_ENGINEERING_CONTRACTOR + title_blurb = "An " + JOB_ALT_ENGINEERING_CONTRACTOR + " fulfills similar duties to other engineers, but isn't directly employed by NT proper." /datum/job/engineer/get_request_reasons() return list("Engine setup", "Construction project", "Repairs necessary", "Assembling expedition team") @@ -50,21 +50,21 @@ /datum/job/atmos spawn_positions = 3 pto_type = PTO_ENGINEERING - 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(JOB_ALT_ATMOSPHERIC_ENGINEER = /datum/alt_title/atmos_engi, JOB_ALT_ATMOSPHERIC_MAINTAINER = /datum/alt_title/atmos_maint, JOB_ALT_DISPOSALS_TECHNICIAN = /datum/alt_title/disposals_tech, + JOB_ALT_FUEL_TECHNICIAN = /datum/alt_title/refuel_tech) /datum/alt_title/atmos_maint - title = "Atmospheric Maintainer" + title = JOB_ALT_ATMOSPHERIC_MAINTAINER /datum/alt_title/atmos_engi - title = "Atmospheric Engineer" + title = JOB_ALT_ATMOSPHERIC_ENGINEER /datum/alt_title/disposals_tech - title = "Disposals Technician" - title_blurb = "A Disposals Technician is an " + JOB_ATMOSPHERIC_TECHNICIAN + " still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." + title = JOB_ALT_DISPOSALS_TECHNICIAN + title_blurb = "A " + JOB_ALT_DISPOSALS_TECHNICIAN + " is an " + JOB_ATMOSPHERIC_TECHNICIAN + " still and can fulfill all the same duties, although specializes more in disposals delivery system's operations and configurations." /datum/alt_title/refuel_tech - title = "Fuel Technician" + title = JOB_ALT_FUEL_TECHNICIAN /datum/job/atmos/get_request_reasons() return list("Construction project", "Repairs necessary", "Assembling expedition team") diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index e10be1bffc..c6db8ecd57 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -49,13 +49,13 @@ minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce) outfit_type = /decl/hierarchy/outfit/job/pathfinder job_description = "The " + JOB_PATHFINDER + "'s job is to lead and manage expeditions, and is the primary authority on all off-station expeditions." - alt_titles = list("Expedition Lead" = /datum/alt_title/expedition_lead, "Exploration Manager" = /datum/alt_title/exploration_manager) + alt_titles = list(JOB_ALT_EXPEDITION_LEAD = /datum/alt_title/expedition_lead, JOB_ALT_EXPLORATION_MANAGER = /datum/alt_title/exploration_manager) /datum/alt_title/expedition_lead - title = "Expedition Lead" + title = JOB_ALT_EXPEDITION_LEAD /datum/alt_title/exploration_manager - title = "Exploration Manager" + title = JOB_ALT_EXPLORATION_MANAGER /datum/job/pathfinder/get_request_reasons() return list("Training crew") @@ -76,13 +76,13 @@ minimal_access = list(access_explorer, access_external_airlocks, access_eva) outfit_type = /decl/hierarchy/outfit/job/explorer2 job_description = "An " + JOB_EXPLORER + " searches for interesting things, and returns them to the station." - alt_titles = list("Surveyor" = /datum/alt_title/surveyor, "Offsite Scout" = /datum/alt_title/offsite_scout) + alt_titles = list(JOB_ALT_SURVEYOR = /datum/alt_title/surveyor, JOB_ALT_OFFSITE_SCOUT = /datum/alt_title/offsite_scout) /datum/alt_title/surveyor - title = "Surveyor" + title = JOB_ALT_SURVEYOR /datum/alt_title/offsite_scout - title = "Offsite Scout" + title = JOB_ALT_OFFSITE_SCOUT /datum/job/sar @@ -102,10 +102,10 @@ minimal_access = list(access_medical, access_medical_equip, access_morgue, access_pilot) outfit_type = /decl/hierarchy/outfit/job/medical/sar job_description = "A " + JOB_FIELD_MEDIC + " works as the field doctor of expedition teams." - alt_titles = list("Expedition Medic" = /datum/alt_title/expedition_medic, "Offsite Medic" = /datum/alt_title/offsite_medic) + alt_titles = list(JOB_ALT_EXPEDITION_MEDIC = /datum/alt_title/expedition_medic, JOB_ALT_OFFSITE_MEDIC = /datum/alt_title/offsite_medic) /datum/alt_title/expedition_medic - title = "Expedition Medic" + title = JOB_ALT_EXPEDITION_MEDIC /datum/alt_title/offsite_medic - title = "Offsite Medic" + title = JOB_ALT_OFFSITE_MEDIC diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index d02312731b..9298028eb9 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -56,31 +56,31 @@ familiar with basic first aid, and a number of accompanying medications, and can generally save, if not cure, a majority of the \ patients they encounter." alt_titles = list( - "Surgeon" = /datum/alt_title/surgeon, - "Emergency Physician" = /datum/alt_title/emergency_physician, - "Nurse" = /datum/alt_title/nurse, + JOB_ALT_SURGEON = /datum/alt_title/surgeon, + JOB_ALT_EMERGENCY_PHYSICIAN = /datum/alt_title/emergency_physician, + JOB_ALT_NURSE = /datum/alt_title/nurse, JOB_ALT_VIROLOGIST = /datum/alt_title/virologist) min_age_by_species = list(SPECIES_PROMETHEAN = 3) //Medical Doctor Alt Titles /datum/alt_title/surgeon - title = "Surgeon" - title_blurb = "A Surgeon specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachement. They are expected \ + title = JOB_ALT_SURGEON + title_blurb = "A " + JOB_ALT_SURGEON + " specializes in providing surgical aid to injured patients, up to and including amputation and limb reattachement. They are expected \ to know the ins and outs of anesthesia and surgery." title_outfit = /decl/hierarchy/outfit/job/medical/doctor/surgeon /datum/alt_title/emergency_physician - title = "Emergency Physician" - title_blurb = "An Emergency Physician is a Medical professional trained for stabilizing and treating severely injured and/or dying patients. \ + title = JOB_ALT_EMERGENCY_PHYSICIAN + title_blurb = "An " + JOB_ALT_EMERGENCY_PHYSICIAN + " is a Medical professional trained for stabilizing and treating severely injured and/or dying patients. \ They are generally the first response for any such individual brought to the Medbay, and can sometimes be expected to help their patients \ make a full recovery." title_outfit = /decl/hierarchy/outfit/job/medical/doctor/emergency_physician /datum/alt_title/nurse - title = "Nurse" - title_blurb = "A Nurse acts as a general purpose Doctor's Aide, providing basic care to non-critical patients, and stabilizing critical patients during \ - busy periods. They frequently watch the suit sensors console, to help manage the time of other Doctors. In rare occasions, a Nurse can be \ + title = JOB_ALT_NURSE + title_blurb = "A " + JOB_ALT_NURSE + " acts as a general purpose Doctor's Aide, providing basic care to non-critical patients, and stabilizing critical patients during \ + busy periods. They frequently watch the suit sensors console, to help manage the time of other Doctors. In rare occasions, a " + JOB_ALT_NURSE + " can be \ called upon to revive deceased crew members." title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse @@ -162,13 +162,13 @@ outfit_type = /decl/hierarchy/outfit/job/medical/psychiatrist job_description = "A " + JOB_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." - alt_titles = list("Psychologist" = /datum/alt_title/psychologist) + alt_titles = list(JOB_ALT_PSYCHOLOGIST = /datum/alt_title/psychologist) banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_DIONA) //Psychiatrist Alt Titles /datum/alt_title/psychologist - title = "Psychologist" - title_blurb = "A Psychologist provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ + title = JOB_ALT_PSYCHOLOGIST + title_blurb = "A " + JOB_ALT_PSYCHOLOGIST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ called upon to determine whatever ails the mentally unwell, frequently under Security supervision." title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist @@ -191,14 +191,14 @@ outfit_type = /decl/hierarchy/outfit/job/medical/paramedic job_description = "A " + JOB_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." - alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt) + alt_titles = list(JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN = /datum/alt_title/emt) banned_job_species = list(SPECIES_DIONA) min_age_by_species = list(SPECIES_PROMETHEAN = 2) // Paramedic Alt Titles /datum/alt_title/emt - title = "Emergency Medical Technician" - title_blurb = "An Emergency Medical Technician is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ + title = JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN + title_blurb = "An " + JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training." title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index fcdcb49091..9d08fdfcf2 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -10,16 +10,16 @@ minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway) - 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(JOB_ALT_CHIEF_PHYSICIAN = /datum/alt_title/chief_physician, JOB_ALT_MEDICAL_DIRECTOR = /datum/alt_title/medical_director, JOB_ALT_HEALTHCARE_MANAGER = /datum/alt_title/healthcare_manager) /datum/alt_title/chief_physician - title = "Chief Physician" + title = JOB_ALT_CHIEF_PHYSICIAN /datum/alt_title/medical_director - title = "Medical Director" + title = JOB_ALT_MEDICAL_DIRECTOR /datum/alt_title/healthcare_manager - title = "Healthcare Manager" + title = JOB_ALT_HEALTHCARE_MANAGER /datum/job/cmo/get_request_reasons() return list("Surgery pending", "Viral outbreak", "Training crew", "Assembling expedition team") @@ -28,25 +28,25 @@ /datum/job/doctor spawn_positions = 5 pto_type = PTO_MEDICAL - 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(JOB_ALT_PHYSICIAN = /datum/alt_title/physician, JOB_ALT_MEDICAL_PRACTITIONER = /datum/alt_title/medical_practitioner, JOB_ALT_SURGEON = /datum/alt_title/surgeon, + JOB_ALT_EMERGENCY_PHYSICIAN = /datum/alt_title/emergency_physician, JOB_ALT_NURSE = /datum/alt_title/nurse, JOB_ALT_ORDERLY = /datum/alt_title/orderly, + JOB_ALT_VIROLOGIST = /datum/alt_title/virologist, JOB_ALT_MEDICAL_CONTRACTOR = /datum/alt_title/medical_contractor) /datum/alt_title/physician - title = "Physician" + title = JOB_ALT_PHYSICIAN /datum/alt_title/medical_practitioner - title = "Medical Practitioner" + title = JOB_ALT_MEDICAL_PRACTITIONER /datum/alt_title/orderly - title = "Orderly" - title_blurb = "An Orderly acts as Medbay's general helping hand, assisting any doctor that might need some form of help, as well as handling manual \ + title = JOB_ALT_ORDERLY + title_blurb = "An " + JOB_ALT_ORDERLY + " acts as Medbay's general helping hand, assisting any doctor that might need some form of help, as well as handling manual \ and dirty labor around the department." title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse /datum/alt_title/medical_contractor - title = "Medical Contractor" - title_blurb = "A Medical Contractor can be anything from a full-blown doctor to the likes of a nurse or orderly, but isn't directly employed by NT proper." + title = JOB_ALT_MEDICAL_CONTRACTOR + title_blurb = "A " + JOB_ALT_MEDICAL_CONTRACTOR + " can be anything from a full-blown doctor to the likes of a nurse or orderly, but isn't directly employed by NT proper." /datum/job/doctor/get_request_reasons() return list("Surgery pending", "Viral outbreak", "Assembling expedition team") @@ -63,35 +63,35 @@ /datum/job/psychiatrist pto_type = PTO_MEDICAL - alt_titles = list("Psychologist" = /datum/alt_title/psychologist, "Psychoanalyst" = /datum/alt_title/psychoanalyst, "Psychotherapist" = /datum/alt_title/psychotherapist) + alt_titles = list(JOB_ALT_PSYCHOLOGIST = /datum/alt_title/psychologist, JOB_ALT_PSYCHOANALYST = /datum/alt_title/psychoanalyst, JOB_ALT_PSYCHOTHERAPIST = /datum/alt_title/psychotherapist) /datum/alt_title/psychoanalyst - title = "Psychoanalyst" - title_blurb = "A Psychoanalyst provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ + title = JOB_ALT_PSYCHOANALYST + title_blurb = "A " + JOB_ALT_PSYCHOANALYST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ called upon to determine whatever ails the mentally unwell, frequently under Security supervision." title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist /datum/alt_title/psychotherapist - title = "Psychotherapist" - title_blurb = "A Psychotherapist provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ + title = JOB_ALT_PSYCHOTHERAPIST + title_blurb = "A " + JOB_ALT_PSYCHOTHERAPIST + " provides mental health services to crew members in need, focusing more on therapy than medication. They may also be \ called upon to determine whatever ails the mentally unwell, frequently under Security supervision." title_outfit = /decl/hierarchy/outfit/job/medical/psychiatrist/psychologist /datum/job/paramedic pto_type = PTO_MEDICAL - 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(JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN = /datum/alt_title/emt, JOB_ALT_MEDICAL_RESPONDER = /datum/alt_title/medical_responder, JOB_ALT_SEARCH_AND_RESCUE = /datum/alt_title/sar) total_positions = 3 spawn_positions = 3 /datum/alt_title/medical_responder - title = "Medical Responder" - title_blurb = "A Medical Responder is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ + title = JOB_ALT_MEDICAL_RESPONDER + title_blurb = "A " + JOB_ALT_MEDICAL_RESPONDER + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their \ own. They are capable of keeping a patient stabilized until they reach the hands of someone with more training." title_outfit = /decl/hierarchy/outfit/job/medical/paramedic/emt /datum/alt_title/sar - title = "Search and Rescue" + title = JOB_ALT_SEARCH_AND_RESCUE /datum/job/paramedic/get_request_reasons() return list("Assembling expedition team") diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 92d0ee53b6..c67dbe59ad 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -36,12 +36,12 @@ at least with regards to anything occurring in the Research department, and to inform the crew of any disruptions that \ might originate from Research. The " + JOB_RESEARCH_DIRECTOR + " often has at least passing knowledge of most of the Research department, but \ are encouraged to allow their staff to perform their own duties." - alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor) + alt_titles = list(JOB_ALT_RESEARCH_SUPERVISOR = /datum/alt_title/research_supervisor) // " + JOB_RESEARCH_DIRECTOR + " Alt Titles /datum/alt_title/research_supervisor - title = "Research Supervisor" + title = JOB_ALT_RESEARCH_SUPERVISOR ////////////////////////////////// // Scientist @@ -68,24 +68,24 @@ job_description = "A " + JOB_SCIENTIST + " is a generalist working in the Research department, with general knowledge of the scientific process, as well as \ the principles and requirements of Research and Development. They may also formulate experiments of their own devising, if \ they find an appropriate topic." - alt_titles = list("Xenoarchaeologist" = /datum/alt_title/xenoarch, "Anomalist" = /datum/alt_title/anomalist, \ - "Phoron Researcher" = /datum/alt_title/phoron_research) + alt_titles = list(JOB_ALT_XENOARCHAEOLOGIST = /datum/alt_title/xenoarch, JOB_ALT_ANOMALIST = /datum/alt_title/anomalist, \ + JOB_ALT_PHORON_RESEARCHER = /datum/alt_title/phoron_research) // Scientist Alt Titles /datum/alt_title/xenoarch - title = "Xenoarchaeologist" - title_blurb = "A Xenoarchaeologist enters digsites in search of artifacts of alien origin. These digsites are frequently in vacuum or other inhospitable \ - locations, and as such a Xenoarchaeologist should be prepared to handle hostile evironmental conditions." + title = JOB_ALT_XENOARCHAEOLOGIST + title_blurb = "A " + JOB_ALT_XENOARCHAEOLOGIST + " enters digsites in search of artifacts of alien origin. These digsites are frequently in vacuum or other inhospitable \ + locations, and as such a " + JOB_ALT_XENOARCHAEOLOGIST + " should be prepared to handle hostile evironmental conditions." /datum/alt_title/anomalist - title = "Anomalist" - title_blurb = "An Anomalist is a " + JOB_SCIENTIST + " whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \ - function. They work closely with Xenoarchaeologists, or Miners, if either role is present." + title = JOB_ALT_ANOMALIST + title_blurb = "An " + JOB_ALT_ANOMALIST + " is a " + JOB_SCIENTIST + " whose expertise is analyzing alien artifacts. They are familar with the most common methods of testing artifact \ + function. They work closely with " + JOB_ALT_XENOARCHAEOLOGIST + "s, or Miners, if either role is present." /datum/alt_title/phoron_research - title = "Phoron Researcher" - title_blurb = "A Phoron Researcher is a specialist in the practical applications of phoron, and has knowledge of its practical uses and dangers. \ - Many Phoron Researchers are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \ + title = JOB_ALT_PHORON_RESEARCHER + title_blurb = "A " + JOB_ALT_PHORON_RESEARCHER + " is a specialist in the practical applications of phoron, and has knowledge of its practical uses and dangers. \ + Many " + JOB_ALT_PHORON_RESEARCHER + "s are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \ of working with the substance in that state." ////////////////////////////////// @@ -145,15 +145,15 @@ VR edit end*/ outfit_type = /decl/hierarchy/outfit/job/science/roboticist job_description = "A " + JOB_ROBOTICIST + " maintains and repairs the station's synthetics, including crew with prosthetic limbs. \ They can also assist the station by producing simple robots and even pilotable exosuits." - alt_titles = list("Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech) + alt_titles = list(JOB_ALT_BIOMECHANICAL_ENGINEER = /datum/alt_title/biomech, JOB_ALT_MECHATRONIC_ENGINEER = /datum/alt_title/mech_tech) // Roboticist Alt Titles /datum/alt_title/biomech - title = "Biomechanical Engineer" - title_blurb = "A Biomechanical Engineer primarily works on prosthetics, and the organic parts attached to them. They may have some \ + title = JOB_ALT_BIOMECHANICAL_ENGINEER + title_blurb = "A " + JOB_ALT_BIOMECHANICAL_ENGINEER + " primarily works on prosthetics, and the organic parts attached to them. They may have some \ knowledge of the relatively simple surgical procedures used in making cyborgs and attaching prosthesis." /datum/alt_title/mech_tech - title = "Mechatronic Engineer" - title_blurb = "A Mechatronic Engineer focuses on the construction and maintenance of Exosuits, and should be well versed in their use. \ + title = JOB_ALT_MECHATRONIC_ENGINEER + title_blurb = "A " + JOB_ALT_MECHATRONIC_ENGINEER + " focuses on the construction and maintenance of Exosuits, and should be well versed in their use. \ They may also be called upon to work on synthetics and prosthetics, if needed." diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index 4134c0a94f..bb5285e16e 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -11,17 +11,17 @@ access_tox_storage, access_teleporter, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network, access_xenobotany) - 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(JOB_ALT_RESEARCH_SUPERVISOR = /datum/alt_title/research_supervisor, JOB_ALT_RESEARCH_MANAGER = /datum/alt_title/research_manager, + JOB_ALT_HEAD_OF_DEVELOPMENT = /datum/alt_title/head_of_development,JOB_ALT_HEAD_SCIENTIST = /datum/alt_title/head_scientist) /datum/alt_title/research_manager - title = "Research Manager" + title = JOB_ALT_RESEARCH_MANAGER /datum/alt_title/head_of_development - title = "Head of Development" + title = JOB_ALT_HEAD_OF_DEVELOPMENT /datum/alt_title/head_scientist - title = "Head Scientist" + title = JOB_ALT_HEAD_SCIENTIST /datum/job/rd/get_request_reasons() return list("Repairs needed", "Training crew", "Assembling expedition team") @@ -30,41 +30,41 @@ /datum/job/scientist spawn_positions = 5 pto_type = PTO_SCIENCE - 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(JOB_ALT_RESEARCHER = /datum/alt_title/researcher, JOB_ALT_LAB_ASSISTANT = /datum/alt_title/lab_assistant, JOB_ALT_XENOARCHAEOLOGIST = /datum/alt_title/xenoarch, + JOB_ALT_XENOPALEONTOLOGIST = /datum/alt_title/xenopaleontologist, JOB_ALT_ANOMALIST = /datum/alt_title/anomalist, JOB_ALT_PHORON_RESEARCHER = /datum/alt_title/phoron_research, + JOB_ALT_GAS_PHYSICIST = /datum/alt_title/gas_physicist, JOB_ALT_CIRCUIT_DESIGNER = /datum/alt_title/circuit_designer, JOB_ALT_CIRCUIT_PROGRAMMER = /datum/alt_title/circuit_programmer) access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_xenobotany) minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch) // Unchanged (for now?), mostly here for reference /datum/alt_title/researcher - title = "Researcher" + title = JOB_ALT_RESEARCHER /datum/alt_title/lab_assistant - title = "Lab Assistant" - title_blurb = "A Lab Assistant is a lower-level member of research staff, whose main purpose is to help scientists with their specialized work in more menial fashion, while also \ + title = JOB_ALT_LAB_ASSISTANT + title_blurb = "A " + JOB_ALT_LAB_ASSISTANT + " is a lower-level member of research staff, whose main purpose is to help scientists with their specialized work in more menial fashion, while also \ learning the specializations in process." /datum/alt_title/xenopaleontologist - title = "Xenopaleontologist" - title_blurb = "A Xenopaleontologist enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \ - locations, and as such a Xenopaleontologist should be prepared to handle hostile evironmental conditions." + title = JOB_ALT_XENOPALEONTOLOGIST + title_blurb = "A " + JOB_ALT_XENOPALEONTOLOGIST + " enters digsites in search of fossils and other ancient remants of alien life. These digsites are frequently in vacuum or other inhospitable \ + locations, and as such a " + JOB_ALT_XENOPALEONTOLOGIST + " should be prepared to handle hostile evironmental conditions." /datum/alt_title/gas_physicist - title = "Gas Physicist" - title_blurb = "A Gas Physicist is a specialist in various practical applications of gasses, but currently focuses their attention on phoron, and has knowledge of its practical uses and dangers. \ - Many Gas Physicists are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \ + title = JOB_ALT_GAS_PHYSICIST + title_blurb = "A " + JOB_ALT_GAS_PHYSICIST + " is a specialist in various practical applications of gasses, but currently focuses their attention on phoron, and has knowledge of its practical uses and dangers. \ + Many " + JOB_ALT_GAS_PHYSICIST + "s are interested in the combustability and explosive properties of gaseous phoron, as well as the specific hazards \ of working with the substance in that state." /datum/alt_title/circuit_designer - title = "Circuit Designer" - title_blurb = "A Circuit Designer is a " + JOB_SCIENTIST + " whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ + title = JOB_ALT_CIRCUIT_DESIGNER + title_blurb = "A " + JOB_ALT_CIRCUIT_DESIGNER + " is a " + JOB_SCIENTIST + " whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ They work to create various useful devices using the capabilities of integrated circuitry." /datum/alt_title/circuit_programmer - title = "Circuit Programmer" - title_blurb = "A Circuit Programmer is a " + JOB_SCIENTIST + " whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ + title = JOB_ALT_CIRCUIT_PROGRAMMER + title_blurb = "A " + JOB_ALT_CIRCUIT_PROGRAMMER + " is a " + JOB_SCIENTIST + " whose expertise is working with integrated circuits. They are familar with the workings and programming of those devices. \ They work to create various useful devices using the capabilities of integrated circuitry." /datum/job/scientist/get_request_reasons() @@ -73,23 +73,23 @@ /datum/job/xenobiologist spawn_positions = 3 pto_type = PTO_SCIENCE - alt_titles = list("Xenozoologist" = /datum/alt_title/xenozoologist, "Xenoanthropologist" = /datum/alt_title/xenoanthropologist) + alt_titles = list(JOB_ALT_XENOZOOLOGIST = /datum/alt_title/xenozoologist, JOB_ALT_XENOANTHROPOLOGIST = /datum/alt_title/xenoanthropologist) /datum/alt_title/xenozoologist - title = "Xenozoologist" + title = JOB_ALT_XENOZOOLOGIST /datum/alt_title/xenoanthropologist - title = "Xenoanthropologist" - title_blurb = "Xenoanthropologist still heavily focuses their study on alien lifeforms, but their specialty leans more towards fellow sapient beings than simple animals." + title = JOB_ALT_XENOANTHROPOLOGIST + title_blurb = JOB_ALT_XENOANTHROPOLOGIST + " still heavily focuses their study on alien lifeforms, but their specialty leans more towards fellow sapient beings than simple animals." /datum/job/roboticist total_positions = 3 pto_type = PTO_SCIENCE - 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(JOB_ALT_ASSEMBLY_TECHNICIAN = /datum/alt_title/assembly_tech, JOB_ALT_BIOMECHANICAL_ENGINEER = /datum/alt_title/biomech, JOB_ALT_MECHATRONIC_ENGINEER = /datum/alt_title/mech_tech) /datum/alt_title/assembly_tech - title = "Assembly Technician" + title = JOB_ALT_ASSEMBLY_TECHNICIAN /datum/job/roboticist/get_request_reasons() return list("Repairs needed") @@ -117,10 +117,10 @@ outfit_type = /decl/hierarchy/outfit/job/science/xenobiologist job_description = "A " + JOB_XENOBOTANIST + " grows and cares for a variety of abnormal, custom made, and frequently dangerous plant life. When the products of these plants \ are both safe and beneficial to the station, they may choose to introduce it to the rest of the crew." - alt_titles = list("Xenohydroponicist" = /datum/alt_title/xenohydroponicist, "Xenoflorist" = /datum/alt_title/xenoflorist) + alt_titles = list(JOB_ALT_XENOHYDROPONICIST = /datum/alt_title/xenohydroponicist, JOB_ALT_XENOFLORIST = /datum/alt_title/xenoflorist) /datum/alt_title/xenoflorist - title = "Xenoflorist" + title = JOB_ALT_XENOFLORIST /datum/alt_title/xenohydroponicist - title = "Xenohydroponicist" + title = JOB_ALT_XENOHYDROPONICIST diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 13896f1648..372d459e62 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -34,15 +34,15 @@ job_description = " The " + JOB_HEAD_OF_SECURITY + " manages the Security Department, keeping the station safe and making sure the rules are followed. They are expected to \ keep the other Department Heads, and the rest of the crew, aware of developing situations that may be a threat. If necessary, the HoS may \ perform the duties of absent Security roles, such as distributing gear from the Armory." - alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief) + alt_titles = list(JOB_ALT_SECURITY_COMMANDER = /datum/alt_title/sec_commander, JOB_ALT_CHIEF_OF_SECURITY = /datum/alt_title/sec_chief) // Head of Security Alt Titles /datum/alt_title/sec_commander - title = "Security Commander" + title = JOB_ALT_SECURITY_COMMANDER /datum/alt_title/sec_chief - title = "Chief of Security" + title = JOB_ALT_CHIEF_OF_SECURITY ////////////////////////////////// // Warden diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index 00ffc6149b..b7c196b334 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -11,10 +11,10 @@ access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, access_construction, access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks) - alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief, "Security Manager" = /datum/alt_title/security_manager) + alt_titles = list(JOB_ALT_SECURITY_COMMANDER = /datum/alt_title/sec_commander, JOB_ALT_CHIEF_OF_SECURITY = /datum/alt_title/sec_chief, JOB_ALT_SECURITY_MANAGER = /datum/alt_title/security_manager) /datum/alt_title/security_manager - title = "Security Manager" + title = JOB_ALT_SECURITY_MANAGER /datum/job/hos/get_request_reasons() return list("Wildlife management", "Forensic investigation", "Training crew", "Assembling expedition team") @@ -23,16 +23,16 @@ /datum/job/warden pto_type = PTO_SECURITY dept_time_required = 20 - 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(JOB_ALT_BRIG_SENTRY = /datum/alt_title/brig_sentry, JOB_ALT_ARMORY_SUPERINTENDENT = /datum/alt_title/armory_superintendent, JOB_ALT_MASTERATARMS = /datum/alt_title/master_at_arms) /datum/alt_title/brig_sentry - title = "Brig Sentry" + title = JOB_ALT_BRIG_SENTRY /datum/alt_title/armory_superintendent - title = "Armory Superintendent" + title = JOB_ALT_ARMORY_SUPERINTENDENT /datum/alt_title/master_at_arms - title = "Master-at-Arms" + title = JOB_ALT_MASTERATARMS /datum/job/warden/get_request_reasons() return list("Wildlife management") @@ -40,13 +40,13 @@ /datum/job/detective pto_type = PTO_SECURITY - 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(JOB_ALT_INVESTIGATOR = /datum/alt_title/investigator, JOB_ALT_SECURITY_INSPECTOR = /datum/alt_title/security_inspector, JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech) /datum/alt_title/investigator - title = "Investigator" + title = JOB_ALT_INVESTIGATOR /datum/alt_title/security_inspector - title = "Security Inspector" + title = JOB_ALT_SECURITY_INSPECTOR /datum/job/detective/get_request_reasons() return list("Forensic investigation") @@ -56,20 +56,20 @@ total_positions = 5 spawn_positions = 5 pto_type = PTO_SECURITY - 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(JOB_ALT_PATROL_OFFICER = /datum/alt_title/patrol_officer, JOB_ALT_SECURITY_GUARD = /datum/alt_title/security_guard, + JOB_ALT_SECURITY_DEPUTY = /datum/alt_title/security_guard, JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer, JOB_ALT_SECURITY_CONTRACTOR = /datum/alt_title/security_contractor) /datum/alt_title/patrol_officer - title = "Patrol Officer" + title = JOB_ALT_PATROL_OFFICER /datum/alt_title/security_guard - title = "Security Guard" + title = JOB_ALT_SECURITY_GUARD /datum/alt_title/security_deputy - title = "Security Deputy" + title = JOB_ALT_SECURITY_DEPUTY /datum/alt_title/security_contractor - title = "Security Contractor" + title = JOB_ALT_SECURITY_CONTRACTOR /datum/job/officer/get_request_reasons() return list("Wildlife management", "Assembling expedition team") diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm index ec024d6952..da98eae50e 100644 --- a/code/game/jobs/job/special_vr.dm +++ b/code/game/jobs/job/special_vr.dm @@ -67,13 +67,13 @@ requestable = FALSE outfit_type = /decl/hierarchy/outfit/job/clown pto_type = PTO_CIVILIAN - alt_titles = list("Jester" = /datum/alt_title/jester, "Fool" = /datum/alt_title/fool) + alt_titles = list(JOB_ALT_JESTER = /datum/alt_title/jester, JOB_ALT_FOOL = /datum/alt_title/fool) /datum/alt_title/jester - title = "Jester" + title = JOB_ALT_JESTER /datum/alt_title/fool - title = "Fool" + title = JOB_ALT_FOOL /datum/job/clown/get_access() if(config.assistant_maint) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 2802b4101c..8e62746632 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -127,7 +127,7 @@ var/global/datum/controller/occupations/job_master if(job.is_species_banned(player.client.prefs.species, player.client.prefs.organ_data["brain"]) == TRUE) continue - if(istype(job, GetJob(USELESS_JOB))) // We don't want to give him assistant, that's boring! //VOREStation Edit - Visitor not Assistant + if(istype(job, GetJob(JOB_ALT_VISITOR))) // We don't want to give him assistant, that's boring! //VOREStation Edit - Visitor not Assistant continue if(SSjob.is_job_in_department(job.title, DEPARTMENT_COMMAND)) //If you want a command position, select it! @@ -253,7 +253,7 @@ var/global/datum/controller/occupations/job_master Debug("AC1, Candidates: [assistant_candidates.len]") for(var/mob/new_player/player in assistant_candidates) Debug("AC1 pass, Player: [player]") - AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant + AssignRole(player, JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant assistant_candidates -= player Debug("DO, AC1 end") @@ -340,7 +340,7 @@ var/global/datum/controller/occupations/job_master for(var/mob/new_player/player in unassigned) if(player.client.prefs.alternate_option == BE_ASSISTANT) Debug("AC2 Assistant located, Player: [player]") - AssignRole(player, USELESS_JOB) //VOREStation Edit - Visitor not Assistant + AssignRole(player, JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant //For ones returning to lobby for(var/mob/new_player/player in unassigned) diff --git a/code/game/jobs/whitelist_vr.dm b/code/game/jobs/whitelist_vr.dm index 058a9c0dc1..4088a0a505 100644 --- a/code/game/jobs/whitelist_vr.dm +++ b/code/game/jobs/whitelist_vr.dm @@ -15,7 +15,7 @@ var/list/job_whitelist = list() var/datum/job/job = job_master.GetJob(rank) if(!job.whitelist_only) return 1 - if(rank == USELESS_JOB) //VOREStation Edit - Visitor not Assistant + if(rank == JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant return 1 if(check_rights(R_ADMIN, 0)) return 1 @@ -28,4 +28,3 @@ var/list/job_whitelist = list() if(findtext(s,"[M.ckey] - All")) return 1 return 0 - diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 1b2d960cea..fcd8b79f83 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -79,7 +79,7 @@ /obj/effect/landmark/start/pilot name = JOB_PILOT /obj/effect/landmark/start/visitor - name = USELESS_JOB + name = JOB_ALT_VISITOR /obj/effect/landmark/start/ai name = JOB_AI /obj/effect/landmark/start/cyborg diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 1612058e38..33de858ce0 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -527,8 +527,8 @@ toysay = "Execute him for breaking in!" /obj/item/toy/figure/psychologist - name = "Psychologist action figure" - desc = "A \"Space Life\" brand Psychologist action figure." + name = JOB_ALT_PSYCHOLOGIST + " action figure" + desc = "A \"Space Life\" brand " + JOB_ALT_PSYCHOLOGIST + " action figure." icon_state = "psychologist" toysay = "The analyzer says you're fine!" 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 d5c5a1d082..179283a947 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -99,7 +99,7 @@ rank = JOB_GENETICIST /obj/item/weapon/card/id/medical/psych - name = "Psychologist's ID" + name = JOB_ALT_PSYCHOLOGIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-brown") rank = JOB_PSYCHIATRIST @@ -109,7 +109,7 @@ rank = JOB_ALT_VIROLOGIST /obj/item/weapon/card/id/medical/emt - name = "Emergency Medical Technician's ID" + name = JOB_ALT_EMERGENCY_MEDICAL_TECHNICIAN + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-blue") rank = JOB_PARAMEDIC @@ -213,8 +213,9 @@ rank = JOB_CHAPLAIN /obj/item/weapon/card/id/civilian/journalist - name = "Journalist's ID" + name = JOB_ALT_JOURNALIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n", "stripe-red") + rank = JOB_ALT_JOURNALIST /obj/item/weapon/card/id/civilian/pilot name = JOB_PILOT + "'s 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 b6bd90e1cc..c628a4bd8a 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -299,8 +299,8 @@ rank = JOB_QUARTERMASTER /obj/item/weapon/card/id/assistant - assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant - rank = USELESS_JOB //VOREStation Edit - Visitor not Assistant + assignment = JOB_ALT_VISITOR //VOREStation Edit - Visitor not Assistant + rank = JOB_ALT_VISITOR //VOREStation Edit - Visitor not Assistant /obj/item/weapon/card/id/civilian name = "identification card" @@ -524,7 +524,7 @@ if(!configured) var/list/jobs_to_icon = list( //ITG only has a few kinds of icons so we have to group them up! JOB_PILOT = "itg", - USELESS_JOB = "itg", + JOB_ALT_VISITOR = "itg", JOB_QUARTERMASTER = "itg", JOB_CARGO_TECHNICIAN = "itg", JOB_SHAFT_MINER = "itg", diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 527d455be8..d38b6b1588 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -432,8 +432,8 @@ Traitors and the like can also be revived with the previous role mostly intact. return if(samejob == "Yes") charjob = record_found.fields["real_rank"] - else if(samejob == USELESS_JOB) //VOREStation Edit - Visitor not Assistant - charjob = USELESS_JOB //VOREStation Edit - Visitor not Assistant + else if(samejob == JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant + charjob = JOB_ALT_VISITOR //VOREStation Edit - Visitor not Assistant else records = tgui_alert(src,"No data core entry detected. Would you like add them to the manifest, and sec/med/HR records?","Records",list("No", "Yes", "Cancel")) if(!records || records == "Cancel") diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 2252c5a58b..7d7d0e0ca1 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -309,10 +309,10 @@ corpseidjob = JOB_PILOT /obj/effect/landmark/corpse/vintage/research - name = "Unknown Researcher" + name = "Unknown " + JOB_ALT_RESEARCHER corpsesuit = /obj/item/clothing/suit/space/void/refurb/research corpsehelmet = /obj/item/clothing/head/helmet/space/void/refurb/research - corpseidjob = "Researcher" + corpseidjob = JOB_ALT_RESEARCHER /////////////////Officers////////////////////// diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index da3e1a3db8..c221f36b6c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -668,7 +668,7 @@ /datum/gear/suit/snowsuit/medical display_name = "snowsuit, medical" path = /obj/item/clothing/suit/storage/snowsuit/medical - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST, "Search and Rescue") + allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST, JOB_ALT_SEARCH_AND_RESCUE) show_roles = FALSE /datum/gear/suit/snowsuit/science diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 7e8e132d0e..1881f91561 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -8,7 +8,7 @@ var/list/dreams = list( "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", "the " + JOB_HEAD_OF_PERSONNEL,"the " + JOB_HEAD_OF_SECURITY,"the " + JOB_CHIEF_ENGINEER,"the " + JOB_RESEARCH_DIRECTOR,"the " + JOB_CHIEF_MEDICAL_OFFICER, "the " + JOB_DETECTIVE,"the " + JOB_WARDEN,"an " + JOB_INTERNAL_AFFAIRS_AGENT,"an " + JOB_ENGINEER,"the " + JOB_JANITOR,"the " + JOB_ATMOSPHERIC_TECHNICIAN, - "the " +JOB_QUARTERMASTER,"a " + JOB_CARGO_TECHNICIAN,"the " + JOB_BOTANIST,"a " + JOB_SHAFT_MINER,"the Psychologist","the " + JOB_CHEMIST,"a " + JOB_GENETICIST, + "the " +JOB_QUARTERMASTER,"a " + JOB_CARGO_TECHNICIAN,"the " + JOB_BOTANIST,"a " + JOB_SHAFT_MINER,"the " + JOB_ALT_PSYCHOLOGIST,"the " + JOB_CHEMIST,"a " + JOB_GENETICIST, "the " + JOB_ALT_VIROLOGIST,"the " + JOB_ROBOTICIST,"the " + JOB_CHEF,"the " + JOB_BARTENDER,"the " + JOB_CHAPLAIN,"the " + JOB_LIBRARIAN,"a mouse","an ERT member", "a beach","the holodeck","a smoky room","a voice","the cold","a mouse","an operating table","the bar","the rain","a Skrell", "an Unathi","a Tajaran","the Station Intelligence core","the mining station","the research station","a beaker of strange liquid", diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 743629ca26..54a5f2cf29 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -204,7 +204,7 @@ var/datum/job/previewJob // Determine what job is marked as 'High' priority, and dress them up as such. if(job_civilian_low & ASSISTANT) - previewJob = job_master.GetJob(USELESS_JOB) + previewJob = job_master.GetJob(JOB_ALT_VISITOR) else if(ispAI(client.mob)) //VOREStation Edit! - pAIs shouldn't wear job gear~! //Don't do anything! else diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index efd18067dd..42978418e0 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -679,7 +679,7 @@ /obj/item/weapon/paper/jobs name = "Job Information" - info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\nTechnical Assistant 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\n" + JOB_DETECTIVE + " 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\n" + JOB_ATMOSPHERIC_TECHNICIAN + " 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\n" + JOB_ENGINEER + " 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
\n1. Research phoron
\n2. Make sure all phoron is properly handled.
\n
\n" + JOB_MEDICAL_DOCTOR + " (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\n" + JOB_SECURITY_OFFICER + " 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\n" + JOB_HEAD_OF_SECURITY + " 4>5-2-2
\n\tPeople assigned as " + JOB_HEAD_OF_SECURITY + " should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\n"+ JOB_SITE_MANAGER + " 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" + info = "Information on all formal jobs that can be assigned on Space Station 13 can be found on this document.
\nThe data will be in the following form.
\nGenerally lower ranking positions come first in this list.
\n
\nJob Name general access>lab access-engine access-systems access (atmosphere control)
\n\tJob Description
\nJob Duties (in no particular order)
\nTips (where applicable)
\n
\nResearch Assistant 1>1-0-0
\n\tThis is probably the lowest level position. Anyone who enters the space station after the initial job\nassignment will automatically receive this position. Access with this is restricted. Head of Personnel should\nappropriate the correct level of assistance.
\n1. Assist the researchers.
\n2. Clean up the labs.
\n3. Prepare materials.
\n
\nStaff Assistant 2>0-0-0
\n\tThis position assists the security officer in his duties. The staff assisstants should primarily br\npatrolling the ship waiting until they are needed to maintain ship safety.\n(Addendum: Updated/Elevated Security Protocols admit issuing of low level weapons to security personnel)
\n1. Patrol ship/Guard key areas
\n2. Assist security officer
\n3. Perform other security duties.
\n
\n" + JOB_ALT_TECHNICAL_ASSISTANT + " 1>0-0-1
\n\tThis is yet another low level position. The technical assistant helps the engineer and the statian\ntechnician with the upkeep and maintenance of the station. This job is very important because it usually\ngets to be a heavy workload on station technician and these helpers will alleviate that.
\n1. Assist Station technician and Engineers.
\n2. Perform general maintenance of station.
\n3. Prepare materials.
\n
\nMedical Assistant 1>1-0-0
\n\tThis is the fourth position yet it is slightly less common. This position doesn't have much power\noutside of the med bay. Consider this position like a nurse who helps to upkeep medical records and the\nmaterials (filling syringes and checking vitals)
\n1. Assist the medical personnel.
\n2. Update medical files.
\n3. Prepare materials for medical operations.
\n
\nResearch Technician 2>3-0-0
\n\tThis job is primarily a step up from research assistant. These people generally do not get their own lab\nbut are more hands on in the experimentation process. At this level they are permitted to work as consultants to\nthe others formally.
\n1. Inform superiors of research.
\n2. Perform research alongside of official researchers.
\n
\n" + JOB_DETECTIVE + " 3>2-0-0
\n\tThis job is in most cases slightly boring at best. Their sole duty is to\nperform investigations of crine scenes and analysis of the crime scene. This\nalleviates SOME of the burden from the security officer. This person's duty\nis to draw conclusions as to what happened and testify in court. Said person\nalso should stroe the evidence ly.
\n1. Perform crime-scene investigations/draw conclusions.
\n2. Store and catalogue evidence properly.
\n3. Testify to superiors/inquieries on findings.
\n
\nStation Technician 2>0-2-3
\n\tPeople assigned to this position must work to make sure all the systems aboard Space Station 13 are operable.\nThey should primarily work in the computer lab and repairing faulty equipment. They should work with the\natmospheric technician.
\n1. Maintain SS13 systems.
\n2. Repair equipment.
\n
\n" + JOB_ATMOSPHERIC_TECHNICIAN + " 3>0-0-4
\n\tThese people should primarily work in the atmospheric control center and lab. They have the very important\njob of maintaining the delicate atmosphere on SS13.
\n1. Maintain atmosphere on SS13
\n2. Research atmospheres on the space station. (safely please!)
\n
\n" + JOB_ENGINEER + " 2>1-3-0
\n\tPeople working as this should generally have detailed knowledge as to how the propulsion systems on SS13\nwork. They are one of the few classes that have unrestricted access to the engine area.
\n1. Upkeep the engine.
\n2. Prevent fires in the engine.
\n3. Maintain a safe orbit.
\n
\nMedical Researcher 2>5-0-0
\n\tThis position may need a little clarification. Their duty is to make sure that all experiments are safe and\nto conduct experiments that may help to improve the station. They will be generally idle until a new laboratory\nis constructed.
\n1. Make sure the station is kept safe.
\n2. Research medical properties of materials studied of Space Station 13.
\n
\nScientist 2>5-0-0
\n\tThese people study the properties, particularly the toxic properties, of materials handled on SS13.\nTechnically they can also be called Phoron Technicians as phoron is the material they routinly handle.
\n1. Research phoron
\n2. Make sure all phoron is properly handled.
\n
\n" + JOB_MEDICAL_DOCTOR + " (Officer) 2>0-0-0
\n\tPeople working this job should primarily stay in the medical area. They should make sure everyone goes to\nthe medical bay for treatment and examination. Also they should make sure that medical supplies are kept in\norder.
\n1. Heal wounded people.
\n2. Perform examinations of all personnel.
\n3. Moniter usage of medical equipment.
\n
\n" + JOB_SECURITY_OFFICER + " 3>0-0-0
\n\tThese people should attempt to keep the peace inside the station and make sure the station is kept safe. One\nside duty is to assist in repairing the station. They also work like general maintenance personnel. They are not\ngiven a weapon and must use their own resources.
\n(Addendum: Updated/Elevated Security Protocols admit issuing of weapons to security personnel)
\n1. Maintain order.
\n2. Assist others.
\n3. Repair structural problems.
\n
\n" + JOB_HEAD_OF_SECURITY + " 4>5-2-2
\n\tPeople assigned as " + JOB_HEAD_OF_SECURITY + " should issue orders to the security staff. They should\nalso carefully moderate the usage of all security equipment. All security matters should be reported to this person.
\n1. Oversee security.
\n2. Assign patrol duties.
\n3. Protect the station and staff.
\n
\nHead of Personnel 4>4-2-2
\n\tPeople assigned as head of personnel will find themselves moderating all actions done by personnel. \nAlso they have the ability to assign jobs and access levels.
\n1. Assign duties.
\n2. Moderate personnel.
\n3. Moderate research.
\n
\n"+ JOB_SITE_MANAGER + " 5>5-5-5 (unrestricted station wide access)
\n\tThis is the highest position youi can aquire on Space Station 13. They are allowed anywhere inside the\nspace station and therefore should protect their ID card. They also have the ability to assign positions\nand access levels. They should not abuse their power.
\n1. Assign all positions on SS13
\n2. Inspect the station for any problems.
\n3. Perform administrative duties.
\n" /obj/item/weapon/paper/photograph name = "photo" diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 6259dad876..d47af8a13a 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -18,7 +18,7 @@ if(mind) if((mind.assigned_role == JOB_ENGINEER) || (mind.assigned_role == JOB_CHIEF_ENGINEER)) gain = 100 - if(mind.assigned_role == USELESS_JOB) //VOREStation Edit - Visitor not Assistant + if(mind.assigned_role == JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant gain = rand(0, 300) investigate_log(I_SINGULO,"has been consumed by a singularity", I_SINGULO) gib() diff --git a/code/modules/resleeving/autoresleever.dm b/code/modules/resleeving/autoresleever.dm index d8afe1750d..7c56b5827a 100644 --- a/code/modules/resleeving/autoresleever.dm +++ b/code/modules/resleeving/autoresleever.dm @@ -6,7 +6,7 @@ density = TRUE anchored = TRUE var/equip_body = FALSE //If true, this will spawn the person with equipment - var/default_job = USELESS_JOB //The job that will be assigned if equip_body is true and the ghost doesn't have a job + var/default_job = JOB_ALT_VISITOR //The job that will be assigned if equip_body is true and the ghost doesn't have a job var/ghost_spawns = FALSE //If true, allows ghosts who haven't been spawned yet to spawn var/vore_respawn = 5 MINUTES //The time to wait if you died from vore var/respawn = 30 MINUTES //The time to wait if you didn't die from vore diff --git a/maps/cynosure/cynosure_jobs.dm b/maps/cynosure/cynosure_jobs.dm index 3b35b41e3e..e7ec3296ea 100644 --- a/maps/cynosure/cynosure_jobs.dm +++ b/maps/cynosure/cynosure_jobs.dm @@ -50,6 +50,6 @@ var/const/access_explorer = 43 /* alt_titles = list( - "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, - "Explorer Medic" = /decl/hierarchy/outfit/job/explorer2/medic) + JOB_ALT_EXPLORERE_TECHNICIAN = /decl/hierarchy/outfit/job/explorer2/technician, + JOB_ALT_EXPLORER_MEDIC = /decl/hierarchy/outfit/job/explorer2/medic) */ diff --git a/maps/northern_star/northern_star_jobs.dm b/maps/northern_star/northern_star_jobs.dm index 08a10e8542..e3852a90b6 100644 --- a/maps/northern_star/northern_star_jobs.dm +++ b/maps/northern_star/northern_star_jobs.dm @@ -1,9 +1,9 @@ // Overrides the alt titles. /datum/job/assistant alt_titles = list( - "Technical Assistant", + JOB_ALT_TECHNICAL_ASSISTANT, JOB_ALT_MEDICAL_INTERN, - "Research Assistant", - USELESS_JOB = /decl/hierarchy/outfit/job/assistant/visitor, + JOB_ALT_RESEARCH_ASSISTANT, + JOB_ALT_VISITOR = /decl/hierarchy/outfit/job/assistant/visitor, JOB_ALT_RESIDENT = /decl/hierarchy/outfit/job/assistant/resident ) diff --git a/maps/southern_cross/job/outfits.dm b/maps/southern_cross/job/outfits.dm index 9fa06c2fa9..c42fd755ec 100644 --- a/maps/southern_cross/job/outfits.dm +++ b/maps/southern_cross/job/outfits.dm @@ -25,19 +25,19 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go permit.set_name(H.real_name) /decl/hierarchy/outfit/job/explorer2/technician - name = OUTFIT_JOB_NAME("Explorer Technician") + name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORERE_TECHNICIAN) belt = /obj/item/weapon/storage/belt/utility/full pda_slot = slot_l_store - id_pda_assignment = "Explorer Technician" + id_pda_assignment = JOB_ALT_EXPLORERE_TECHNICIAN /decl/hierarchy/outfit/job/explorer2/medic - name = OUTFIT_JOB_NAME("Explorer Medic") + name = OUTFIT_JOB_NAME(JOB_ALT_EXPLORER_MEDIC) l_hand = /obj/item/weapon/storage/firstaid/regular pda_slot = slot_l_store - id_pda_assignment = "Explorer Medic" + id_pda_assignment = JOB_ALT_EXPLORER_MEDIC /decl/hierarchy/outfit/job/pilot - name = OUTFIT_JOB_NAME("Pilot") + name = OUTFIT_JOB_NAME(JOB_PILOT) shoes = /obj/item/clothing/shoes/black uniform = /obj/item/clothing/under/rank/pilot1/no_webbing suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot @@ -49,7 +49,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go pda_slot = slot_belt pda_type = /obj/item/device/pda //VOREStation Edit - Civilian id_type = /obj/item/weapon/card/id/civilian/pilot - id_pda_assignment = "Pilot" + id_pda_assignment = JOB_PILOT flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL /decl/hierarchy/outfit/job/medical/sar diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index 14eaa584d3..deb66093b1 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -92,8 +92,8 @@ var/const/access_explorer = 43 /* alt_titles = list( - "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, - "Explorer Medic" = /decl/hierarchy/outfit/job/explorer2/medic) + JOB_ALT_EXPLORERE_TECHNICIAN = /decl/hierarchy/outfit/job/explorer2/technician, + JOB_ALT_EXPLORER_MEDIC = /decl/hierarchy/outfit/job/explorer2/medic) */ /datum/job/sar