diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 2712618985..d1ba9df2cd 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -60,6 +60,7 @@ #define JOB_ALT_ASSISTANT "Assistant" +#define JOB_ALT_RESIDENT "Resident" // Talom jobs #define JOB_TALON_CAPTAIN "Talon Captain" @@ -76,17 +77,20 @@ // Medical alt titles #define JOB_ALT_PHARMACIST "Pharmacist" #define JOB_ALT_PHARMACOLOGIST "Pharmacologist" +#define JOB_ALT_VIROLOGIST "Virologist" // Civilian alt titles #define JOB_ALT_GARDENER "Gardener" #define JOB_ALT_PASEUR "Poseur" +#define JOB_ALT_APPRENTICE_ENGINEER "Apprentice Engineer" +#define JOB_ALT_MEDICAL_INTERN "Medical Intern" // 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_COMMANDER "Talon Commander" #define JOB_ALT_TALON_MEDIC "Talon Medic" #define JOB_ALT_TALON_TECHNICIAN "Talon Technician" #define JOB_ALT_TALON_SECURITY "Talon Security" @@ -96,34 +100,153 @@ //Assistant/Visitor/Whatever #define USELESS_JOB "Visitor" +// Mind jobs +#define JOB_SLIME "slime" +#define JOB_LARVA "Larva" +#define JOB_MONKEY "Monkey" +#define JOB_ANIMAL "Animal" +#define JOB_SIMPLE_MOB "Simple Mob" +#define JOB_CORGI "Corgi" +#define JOB_SHADE "Shade" +#define JOB_ARTIFICER "Artificer" +#define JOB_WRAITH "Wraith" +#define JOB_JUGGERNAUT "Juggernaut" +#define JOB_MODE = "MODE" +#define JOB_DISEMBODIED_VOICE "Disembodied Voice" +#define JOB_ALIEN "Alien" +#define JOB_GOLEM "Golem" +#define JOB_CORTICAL_BORER "Cortical Borer" + +#define JOB_SYNTHETIC_BRAIN "Synthetic Brain" +#define JOB_ROBOTIC_INTELLIGENCE "Robotic Intelligence" +#define JOB_POSITRONIC_BRAIN "Positronic Brain" +#define JOB_CARBON_BASED "Carbon-based" +#define JOB_SILICON_BASED "Silicon-based" +#define JOB_PAI "pAI" +#define JOB_PROMETHEAN "Promethean" + +#define JOB_LIVING "Living" +#define JOB_NEW_PLAYER "New player" +#define JOB_GHOST "Ghost" +#define JOB_GHOSTROLES "GhostRoles" +#define JOB_GRAFFITI "Graffiti" +#define JOB_RECORDS "Records" +#define JOB_DIONAEA "Dionaea" +#define JOB_CUSTOM_LOADOUT "Custom loadout" + +// Speical Mind / Antag / Event jobs +#define JOB_CULTIST "Cultist" +#define JOB_MEME "Meme" +#define JOB_APPRENTICE "apprentice" +#define JOB_WIZARD "Wizard" +#define JOB_ANTAGHUD "AntagHUD" +#define JOB_CHANGELING "Changeling" +#define JOB_SYNDICATE "Syndicate" +#define JOB_XENOMORPH "Xenomorph" +#define JOB_BORER "Borer" +#define JOB_EMERGENCY_RESPONSE_TEAM "Emergency Response Team" + + /* -"Emergency Response Team" - "Syndicate" - "Assistant" "Resident" "Virologist", assigned_role, jobname, M_job, check_bans - - 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 - 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("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("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("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("Head Engineer" = /datum/alt_title/head_engineer, "Foreman" = /datum/alt_title/foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager) - - - - alt_titles = list("Apprentice Engineer" = /datum/alt_title/intern_eng, - "Medical Intern" = /datum/alt_title/intern_med, "Research Intern" = /datum/alt_title/intern_sci, "Security Cadet" = /datum/alt_title/intern_sec, "Jr. Cargo Tech" = /datum/alt_title/intern_crg, "Server" = /datum/alt_title/server, - "Assistant" = /datum/alt_title/assistant) + alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, + "Captain" = /datum/alt_title/captain) + alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, + "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) + alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Command Assistant" = /datum/alt_title/command_assistant, "Command Intern" = /datum/alt_title/command_intern, + "Bridge Secretary" = /datum/alt_title/bridge_secretary, "Bridge Assistant" = /datum/alt_title/bridge_assistant) + alt_titles = list("Overseer"= /datum/alt_title/overseer) + alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro) + alt_titles = list("Counselor" = /datum/alt_title/counselor) + alt_titles = list("Sous-chef" = /datum/alt_title/souschef,"Cook" = /datum/alt_title/cook, "Kitchen Worker" = /datum/alt_title/kitchen_worker) + alt_titles = list("Hydroponicist" = /datum/alt_title/hydroponicist, "Cultivator" = /datum/alt_title/cultivator, "Farmer" = /datum/alt_title/farmer, + JOB_ALT_GARDENER = /datum/alt_title/gardener, "Florist" = /datum/alt_title/florsit, "Rancher" = /datum/alt_title/rancher) + alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief, "Logistics Manager" = /datum/alt_title/logistics_manager, "Cargo Supervisor" = /datum/alt_title/cargo_supervisor) + alt_titles = list("Cargo Loader" = /datum/alt_title/cargo_loader, "Cargo Handler" = /datum/alt_title/cargo_handler, "Supply Courier" = /datum/alt_title/supply_courier, + "Disposals Sorter" = /datum/alt_title/disposal_sorter) + alt_titles = list("Deep Space Miner" = /datum/alt_title/deep_space_miner, "Drill Technician" = /datum/alt_title/drill_tech, "Prospector" = /datum/alt_title/prospector, + "Excavator" = /datum/alt_title/excavator) + alt_titles = list("Custodian" = /datum/alt_title/custodian, "Sanitation Technician" = /datum/alt_title/sanitation_tech, + "Maid" = /datum/alt_title/maid, "Garbage Collector" = /datum/alt_title/garbage_collector) + alt_titles = list("Journalist" = /datum/alt_title/journalist, "Reporter" = /datum/alt_title/reporter, "Writer" = /datum/alt_title/writer, + "Historian" = /datum/alt_title/historian, "Archivist" = /datum/alt_title/archivist, "Professor" = /datum/alt_title/professor, + "Academic" = /datum/alt_title/academic, "Philosopher" = /datum/alt_title/philosopher, "Curator" = /datum/alt_title/curator) + alt_titles = list("Internal Affairs Liaison" = /datum/alt_title/ia_liaison, "Internal Affairs Delegate" = /datum/alt_title/ia_delegate, + "Internal Affairs Investigator" = /datum/alt_title/ia_investigator) + alt_titles = list("Missionary" = /datum/alt_title/missionary, "Preacher" = /datum/alt_title/preacher, "Priest" = /datum/alt_title/priest, + "Nun" = /datum/alt_title/nun, "Monk" = /datum/alt_title/monk, "Counselor" = /datum/alt_title/counselor, + "Guru" = /datum/alt_title/guru) + alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman) + alt_titles = list("Performer" = /datum/alt_title/performer, "Musician" = /datum/alt_title/musician, "Stagehand" = /datum/alt_title/stagehand, + "Actor" = /datum/alt_title/actor, "Dancer" = /datum/alt_title/dancer, "Singer" = /datum/alt_title/singer, + "Magician" = /datum/alt_title/magician, "Comedian" = /datum/alt_title/comedian, "Tragedian" = /datum/alt_title/tragedian, + "Artist" = /datum/alt_title/artist, "Game Master" = /datum/alt_title/game_master) + alt_titles = list("Lawyer" = /datum/alt_title/lawyer, "Private Eye" = /datum/alt_title/private_eye, "Bodyguard" = /datum/alt_title/bodyguard, + "Personal Physician" = /datum/alt_title/personal_physician, "Dentist" = /datum/alt_title/dentist, "Fitness Instructor" = /datum/alt_title/fitness_instructor, + "Yoga Teacher" = /datum/alt_title/yoga_teacher, "Masseuse" = /datum/alt_title/masseuse, "Tradesperson" = /datum/alt_title/tradesperson, + "Streamer" = /datum/alt_title/streamer, "Influencer" = /datum/alt_title/influencer, "Paranormal Investigator" = /datum/alt_title/paranormal_investigator, + "Personal Secretary" = /datum/alt_title/personal_secretary, "Stylist" = /datum/alt_title/stylist, "Fisher" = /datum/alt_title/fisher, + "Fortune Teller" = /datum/alt_title/fortune_teller, "Spirit Healer" = /datum/alt_title/spirit_healer) + alt_titles = list("Barista" = /datum/alt_title/barista) + alt_titles = list("Cook" = /datum/alt_title/cook) + alt_titles = list("Supply Chief" = /datum/alt_title/supply_chief) + alt_titles = list("Drill Technician" = /datum/alt_title/drill_tech) + alt_titles = list("Custodian" = /datum/alt_title/custodian) + alt_titles = list("Journalist" = /datum/alt_title/journalist, "Writer" = /datum/alt_title/writer) + alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Foreman" = /datum/alt_title/foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager) + alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, "Engine Technician" = /datum/alt_title/engine_tech, + "Electrician" = /datum/alt_title/electrician, "Construction Engineer" = /datum/alt_title/construction_engi, "Engineering Contractor" = /datum/alt_title/engineering_contractor) + alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech, + "Fuel Technician" = /datum/alt_title/refuel_tech) + alt_titles = list("Maintenance Technician" = /datum/alt_title/maint_tech, + "Engine Technician" = /datum/alt_title/engine_tech, "Electrician" = /datum/alt_title/electrician) + alt_titles = list("Expedition Lead" = /datum/alt_title/expedition_lead, "Exploration Manager" = /datum/alt_title/exploration_manager) + alt_titles = list("Surveyor" = /datum/alt_title/surveyor, "Offsite Scout" = /datum/alt_title/offsite_scout) + alt_titles = list("Expedition Medic" = /datum/alt_title/expedition_medic, "Offsite Medic" = /datum/alt_title/offsite_medic) + alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medical Director" = /datum/alt_title/medical_director, "Healthcare Manager" = /datum/alt_title/healthcare_manager) + alt_titles = list("Physician" = /datum/alt_title/physician, "Medical Practitioner" = /datum/alt_title/medical_practitioner, "Surgeon" = /datum/alt_title/surgeon, + "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, "Orderly" = /datum/alt_title/orderly, + JOB_ALT_VIROLOGIST = /datum/alt_title/virologist, "Medical Contractor" = /datum/alt_title/medical_contractor) + alt_titles = list("Psychologist" = /datum/alt_title/psychologist, "Psychoanalyst" = /datum/alt_title/psychoanalyst, "Psychotherapist" = /datum/alt_title/psychotherapist) + alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder, "Search and Rescue" = /datum/alt_title/sar) alt_titles = list( + "Surgeon" = /datum/alt_title/surgeon, + "Emergency Physician" = /datum/alt_title/emergency_physician, + "Nurse" = /datum/alt_title/nurse, + JOB_ALT_VIROLOGIST = /datum/alt_title/virologist) + alt_titles = list("Psychologist" = /datum/alt_title/psychologist) + alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt) + alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager, + "Head of Development" = /datum/alt_title/head_of_development,"Head Scientist" = /datum/alt_title/head_scientist) + alt_titles = list("Researcher" = /datum/alt_title/researcher, "Lab Assistant" = /datum/alt_title/lab_assistant, "Xenoarchaeologist" = /datum/alt_title/xenoarch, + "Xenopaleontologist" = /datum/alt_title/xenopaleontologist, "Anomalist" = /datum/alt_title/anomalist, "Phoron Researcher" = /datum/alt_title/phoron_research, + "Gas Physicist" = /datum/alt_title/gas_physicist, "Circuit Designer" = /datum/alt_title/circuit_designer, "Circuit Programmer" = /datum/alt_title/circuit_programmer) + alt_titles = list("Xenozoologist" = /datum/alt_title/xenozoologist, "Xenoanthropologist" = /datum/alt_title/xenoanthropologist) + alt_titles = list("Assembly Technician" = /datum/alt_title/assembly_tech, "Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech) + alt_titles = list("Xenohydroponicist" = /datum/alt_title/xenohydroponicist, "Xenoflorist" = /datum/alt_title/xenoflorist) + alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor) + alt_titles = list("Xenoarchaeologist" = /datum/alt_title/xenoarch, "Anomalist" = /datum/alt_title/anomalist, \ + "Phoron Researcher" = /datum/alt_title/phoron_research) + alt_titles = list("Biomechanical Engineer" = /datum/alt_title/biomech, "Mechatronic Engineer" = /datum/alt_title/mech_tech) + alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent, "Master-at-Arms" = /datum/alt_title/master_at_arms) + alt_titles = list("Investigator" = /datum/alt_title/investigator, "Security Inspector" = /datum/alt_title/security_inspector, JOB_ALT_FORENSIC_TECHNICIAN = /datum/alt_title/forensic_tech) + alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, + "Security Deputy" = /datum/alt_title/security_guard, JOB_ALT_JUNIOR_OFFICER = /datum/alt_title/junior_officer, "Security Contractor" = /datum/alt_title/security_contractor) + alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief) + alt_titles = list("Jester" = /datum/alt_title/jester, "Fool" = /datum/alt_title/fool) + + + "Technical Assistant", + JOB_ALT_MEDICAL_INTERN, + "Research Assistant", + + + "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, + "Explorer Medic" = /decl/hierarchy/outfit/job/explorer2/medic) + */ diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 45ddb1dc70..0f751da5c5 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -511,9 +511,9 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, SPECIES_SHADEKIN) //Shadefluffers just poof away /var/global/list/alt_titles_with_icons = list( - "Virologist", - "Apprentice Engineer", - "Medical Intern", + JOB_ALT_VIROLOGIST, + JOB_ALT_APPRENTICE_ENGINEER, + JOB_ALT_MEDICAL_INTERN, "Research Intern", "Security Cadet", "Jr. Cargo Tech", diff --git a/code/datums/ghost_query.dm b/code/datums/ghost_query.dm index 89fa873e03..64f208c850 100644 --- a/code/datums/ghost_query.dm +++ b/code/datums/ghost_query.dm @@ -53,7 +53,7 @@ /// Send async alerts and ask for responses. Expects you to have tested D for client and type already /datum/ghost_query/proc/ask_question(var/mob/observer/dead/D) //VOREStation Add Start Check the ban status before we ask - if(jobban_isbanned(D, "GhostRoles")) + if(jobban_isbanned(D, JOB_GHOSTROLES)) return //VOREStation Add End @@ -128,7 +128,7 @@ role_name = "Technomancer Apprentice" question = "A Technomancer is requesting an Apprentice to help them on their adventure to the facility. Would you like to play as the Apprentice?" be_special_flag = BE_WIZARD - check_bans = list("Syndicate", "wizard") + check_bans = list(JOB_SYNDICATE, JOB_WIZARD) cutoff_number = 1 /datum/ghost_query/xeno @@ -141,7 +141,7 @@ role_name = "Xenomorph Larva" question = "A xenomorph larva is ready to hatch from their egg. Would you like to join the hive?" be_special_flag = BE_ALIEN - check_bans = list("Xenomorph") + check_bans = list(JOB_XENOMORPH) cutoff_number = 1 @@ -156,14 +156,14 @@ role_name = "Mercenary Drone" question = "A team of dubious mercenaries have purchased a powerful drone, and they are attempting to activate it. Would you like to play as the drone?" be_special_flag = BE_AI - check_bans = list(JOB_AI, JOB_CYBORG, "Syndicate") + check_bans = list(JOB_AI, JOB_CYBORG, JOB_SYNDICATE) cutoff_number = 1 /datum/ghost_query/borer role_name = "Cortical Borer" question = "A cortical borer has just been created on the facility. Would you like to play as them?" be_special_flag = BE_ALIEN - check_bans = list("Syndicate", "Borer") + check_bans = list(JOB_SYNDICATE, JOB_BORER) cutoff_number = 1 // Surface stuff. diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 77d8d22971..840ce63895 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -527,11 +527,11 @@ //slime /mob/living/simple_mob/slime/mind_initialize() . = ..() - mind.assigned_role = "slime" + mind.assigned_role = JOB_SLIME /mob/living/carbon/alien/larva/mind_initialize() . = ..() - mind.special_role = "Larva" + mind.special_role = JOB_LARVA //AI /mob/living/silicon/ai/mind_initialize() @@ -546,34 +546,34 @@ //PAI /mob/living/silicon/pai/mind_initialize() . = ..() - mind.assigned_role = "pAI" + mind.assigned_role = JOB_PAI mind.special_role = "" //Animals /mob/living/simple_mob/mind_initialize() . = ..() - mind.assigned_role = "Simple Mob" + mind.assigned_role = JOB_SIMPLE_MOB /mob/living/simple_mob/animal/passive/dog/corgi/mind_initialize() . = ..() - mind.assigned_role = "Corgi" + mind.assigned_role = JOB_CORGI /mob/living/simple_mob/construct/shade/mind_initialize() . = ..() - mind.assigned_role = "Shade" - mind.special_role = "Cultist" + mind.assigned_role = JOB_SHADE + mind.special_role = JOB_CULTIST /mob/living/simple_mob/construct/artificer/mind_initialize() . = ..() - mind.assigned_role = "Artificer" - mind.special_role = "Cultist" + mind.assigned_role = JOB_ARTIFICER + mind.special_role = JOB_CULTIST /mob/living/simple_mob/construct/wraith/mind_initialize() . = ..() - mind.assigned_role = "Wraith" - mind.special_role = "Cultist" + mind.assigned_role = JOB_WRAITH + mind.special_role = JOB_CULTIST /mob/living/simple_mob/construct/juggernaut/mind_initialize() . = ..() - mind.assigned_role = "Juggernaut" - mind.special_role = "Cultist" + mind.assigned_role = JOB_JUGGERNAUT + mind.special_role = JOB_CULTIST diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm index 8291540ae8..47f05f18a4 100644 --- a/code/datums/outfits/jobs/civilian.dm +++ b/code/datums/outfits/jobs/civilian.dm @@ -14,8 +14,8 @@ //VOREStation Add End - Interns /decl/hierarchy/outfit/job/assistant/resident - name = OUTFIT_JOB_NAME("Resident") - id_pda_assignment = "Resident" + name = OUTFIT_JOB_NAME(JOB_ALT_RESIDENT) + id_pda_assignment = JOB_ALT_RESIDENT uniform = /obj/item/clothing/under/color/white /decl/hierarchy/outfit/job/service diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm index 2344d7c62b..cda566b951 100644 --- a/code/datums/outfits/jobs/medical.dm +++ b/code/datums/outfits/jobs/medical.dm @@ -37,7 +37,7 @@ head = /obj/item/clothing/head/surgery/blue /decl/hierarchy/outfit/job/medical/doctor/virologist - name = OUTFIT_JOB_NAME("Virologist") + name = OUTFIT_JOB_NAME(JOB_ALT_VIROLOGIST) uniform = /obj/item/clothing/under/rank/virologist suit = /obj/item/clothing/suit/storage/toggle/labcoat/virologist mask = /obj/item/clothing/mask/surgical diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index 8778cef2cc..cf81f4053d 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -48,7 +48,7 @@ var/landmark_id // Spawn point identifier. var/mob_path = /mob/living/carbon/human // Mobtype this antag will use if none is provided. var/feedback_tag = "traitor_objective" // End of round - var/bantype = "Syndicate" // Ban to check when spawning this antag. + var/bantype = JOB_SYNDICATE // Ban to check when spawning this antag. var/minimum_player_age = 7 // Players need to be at least minimum_player_age days old before they are eligable for auto-spawning var/suspicion_chance = 50 // Prob of being on the initial Command report var/flags = 0 // Various runtime options. diff --git a/code/game/antagonist/outsider/ert.dm b/code/game/antagonist/outsider/ert.dm index 09aa113606..59e6a4a30c 100644 --- a/code/game/antagonist/outsider/ert.dm +++ b/code/game/antagonist/outsider/ert.dm @@ -2,7 +2,7 @@ var/datum/antagonist/ert/ert /datum/antagonist/ert id = MODE_ERT - bantype = "Emergency Response Team" + bantype = JOB_EMERGENCY_RESPONSE_TEAM role_type = BE_OPERATIVE role_text = "Emergency Responder" role_text_plural = "Emergency Responders" diff --git a/code/game/antagonist/outsider/technomancer.dm b/code/game/antagonist/outsider/technomancer.dm index 579e5631d7..e0b2f87433 100644 --- a/code/game/antagonist/outsider/technomancer.dm +++ b/code/game/antagonist/outsider/technomancer.dm @@ -5,8 +5,8 @@ var/datum/antagonist/technomancer/technomancers role_type = BE_WIZARD role_text = "Technomancer" role_text_plural = "Technomancers" - bantype = "wizard" - landmark_id = "wizard" + bantype = JOB_WIZARD + landmark_id = JOB_WIZARD welcome_text = "You will need to purchase functions and perhaps some equipment from the various machines around your \ base. Choose your technological arsenal carefully. Remember that without the core on your back, your functions are \ powerless, and therefore you will be as well.
\ diff --git a/code/game/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm index 0fcded12c6..8c97145f18 100644 --- a/code/game/antagonist/outsider/wizard.dm +++ b/code/game/antagonist/outsider/wizard.dm @@ -5,8 +5,8 @@ var/datum/antagonist/wizard/wizards role_type = BE_WIZARD role_text = "Space Wizard" role_text_plural = "Space Wizards" - bantype = "wizard" - landmark_id = "wizard" + bantype = JOB_WIZARD + landmark_id = JOB_WIZARD welcome_text = "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.
In your pockets you will find a teleport scroll. Use it as needed." flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE antaghud_indicator = "hudwizard" diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 0c52c00621..7034d9698c 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -166,7 +166,7 @@ var/list/sacrificed = list() if(!waiting_for_input[target]) //so we don't spam them with dialogs if they hesitate waiting_for_input[target] = 1 - if(!cult.can_become_antag(target.mind) || jobban_isbanned(target, "cultist"))//putting jobban check here because is_convertable uses mind as argument + if(!cult.can_become_antag(target.mind) || jobban_isbanned(target, JOB_CULTIST))//putting jobban check here because is_convertable uses mind as argument //waiting_for_input ensures this is only shown once, so they basically auto-resist from here on out. They still need to find a way to get off the freaking rune if they don't want to burn to death, though. to_chat(target, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") to_chat(target, "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs.") @@ -351,7 +351,7 @@ var/list/sacrificed = list() to_chat(usr, "The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used.") return fizzle() - if(!cult.can_become_antag(corpse_to_raise.mind) || jobban_isbanned(corpse_to_raise, "cultist")) + if(!cult.can_become_antag(corpse_to_raise.mind) || jobban_isbanned(corpse_to_raise, JOB_CULTIST)) to_chat(usr, "The Geometer of Blood refuses to touch this one.") return fizzle() else if(!corpse_to_raise.client && corpse_to_raise.mind) //Don't force the dead person to come back if they don't want to. @@ -459,7 +459,7 @@ var/list/sacrificed = list() break if(!ghost) return this_rune.fizzle() - if(jobban_isbanned(ghost, "cultist")) + if(jobban_isbanned(ghost, JOB_CULTIST)) return this_rune.fizzle() usr.say("Gal'h'rfikk harfrandid mud[pick("'","`")]gib!") diff --git a/code/game/gamemodes/cult/soulstone.dm b/code/game/gamemodes/cult/soulstone.dm index 3fbeb13a7f..6fefdbc7aa 100644 --- a/code/game/gamemodes/cult/soulstone.dm +++ b/code/game/gamemodes/cult/soulstone.dm @@ -24,7 +24,7 @@ return ..() if(istype(M, /mob/living/carbon/human/dummy)) return..() - if(jobban_isbanned(M, "cultist")) + if(jobban_isbanned(M, JOB_CULTIST)) to_chat(user, "This person's soul is too corrupt and cannot be captured!") return..() diff --git a/code/game/gamemodes/meme/meme.dm b/code/game/gamemodes/meme/meme.dm index b32516a0fa..d9ac36085a 100644 --- a/code/game/gamemodes/meme/meme.dm +++ b/code/game/gamemodes/meme/meme.dm @@ -66,8 +66,8 @@ // so that we can later know which host belongs to which meme assigned_hosts[meme.key] = first_host - meme.assigned_role = "MODE" //So they aren't chosen for other jobs. - meme.special_role = "Meme" + meme.assigned_role = JOB_MODE //So they aren't chosen for other jobs. + meme.special_role = JOB_MEME return 1 diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index e3dc3dccd0..b162a691d6 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -1,8 +1,8 @@ /datum/game_mode/wizard - name = "Wizard" + name = JOB_WIZARD round_description = "There is a SPACE WIZARD on the station. You can't let the magician achieve their objectives!" extended_round_description = "A powerful entity capable of manipulating the elements around him, most commonly referred to as a 'wizard', has infiltrated the station. They have a wide variety of powers and spells available to them that makes your own simple moral self tremble with fear and excitement. Ultimately, their purpose is unknown. However, it is up to you and your crew to decide if their powers can be used for good or if their arrival foreshadows the destruction of the entire station." - config_tag = "wizard" + config_tag = JOB_WIZARD votable = 0 required_players = 1 required_players_secret = 3 diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 0f092d220d..32773362a0 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -430,7 +430,7 @@ var/const/access_pilot = 67 /var/const/access_cent_specops = 103//Special Ops. /datum/access/cent_specops id = access_cent_specops - desc = "Emergency Response Team Prep" + desc = JOB_EMERGENCY_RESPONSE_TEAM + " Prep" access_type = ACCESS_TYPE_CENTCOM /var/const/access_cent_medical = 104//Medical/Research @@ -460,7 +460,7 @@ var/const/access_pilot = 67 /var/const/access_cent_creed = 108//Creed's office. /datum/access/cent_creed id = access_cent_creed - desc = "Emergency Response Team Administration" + desc = JOB_EMERGENCY_RESPONSE_TEAM + " Administration" access_type = ACCESS_TYPE_CENTCOM /var/const/access_cent_captain = 109//Captain's office/ID comp/AI. diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index adc1b801b9..accb501bda 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -19,7 +19,7 @@ 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, - "Medical Intern"= /datum/alt_title/med_intern, "Research Assistant" = /datum/alt_title/research_assist, + JOB_ALT_MEDICAL_INTERN= /datum/alt_title/med_intern, "Research Assistant" = /datum/alt_title/research_assist, "Visitor" = /datum/alt_title/visitor) ) */ //VOREStation Removal: no alt-titles for visitors @@ -36,9 +36,9 @@ often in training to become an " + JOB_ENGINEER + ". A Technical Assistant has no real authority." /datum/alt_title/med_intern - title = "Medical Intern" - title_blurb = "A Medical Intern attempts to provide whatever the Medical department needs. They are frequently asked to pay attention to \ - the suit sensors console. A Medical Intern has no real authority." + title = JOB_ALT_MEDICAL_INTERN + title_blurb = "A " + JOB_ALT_MEDICAL_INTERN + " attempts to provide whatever the Medical department needs. They are frequently asked to pay attention to \ + the suit sensors console. A " + JOB_ALT_MEDICAL_INTERN + " has no real authority." /datum/alt_title/research_assist title = "Research Assistant" @@ -53,7 +53,7 @@ title_outfit = /decl/hierarchy/outfit/job/assistant/visitor /datum/alt_title/resident // Just in case it makes a comeback - title = "Resident" - title_blurb = "A Resident is an individual who resides on the station, frequently in a different part of the station than what is seen. \ + title = JOB_ALT_RESIDENT + title_blurb = "A " + JOB_ALT_RESIDENT + " is an individual who resides on the station, frequently in a different part of the station than what is seen. \ They are considered to be part of the crew for most purposes, but have no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/resident diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index a35e199758..d440291f0e 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -16,8 +16,8 @@ access = list() //See /datum/job/intern/get_access() minimal_access = list() //See /datum/job/intern/get_access() outfit_type = /decl/hierarchy/outfit/job/assistant/intern - alt_titles = list("Apprentice Engineer" = /datum/alt_title/intern_eng, - "Medical Intern" = /datum/alt_title/intern_med, + alt_titles = list(JOB_ALT_APPRENTICE_ENGINEER = /datum/alt_title/intern_eng, + JOB_ALT_MEDICAL_INTERN = /datum/alt_title/intern_med, "Research Intern" = /datum/alt_title/intern_sci, "Security Cadet" = /datum/alt_title/intern_sec, "Jr. Cargo Tech" = /datum/alt_title/intern_crg, @@ -29,15 +29,15 @@ requestable = FALSE /datum/alt_title/intern_eng - title = "Apprentice Engineer" - title_blurb = "An Apprentice Engineer attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \ - often in training to become an Engineer. An Apprentice Engineer has no real authority." + title = JOB_ALT_APPRENTICE_ENGINEER + title_blurb = "An " + JOB_ALT_APPRENTICE_ENGINEER + " attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \ + often in training to become an Engineer. An " + JOB_ALT_APPRENTICE_ENGINEER + " has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/engineer /datum/alt_title/intern_med - title = "Medical Intern" - title_blurb = "A Medical Intern attempts to provide whatever the Medical department needs. They are not proper Doctors, and are \ - often in training to become a Doctor. A Medical Intern has no real authority." + title = JOB_ALT_MEDICAL_INTERN + title_blurb = "A " + JOB_ALT_MEDICAL_INTERN + " attempts to provide whatever the Medical department needs. They are not proper Doctors, and are \ + often in training to become a Doctor. A " + JOB_ALT_MEDICAL_INTERN + " has no real authority." title_outfit = /decl/hierarchy/outfit/job/assistant/medic /datum/alt_title/intern_sci diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index c79890ea15..d02312731b 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -59,7 +59,7 @@ "Surgeon" = /datum/alt_title/surgeon, "Emergency Physician" = /datum/alt_title/emergency_physician, "Nurse" = /datum/alt_title/nurse, - "Virologist" = /datum/alt_title/virologist) + JOB_ALT_VIROLOGIST = /datum/alt_title/virologist) min_age_by_species = list(SPECIES_PROMETHEAN = 3) @@ -85,8 +85,8 @@ title_outfit = /decl/hierarchy/outfit/job/medical/doctor/nurse /datum/alt_title/virologist - title = "Virologist" - title_blurb = "A Virologist cures active diseases in the crew, and prepares antibodies for possible infections. They also have the skills \ + title = JOB_ALT_VIROLOGIST + title_blurb = "A " + JOB_ALT_VIROLOGIST + " cures active diseases in the crew, and prepares antibodies for possible infections. They also have the skills \ to produce the various types of virus foods or mutagens." title_outfit = /decl/hierarchy/outfit/job/medical/doctor/virologist diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 89db6f648a..fcdcb49091 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -30,7 +30,7 @@ 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, - "Virologist" = /datum/alt_title/virologist, "Medical Contractor" = /datum/alt_title/medical_contractor) + JOB_ALT_VIROLOGIST = /datum/alt_title/virologist, "Medical Contractor" = /datum/alt_title/medical_contractor) /datum/alt_title/physician title = "Physician" diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 261879cf10..da818e6832 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -138,7 +138,7 @@ to_chat(user, "Sticking a dead [P] into the frame would sort of defeat the purpose.") return - if(jobban_isbanned(M.brainmob, "AI")) + if(jobban_isbanned(M.brainmob, JOB_AI)) to_chat(user, "This [P] does not seem to fit.") return diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 660aadae65..8c635ebc99 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -43,7 +43,7 @@ updateUsrDialog() return var/mob/M = locate(href_list["traitormob"]) - if(M.mind.special_role || jobban_isbanned(M, "Syndicate")) + if(M.mind.special_role || jobban_isbanned(M, JOB_SYNDICATE)) temptext = "We have no need for you at this time. Have a pleasant day.
" updateUsrDialog() return diff --git a/code/game/machinery/syndicatebeacon_vr.dm b/code/game/machinery/syndicatebeacon_vr.dm index 30dd61458c..d340cdf57f 100644 --- a/code/game/machinery/syndicatebeacon_vr.dm +++ b/code/game/machinery/syndicatebeacon_vr.dm @@ -25,7 +25,7 @@ updateUsrDialog() return var/mob/M = locate(href_list["traitormob"]) - if(M.mind.tcrystals > 0 || jobban_isbanned(M, "Syndicate")) + if(M.mind.tcrystals > 0 || jobban_isbanned(M, JOB_SYNDICATE)) temptext = "We have no need for you at this time. Have a pleasant day.
" updateUsrDialog() return diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm index 1a054c7cbc..edd707c3de 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -105,7 +105,7 @@ to_chat(new_voice, "If you want to end the call, use the 'Hang Up' verb. The other person can also hang up at any time.") to_chat(new_voice, "Remember, your character does not know anything you've learned from observing!") if(new_voice.mind) - new_voice.mind.assigned_role = "Disembodied Voice" + new_voice.mind.assigned_role = JOB_DISEMBODIED_VOICE if(user) to_chat(user, "[icon2html(src,new_voice.client)] Your communicator is now connected to [candidate]'s communicator.") diff --git a/code/game/objects/items/devices/denecrotizer_vr.dm b/code/game/objects/items/devices/denecrotizer_vr.dm index 43dbeab6c0..c7f4d3d1a4 100644 --- a/code/game/objects/items/devices/denecrotizer_vr.dm +++ b/code/game/objects/items/devices/denecrotizer_vr.dm @@ -43,7 +43,7 @@ /mob/living/simple_mob/attack_ghost(mob/observer/dead/user as mob) if(!ghostjoin) return ..() - if(jobban_isbanned(user, "GhostRoles")) + if(jobban_isbanned(user, JOB_GHOSTROLES)) to_chat(user, "You cannot inhabit this creature because you are banned from playing ghost roles.") return if(!evaluate_ghost_join(user)) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 2dda16f7b5..b6bd723d28 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -67,7 +67,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard) else if(time_till_respawn) // Nonzero time to respawn to_chat(usr, "You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.") return - if(jobban_isbanned(usr, "pAI")) + if(jobban_isbanned(usr, JOB_PAI)) to_chat(usr,"You cannot join a pAI card when you are banned from playing as a pAI.") return diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 27e17a6562..1612058e38 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -479,8 +479,8 @@ toysay = "Oh god! Stop shooting, I'm friendly!" /obj/item/toy/figure/wizard - name = "Wizard action figure" - desc = "A \"Space Life\" brand Wizard action figure." + name = JOB_WIZARD + " action figure" + desc = "A \"Space Life\" brand " + JOB_WIZARD + " action figure." icon_state = "wizard" toysay = "Ei Nath!" @@ -515,8 +515,8 @@ toysay = "I am the law!" /obj/item/toy/figure/virologist - name = "Virologist action figure" - desc = "A \"Space Life\" brand Virologist action figure." + name = JOB_ALT_VIROLOGIST + " action figure" + desc = "A \"Space Life\" brand " + JOB_ALT_VIROLOGIST + " action figure." icon_state = "virologist" toysay = "The cure is potassium!" @@ -539,8 +539,8 @@ toysay = "WHERE ARE YOU??" /obj/item/toy/figure/ert - name = "Emergency Response Team Commander action figure" - desc = "A \"Space Life\" brand Emergency Response Team Commander action figure." + name = JOB_EMERGENCY_RESPONSE_TEAM + " Commander action figure" + desc = "A \"Space Life\" brand " + JOB_EMERGENCY_RESPONSE_TEAM + " Commander action figure." icon_state = "ert" toysay = "We're probably the good guys!" diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm index 6d0be3819c..291748c7e4 100644 --- a/code/game/objects/items/weapons/capture_crystal.dm +++ b/code/game/objects/items/weapons/capture_crystal.dm @@ -317,7 +317,7 @@ //Handles checking relevent bans, preferences, and asking the player if they want to be caught /obj/item/capture_crystal/proc/capture_player(mob/living/M, mob/living/U) - if(jobban_isbanned(M, "GhostRoles")) + if(jobban_isbanned(M, JOB_GHOSTROLES)) to_chat(U, "This creature is not suitable for capture.") playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) else if(!M.capture_crystal || M.capture_caught) 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 b2e3a54838..754ee53b58 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -104,8 +104,9 @@ rank = JOB_PSYCHIATRIST /obj/item/weapon/card/id/medical/virologist - name = "Virologist's ID" + name = JOB_ALT_VIROLOGIST + "'s ID" initial_sprite_stack = list("base-stamp", "top-medblu", "stamp-n", "stripe-green") + rank = JOB_ALT_VIROLOGIST /obj/item/weapon/card/id/medical/emt name = "Emergency Medical Technician's ID" @@ -325,6 +326,7 @@ /obj/item/weapon/card/id/syndicate name = "Syndicate ID" initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s") + rank = JOB_SYNDICATE /obj/item/weapon/card/id/syndicate/officer name = "Syndicate Officer 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 668a3c2cfd..a6a8e3b38f 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -203,9 +203,10 @@ access |= get_all_station_access() /obj/item/weapon/card/id/centcom/ERT - name = "\improper Emergency Response Team ID" - assignment = "Emergency Response Team" + name = "\improper " + JOB_EMERGENCY_RESPONSE_TEAM + "ID" + assignment = JOB_EMERGENCY_RESPONSE_TEAM icon_state = "ert-id" + rank = JOB_EMERGENCY_RESPONSE_TEAM /obj/item/weapon/card/id/centcom/ERT/Initialize() . = ..() @@ -404,7 +405,7 @@ /obj/item/weapon/card/id/event/accessset/itg/crew/pilot name = "\improper ITG Pilot's ID" desc = "An ID card belonging to the Pilot of an ITG vessel. The Pilot's responsibility is primarily to fly the ship. They may also be tasked to assist with cargo movement duties." - assignment = "v + assignment = JOB_PILOT rank = JOB_PILOT /obj/item/weapon/card/id/event/accessset/itg/crew/service diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 417032f476..5f6362c4de 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -1401,7 +1401,7 @@ name = "Sneezes and Coughs: A Guide To Virology, 1st Edition" icon_state = "bookvirology" item_state = "book5" - author = "James Simpson, Chief Virologist" + author = "James Simpson, Chief " + JOB_ALT_VIROLOGIST title = "Sneezes and Coughs: A Guide To Virology, 1st Edition" dat = {" diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index fb2fa68299..5f1060a9f7 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -78,7 +78,7 @@ var/choice var/finalized = "No" - if(jobban_isbanned(M, "GhostRoles")) + if(jobban_isbanned(M, JOB_GHOSTROLES)) to_chat(M, "You cannot inhabit this creature because you are banned from playing ghost roles.") reset_ghostpod() return diff --git a/code/game/objects/structures/ghost_pods/ghost_pods.dm b/code/game/objects/structures/ghost_pods/ghost_pods.dm index c505027b13..76d54c95fc 100644 --- a/code/game/objects/structures/ghost_pods/ghost_pods.dm +++ b/code/game/objects/structures/ghost_pods/ghost_pods.dm @@ -87,7 +87,7 @@ /obj/structure/ghost_pod/ghost_activated/attack_ghost(var/mob/observer/dead/user) //VOREStation Add Start - if(jobban_isbanned(user, "GhostRoles")) + if(jobban_isbanned(user, JOB_GHOSTROLES)) to_chat(user, "You cannot inhabit this creature because you are banned from playing ghost roles.") return diff --git a/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm b/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm index 2ae1a6f496..63a2475754 100644 --- a/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm +++ b/code/game/objects/structures/ghost_pods/ghost_pods_vr.dm @@ -11,7 +11,7 @@ var/activated = FALSE /obj/structure/ghost_pod/manual/attack_ghost(var/mob/observer/dead/user) - if(jobban_isbanned(user, "GhostRoles")) + if(jobban_isbanned(user, JOB_GHOSTROLES)) to_chat(user, "You cannot inhabit this creature because you are banned from playing ghost roles.") return diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 72017ba5bf..b88bb76d57 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -88,7 +88,7 @@ return //VOREStation Add Start - if(jobban_isbanned(user, "GhostRoles")) + if(jobban_isbanned(user, JOB_GHOSTROLES)) to_chat(user, "You cannot become a mouse because you are banned from playing ghost roles.") return //VOREStation Add End diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 4d229aa903..ec69bdefec 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -53,7 +53,7 @@ var/silent_ert = 0 if(!send_emergency_team) to_chat(usr, "No emergency response team is currently being sent.") return - if(jobban_isbanned(usr, "Syndicate") || jobban_isbanned(usr, "Emergency Response Team") || jobban_isbanned(usr, JOB_SECURITY_OFFICER)) + if(jobban_isbanned(usr, JOB_SYNDICATE) || jobban_isbanned(usr, JOB_EMERGENCY_RESPONSE_TEAM) || jobban_isbanned(usr, JOB_SECURITY_OFFICER)) to_chat(usr, "You are jobbanned from the emergency reponse team!") return if(ert.current_antagonists.len >= ert.hard_cap) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 2b601144ac..e15dfffe18 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -320,7 +320,7 @@ if(!tool || !tool.sharp || !can_engrave()) return FALSE - if(jobban_isbanned(vandal, "Graffiti")) + if(jobban_isbanned(vandal, JOB_GRAFFITI)) to_chat(vandal, SPAN_WARNING("You are banned from leaving persistent information across rounds.")) return diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index dcdab6d72f..f9420b886f 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -153,7 +153,7 @@ var/savefile/Banlistjob if(rank == RANK_VIROLOGIST_RD_CMO) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_CHIEF_MEDICAL_OFFICER) AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_RESEARCH_DIRECTOR) - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Virologist") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, JOB_ALT_VIROLOGIST) return 1 Banlistjob.cd = "/base" diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 47f3b81ac8..9f144197a2 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -230,38 +230,38 @@ if(ishuman(M)) M_job = M.job else if(isslime(M)) - M_job = "slime" + M_job = JOB_SLIME else if(issmall(M)) - M_job = "Monkey" + M_job = JOB_MONKEY else if(isalien(M)) - M_job = "Alien" + M_job = JOB_ALIEN else - M_job = "Carbon-based" + M_job = JOB_CARBON_BASED else if(issilicon(M)) //silicon if(isAI(M)) M_job = JOB_AI else if(ispAI(M)) - M_job = "pAI" + M_job = JOB_PAI else if(isrobot(M)) M_job = JOB_CYBORG else - M_job = "Silicon-based" + M_job = JOB_SILICON_BASED else if(isanimal(M)) //simple animals if(iscorgi(M)) - M_job = "Corgi" + M_job = JOB_CORGI else - M_job = "Animal" + M_job = JOB_ANIMAL else - M_job = "Living" + M_job = JOB_LIVING else if(istype(M,/mob/new_player)) - M_job = "New player" + M_job = JOB_NEW_PLAYER else if(isobserver(M)) - M_job = "Ghost" + M_job = JOB_GHOST M_job = replacetext(M_job, "'", "") M_job = replacetext(M_job, "\"", "") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f04473e18c..24e9364c9b 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -629,7 +629,7 @@ //Antagonist (Orange) counter = 0 - var/isbanned_dept = jobban_isbanned(M, "Syndicate") + var/isbanned_dept = jobban_isbanned(M, JOB_SYNDICATE) jobs += "" jobs += "" @@ -652,7 +652,7 @@ //Misc 'roles' counter = 0 - var/list/misc_roles = list("Dionaea", "Graffiti", "Custom loadout", "pAI", "GhostRoles", "AntagHUD") + var/list/misc_roles = list(JOB_DIONAEA, JOB_GRAFFITI, JOB_CUSTOM_LOADOUT, JOB_PAI, JOB_GHOSTROLES, JOB_ANTAGHUD) jobs += "
Antagonist Positions
" jobs += "" for(var/entry in misc_roles) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 9c5f15ae89..6b48b90258 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -109,7 +109,7 @@ corpseback = /obj/item/weapon/storage/backpack corpseid = 1 corpseidjob = "Operative" - corpseidaccess = "Syndicate" + corpseidaccess = JOB_SYNDICATE /obj/effect/landmark/corpse/syndicatecommando name = "Mercenary Commando" @@ -124,7 +124,7 @@ corpsepocket1 = /obj/item/weapon/tank/emergency/oxygen corpseid = 1 corpseidjob = "Operative" - corpseidaccess = "Syndicate" + corpseidaccess = JOB_SYNDICATE ///////////Civilians////////////////////// diff --git a/code/modules/client/preference_setup/antagonism/02_candidacy.dm b/code/modules/client/preference_setup/antagonism/02_candidacy.dm index 50bf869006..5f4934f181 100644 --- a/code/modules/client/preference_setup/antagonism/02_candidacy.dm +++ b/code/modules/client/preference_setup/antagonism/02_candidacy.dm @@ -41,14 +41,14 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set pref.be_special = sanitize_integer(pref.be_special, 0, 16777215, initial(pref.be_special)) //VOREStation Edit - 24 bits of support /datum/category_item/player_setup_item/antagonism/candidacy/content(var/mob/user) - if(jobban_isbanned(user, "Syndicate")) + if(jobban_isbanned(user, JOB_SYNDICATE)) . += "You are banned from antagonist roles." pref.be_special = 0 else var/n = 0 for (var/i in special_roles) if(special_roles[i]) //if mode is available on the server - if(jobban_isbanned(user, i) || (i == "positronic brain" && jobban_isbanned(user, JOB_AI) && jobban_isbanned(user, JOB_CYBORG)) || (i == "pAI candidate" && jobban_isbanned(user, "pAI"))) + if(jobban_isbanned(user, i) || (i == "positronic brain" && jobban_isbanned(user, JOB_AI) && jobban_isbanned(user, JOB_CYBORG)) || (i == "pAI candidate" && jobban_isbanned(user, JOB_PAI))) . += "Be [i]: \[BANNED]
" else . += "Be [i]:[pref.be_special&(1<
" diff --git a/code/modules/client/preference_setup/general/05_background.dm b/code/modules/client/preference_setup/general/05_background.dm index 03efdf9f86..77d3c1979e 100644 --- a/code/modules/client/preference_setup/general/05_background.dm +++ b/code/modules/client/preference_setup/general/05_background.dm @@ -135,19 +135,19 @@ else if(href_list["set_medical_records"]) var/new_medical = strip_html_simple(tgui_input_text(user,"Enter medical information here.","Character Preference", html_decode(pref.med_record), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH) - if(new_medical && !jobban_isbanned(user, "Records") && CanUseTopic(user)) + if(new_medical && !jobban_isbanned(user, JOB_RECORDS) && CanUseTopic(user)) pref.med_record = new_medical return TOPIC_REFRESH else if(href_list["set_general_records"]) var/new_general = strip_html_simple(tgui_input_text(user,"Enter employment information here.","Character Preference", html_decode(pref.gen_record), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH) - if(new_general && !jobban_isbanned(user, "Records") && CanUseTopic(user)) + if(new_general && !jobban_isbanned(user, JOB_RECORDS) && CanUseTopic(user)) pref.gen_record = new_general return TOPIC_REFRESH else if(href_list["set_security_records"]) var/sec_medical = strip_html_simple(tgui_input_text(user,"Enter security information here.","Character Preference", html_decode(pref.sec_record), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH) - if(sec_medical && !jobban_isbanned(user, "Records") && CanUseTopic(user)) + if(sec_medical && !jobban_isbanned(user, JOB_RECORDS) && CanUseTopic(user)) pref.sec_record = sec_medical return TOPIC_REFRESH diff --git a/code/modules/clothing/suits/aliens/teshari.dm b/code/modules/clothing/suits/aliens/teshari.dm index ecd9be89f5..649b6e74b5 100644 --- a/code/modules/clothing/suits/aliens/teshari.dm +++ b/code/modules/clothing/suits/aliens/teshari.dm @@ -163,7 +163,7 @@ /obj/item/clothing/suit/storage/teshari/cloak/jobs/viro name = "virologist cloak" - desc = "A soft Teshari cloak made for the Virologist" + desc = "A soft Teshari cloak made for the " + JOB_ALT_VIROLOGIST icon_state = "tesh_cloak_viro" /obj/item/clothing/suit/storage/teshari/cloak/jobs/para @@ -654,7 +654,7 @@ /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/viro name = "virologist belted cloak" - desc = "A soft Teshari cloak made for the Virologist" + desc = "A soft Teshari cloak made for the " + JOB_ALT_VIROLOGIST icon_state = "tesh_beltcloak_viro" /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/para diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 47ab702f48..29c0e105a4 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -82,7 +82,7 @@ item_state_slots = list(slot_r_hand_str = "chemist_labcoat", slot_l_hand_str = "chemist_labcoat") /obj/item/clothing/suit/storage/toggle/labcoat/virologist - name = "Virologist labcoat" + name = JOB_ALT_VIROLOGIST + " labcoat" desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder." icon_state = "labcoat_vir" item_state_slots = list(slot_r_hand_str = "virologist_labcoat", slot_l_hand_str = "virologist_labcoat") diff --git a/code/modules/clothing/under/xenos/teshari.dm b/code/modules/clothing/under/xenos/teshari.dm index 3fc3559cac..5127ae5b13 100644 --- a/code/modules/clothing/under/xenos/teshari.dm +++ b/code/modules/clothing/under/xenos/teshari.dm @@ -287,7 +287,7 @@ /obj/item/clothing/under/teshari/undercoat/jobs/viro name = "virologist undercoat" - desc = "A traditional Teshari garb made for the Virologist" + desc = "A traditional Teshari garb made for the " + JOB_ALT_VIROLOGIST icon_state = "tesh_uniform_viro" /obj/item/clothing/under/teshari/undercoat/jobs/psych diff --git a/code/modules/entrepreneur/entrepreneur_items.dm b/code/modules/entrepreneur/entrepreneur_items.dm index b88a66a500..90fbd7ed5a 100644 --- a/code/modules/entrepreneur/entrepreneur_items.dm +++ b/code/modules/entrepreneur/entrepreneur_items.dm @@ -379,7 +379,7 @@ /obj/item/weapon/entrepreneur/spirit_board/attack_ghost(var/mob/observer/dead/user) if(!ghost_enabled) return - if(jobban_isbanned(user, "GhostRoles")) + if(jobban_isbanned(user, JOB_GHOSTROLES)) to_chat(user, "You cannot interact with this board because you are banned from playing ghost roles.") return next_result = tgui_input_list(user, "What should it land on next?", "Next result", possible_results) @@ -526,4 +526,3 @@ icon = 'icons/obj/entrepreneur.dmi' icon_state = "stylist" starts_with = list(/obj/item/weapon/makeover, /obj/item/weapon/lipstick/random, /obj/item/weapon/nailpolish, /obj/item/weapon/nailpolish_remover, /obj/item/weapon/haircomb, /obj/item/clothing/head/hairnet, /obj/item/device/ticket_printer/train) - diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 9875c5cbb5..7e8e132d0e 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -7,9 +7,9 @@ var/list/dreams = list( "a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect", "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 Janitor","the " + JOB_ATMOSPHERIC_TECHNICIAN, + "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 Virologist","the " + JOB_ROBOTICIST,"the " + JOB_CHEF,"the " + JOB_BARTENDER,"the " + JOB_CHAPLAIN,"the " + JOB_LIBRARIAN,"a mouse","an ERT member", + "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", "a Teshari", "a Diona nymph","the supermatter","Major Bill","a Morpheus ship with a ridiculous name","the Exodus","a star", diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index aba87dfcc8..bc738618b2 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -101,7 +101,7 @@ var/list/ghost_traps // Doona pods and walking mushrooms. /datum/ghosttrap/plant object = "living plant" - ban_checks = list("Dionaea") + ban_checks = list(JOB_DIONAEA) pref_check = BE_PLANT ghost_trap_message = "They are occupying a living plant now." ghost_trap_role = "Plant" diff --git a/code/modules/mob/dead/corpse.dm b/code/modules/mob/dead/corpse.dm index f5c375ea4b..c7e01bf740 100644 --- a/code/modules/mob/dead/corpse.dm +++ b/code/modules/mob/dead/corpse.dm @@ -179,7 +179,7 @@ corpseback = /obj/item/weapon/storage/backpack corpseid = 1 corpseidjob = "Operative" - corpseidaccess = "Syndicate" + corpseidaccess = JOB_SYNDICATE /obj/effect/landmark/mobcorpse/solarpeacekeeper name = "Mercenary" @@ -193,7 +193,7 @@ corpseback = /obj/item/weapon/storage/backpack corpseid = 1 corpseidjob = "Peacekeeper" - corpseidaccess = "Syndicate" + corpseidaccess = JOB_SYNDICATE /obj/effect/landmark/mobcorpse/syndicatecommando name = "Mercenary Commando" @@ -208,7 +208,7 @@ corpsepocket1 = /obj/item/weapon/tank/emergency/oxygen corpseid = 1 corpseidjob = "Operative" - corpseidaccess = "Syndicate" + corpseidaccess = JOB_SYNDICATE diff --git a/code/modules/mob/dead/corpse_vr.dm b/code/modules/mob/dead/corpse_vr.dm index ac1496b7d6..0ad27d874e 100644 --- a/code/modules/mob/dead/corpse_vr.dm +++ b/code/modules/mob/dead/corpse_vr.dm @@ -36,7 +36,7 @@ corpsehelmet = /obj/item/clothing/head/helmet/space/void/altevian_heartbreaker corpseid = 1 corpseidjob = "Altevian Navy" - corpseidaccess = "Syndicate" + corpseidaccess = JOB_SYNDICATE species = SPECIES_ALTEVIAN ear_type = list(/datum/sprite_accessory/ears/altevian, "#777777", "#FFCCFF") - tail_type = list(/datum/sprite_accessory/tail/altevian, "#FF9999") \ No newline at end of file + tail_type = list(/datum/sprite_accessory/tail/altevian, "#FF9999") diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 62196605cd..da5bd7b31f 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -325,7 +325,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!config.antag_hud_allowed && !client.holder) to_chat(src, "[span_red("Admins have disabled this for this round.")]") return - if(jobban_isbanned(src, "AntagHUD")) + if(jobban_isbanned(src, JOB_ANTAGHUD)) to_chat(src, "[span_red("You have been banned from using this feature")]") return if(config.antag_hud_restricted && !has_enabled_antagHUD && !client.holder) @@ -654,7 +654,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return //VOREStation Add Start - if(jobban_isbanned(src, "GhostRoles")) + if(jobban_isbanned(src, JOB_GHOSTROLES)) to_chat(src, "You cannot become a mouse because you are banned from playing ghost roles.") return //VOREStation Add End diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index f9c37f5f74..1a29bbbbda 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -275,7 +275,7 @@ to_chat(src.brainmob, "As a synthetic intelligence, you are designed with organic values in mind.") to_chat(src.brainmob, "However, unless placed in a lawed chassis, you are not obligated to obey any individual crew member.") //it's not like they can hurt anyone // to_chat(src.brainmob, "Use say #b to speak to other artificial intelligences.") - src.brainmob.mind.assigned_role = "Synthetic Brain" + src.brainmob.mind.assigned_role = JOB_SYNTHETIC_BRAIN var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) @@ -299,7 +299,7 @@ /obj/item/device/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H) ..() if(brainmob.mind) - brainmob.mind.assigned_role = "Robotic Intelligence" + brainmob.mind.assigned_role = JOB_ROBOTIC_INTELLIGENCE to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") return @@ -321,7 +321,7 @@ /obj/item/device/mmi/digital/posibrain/transfer_identity(var/mob/living/carbon/H) ..() if(brainmob.mind) - brainmob.mind.assigned_role = "Positronic Brain" + brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a metal cube.") icon_state = "posibrain-occupied" return diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 8ad719e3af..2704cf2ead 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -48,7 +48,7 @@ /obj/item/device/mmi/digital/posibrain/transfer_identity(var/mob/living/carbon/H) ..() if(brainmob.mind) - brainmob.mind.assigned_role = "Positronic Brain" + brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a metal cube.") icon_state = "posibrain-occupied" return @@ -64,7 +64,7 @@ to_chat(src.brainmob, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.") to_chat(src.brainmob, "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.") to_chat(src.brainmob, "Use say #b to speak to other artificial intelligences.") - src.brainmob.mind.assigned_role = "Positronic Brain" + src.brainmob.mind.assigned_role = JOB_POSITRONIC_BRAIN var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm index 9723a2aa77..8818b20a9e 100644 --- a/code/modules/mob/living/carbon/brain/robot.dm +++ b/code/modules/mob/living/carbon/brain/robot.dm @@ -15,9 +15,9 @@ /obj/item/device/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H) ..() if(brainmob.mind) - brainmob.mind.assigned_role = "Robotic Intelligence" + brainmob.mind.assigned_role = JOB_ROBOTIC_INTELLIGENCE to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") return /obj/item/device/mmi/digital/robot/attack_self(mob/user as mob) - return //This object is technically a brain, and should not be dumping brains out of itself like its parent object does. \ No newline at end of file + return //This object is technically a brain, and should not be dumping brains out of itself like its parent object does. diff --git a/code/modules/mob/living/carbon/human/species/station/golem.dm b/code/modules/mob/living/carbon/human/species/station/golem.dm index d2bc9dc1dd..2353fcaa6d 100644 --- a/code/modules/mob/living/carbon/human/species/station/golem.dm +++ b/code/modules/mob/living/carbon/human/species/station/golem.dm @@ -31,8 +31,8 @@ /datum/species/golem/handle_post_spawn(var/mob/living/carbon/human/H) if(H.mind) - H.mind.assigned_role = "Golem" - H.mind.special_role = "Golem" + H.mind.assigned_role = JOB_GOLEM + H.mind.special_role = JOB_GOLEM H.real_name = "adamantine golem ([rand(1, 1000)])" H.name = H.real_name - ..() \ No newline at end of file + ..() diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm index ac85b0314a..861384cf02 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm @@ -98,8 +98,8 @@ /datum/species/xenos/handle_post_spawn(var/mob/living/carbon/human/H) if(H.mind) - H.mind.assigned_role = "Alien" - H.mind.special_role = "Alien" + H.mind.assigned_role = JOB_ALIEN + H.mind.special_role = JOB_ALIEN alien_number++ //Keep track of how many aliens we've had so far. H.real_name = "xenomorph [caste_name] ([alien_number])" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm index 649a206306..6dae8e94a6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm @@ -201,8 +201,8 @@ ckey = candidate.ckey if(mind) - mind.assigned_role = "Cortical Borer" - mind.special_role = "Cortical Borer" + mind.assigned_role = JOB_CORTICAL_BORER + mind.special_role = JOB_CORTICAL_BORER to_chat(src, span("notice", "You are a cortical borer! You are a brain slug that worms its way \ into the head of its victim. Use stealth, persuasion and your powers of mind control to keep you, \ diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm index 32f92cea6f..d2f88c10b1 100644 --- a/code/modules/paperwork/paper_sticky.dm +++ b/code/modules/paperwork/paper_sticky.dm @@ -26,7 +26,7 @@ /obj/item/sticky_pad/attackby(var/obj/item/weapon/thing, var/mob/user) if(istype(thing, /obj/item/weapon/pen)) - if(jobban_isbanned(user, "Graffiti")) + if(jobban_isbanned(user, JOB_GRAFFITI)) to_chat(user, SPAN_WARNING("You are banned from leaving persistent information across rounds.")) return diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index feb561f482..dff38d0b19 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -51,7 +51,7 @@ qdel(src) else if(thing.sharp) - if(jobban_isbanned(user, "Graffiti")) + if(jobban_isbanned(user, JOB_GRAFFITI)) to_chat(user, SPAN_WARNING("You are banned from leaving persistent information across rounds.")) return diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm index 54f07d2a58..70c9d0589f 100644 --- a/code/modules/persistence/noticeboard.dm +++ b/code/modules/persistence/noticeboard.dm @@ -83,7 +83,7 @@ dismantle() return else if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/photo)) - if(jobban_isbanned(user, "Graffiti")) + if(jobban_isbanned(user, JOB_GRAFFITI)) to_chat(user, "You are banned from leaving persistent information across rounds.") else if(LAZYLEN(notices) < max_notices && user.unEquip(I, src)) @@ -207,4 +207,4 @@ P.info = "Do you people think the anomaly suits are cheap to come by? I'm about a hair trigger away from instituting a log book for the damn things. Only wear them if you're going out for a dig, and for god's sake don't go tramping around in them unless you're field testing something, R" P.stamped = list(/obj/item/weapon/stamp/rd) P.add_overlay("paper_stamped_rd") - contents += P \ No newline at end of file + contents += P diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm index ea301f16b7..9537f39a8a 100644 --- a/code/modules/spells/spellbook.dm +++ b/code/modules/spells/spellbook.dm @@ -91,7 +91,7 @@ if(!istype(H, /mob/living/carbon/human)) return 1 - if(H.mind.special_role == "apprentice") + if(H.mind.special_role == JOB_APPRENTICE) temp = "If you got caught sneaking a peak from your teacher's spellbook, you'd likely be expelled from the Wizard Academy. Better not." return @@ -260,7 +260,7 @@ if(knownspell.type == S.type) if(user.mind) // TODO: Update to new antagonist system. - if(user.mind.special_role == "apprentice" || user.mind.special_role == "Wizard") + if(user.mind.special_role == JOB_APPRENTICE || user.mind.special_role == JOB_WIZARD) to_chat(user, "You're already far more versed in this spell than this flimsy how-to book can provide.") else to_chat(user, "You've already read this one.") diff --git a/code/modules/spells/targeted/mind_transfer.dm b/code/modules/spells/targeted/mind_transfer.dm index e3eda58b65..3b11a5f59c 100644 --- a/code/modules/spells/targeted/mind_transfer.dm +++ b/code/modules/spells/targeted/mind_transfer.dm @@ -13,7 +13,7 @@ compatible_mobs = list(/mob/living/carbon/human) //which types of mobs are affected by the spell. NOTE: change at your own risk // TODO: Update to new antagonist system. - var/list/protected_roles = list("Wizard","Changeling","Cultist") //which roles are immune to the spell + var/list/protected_roles = list(JOB_WIZARD,JOB_CHANGELING,JOB_CULTIST) //which roles are immune to the spell var/msg_wait = 500 //how long in deciseconds it waits before telling that body doesn't feel right or mind swap robbed of a spell amt_paralysis = 20 //how much the victim is paralysed for after the spell diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index d823572ca6..ead745e976 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -53,7 +53,7 @@ var/mob/living/carbon/human/S = new(get_turf(src)) S.client = candidate.client to_chat(S, "You are a promethean, brought into existence on [station_name()].") - S.mind.assigned_role = "Promethean" + S.mind.assigned_role = JOB_PROMETHEAN S.set_species("Promethean") S.shapeshifter_set_colour("#2398FF") visible_message("The monkey cube suddenly takes the shape of a humanoid!") diff --git a/code/modules/xenobio2/mob/slime/slime_monkey.dm b/code/modules/xenobio2/mob/slime/slime_monkey.dm index 8915e58e9b..c8201f2158 100644 --- a/code/modules/xenobio2/mob/slime/slime_monkey.dm +++ b/code/modules/xenobio2/mob/slime/slime_monkey.dm @@ -39,7 +39,7 @@ Slime cube lives here. var/mob/living/carbon/human/S = new(get_turf(src)) S.client = candidate.client to_chat(S., "You are a promethean, brought into existence on [station_name()].") - S.mind.assigned_role = "Promethean" + S.mind.assigned_role = JOB_PROMETHEAN S.set_species("Promethean") S.shapeshifter_set_colour("#05FF9B") for(var/mob/M in viewers(get_turf_or_move(loc))) diff --git a/maps/cynosure/cynosure_jobs.dm b/maps/cynosure/cynosure_jobs.dm index 076a682451..3b35b41e3e 100644 --- a/maps/cynosure/cynosure_jobs.dm +++ b/maps/cynosure/cynosure_jobs.dm @@ -34,7 +34,7 @@ var/const/access_explorer = 43 job_description = "An Explorer searches for interesting things on the surface of Sif, and returns them to the station." alt_titles = list( - "Pilot" = /decl/hierarchy/outfit/job/pilot) + JOB_PILOT = /decl/hierarchy/outfit/job/pilot) /datum/job/rd access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, diff --git a/maps/northern_star/job/outfits.dm b/maps/northern_star/job/outfits.dm index 7d07d0d1f3..0aed969893 100644 --- a/maps/northern_star/job/outfits.dm +++ b/maps/northern_star/job/outfits.dm @@ -1,6 +1,6 @@ //Job Outfits /decl/hierarchy/outfit/job/assistant/resident - name = OUTFIT_JOB_NAME("Resident") - id_pda_assignment = "Resident" - uniform = /obj/item/clothing/under/color/white \ No newline at end of file + name = OUTFIT_JOB_NAME(JOB_ALT_RESIDENT) + id_pda_assignment = JOB_ALT_RESIDENT + uniform = /obj/item/clothing/under/color/white diff --git a/maps/northern_star/northern_star_jobs.dm b/maps/northern_star/northern_star_jobs.dm index 2333ebb650..08a10e8542 100644 --- a/maps/northern_star/northern_star_jobs.dm +++ b/maps/northern_star/northern_star_jobs.dm @@ -2,8 +2,8 @@ /datum/job/assistant alt_titles = list( "Technical Assistant", - "Medical Intern", + JOB_ALT_MEDICAL_INTERN, "Research Assistant", USELESS_JOB = /decl/hierarchy/outfit/job/assistant/visitor, - "Resident" = /decl/hierarchy/outfit/job/assistant/resident + JOB_ALT_RESIDENT = /decl/hierarchy/outfit/job/assistant/resident )
Other Roles