From 966e8aa3ba81bc014eaf38c1bc08a9d1d6e6721f Mon Sep 17 00:00:00 2001 From: Fghj240 <43589874+Fghj240@users.noreply.github.com> Date: Thu, 16 Jul 2026 05:58:30 -0700 Subject: [PATCH] Medical doctors and CMOs can get virologist bounties (#96971) ## About The Pull Request Virologist bounties are currently unobtainable, probably from when virologist was removed. This PR gives medical doctors and CMOs a 25% chance to get a virologist bounty instead of a regular bounty. ## Why It's Good For The Game Content ## Changelog :cl: add: Medical doctors and CMOs can get old virologist bounties spellcheck: Changed "transmissible" to "transmission" in virologist bounties /:cl: --------- Co-authored-by: Fghj240 --- code/__DEFINES/economy.dm | 2 +- .../machinery/civilian_bounty/civilian_bounty_trims.dm | 4 +++- code/modules/cargo/bounties/virus.dm | 2 +- code/modules/cargo/bounty.dm | 7 +++++-- code/modules/jobs/job_types/chief_medical_officer.dm | 2 +- code/modules/jobs/job_types/medical_doctor.dm | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index d865c3d7af0..ac1aea29f3e 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -60,7 +60,7 @@ #define CIV_JOB_SEC 4 #define CIV_JOB_DRINK 5 #define CIV_JOB_CHEM 6 -#define CIV_JOB_VIRO 7 +#define CIV_JOB_MED_VIRO 7 #define CIV_JOB_SCI 8 #define CIV_JOB_ENG 9 #define CIV_JOB_MINE 10 diff --git a/code/game/machinery/civilian_bounty/civilian_bounty_trims.dm b/code/game/machinery/civilian_bounty/civilian_bounty_trims.dm index 6c3c7221de6..685d368dffe 100644 --- a/code/game/machinery/civilian_bounty/civilian_bounty_trims.dm +++ b/code/game/machinery/civilian_bounty/civilian_bounty_trims.dm @@ -69,7 +69,9 @@ if(prob(50)) return /datum/bounty/reagent/chemical_simple return /datum/bounty/reagent/chemical_complex - if(CIV_JOB_VIRO) + if(CIV_JOB_MED_VIRO) + if(prob(75)) + return pick(subtypesof(/datum/bounty/item/medical)) return pick(subtypesof(/datum/bounty/virus)) if(CIV_JOB_SCI) if(prob(50)) diff --git a/code/modules/cargo/bounties/virus.dm b/code/modules/cargo/bounties/virus.dm index a021166c060..2cac89e7d1f 100644 --- a/code/modules/cargo/bounties/virus.dm +++ b/code/modules/cargo/bounties/virus.dm @@ -60,7 +60,7 @@ return virus.totalStealth() == stat_value /datum/bounty/virus/transmit - stat_name = "transmissible" + stat_name = "transmission" /datum/bounty/virus/transmit/accepts_virus(datum/disease/advance/virus) return virus.totalTransmittable() == stat_value diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm index 493ff8c64aa..420bf3a0620 100644 --- a/code/modules/cargo/bounty.dm +++ b/code/modules/cargo/bounty.dm @@ -105,8 +105,11 @@ GLOBAL_LIST_EMPTY(shared_crew_bounties) chosen_type = /datum/bounty/reagent/chemical_simple else chosen_type = /datum/bounty/reagent/chemical_complex - if(CIV_JOB_VIRO) - chosen_type = pick(subtypesof(/datum/bounty/virus)) + if(CIV_JOB_MED_VIRO) + if(prob(75)) + chosen_type = pick(subtypesof(/datum/bounty/item/medical)) + else + chosen_type = pick(subtypesof(/datum/bounty/virus)) if(CIV_JOB_SCI) if(prob(50)) chosen_type = pick(subtypesof(/datum/bounty/item/science)) diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 3b4a856a118..7ffc07fbabb 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -31,7 +31,7 @@ liver_traits = list(TRAIT_MEDICAL_METABOLISM, TRAIT_ROYAL_METABOLISM) display_order = JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER - bounty_types = CIV_JOB_MED + bounty_types = CIV_JOB_MED_VIRO mail_goodies = list( /obj/effect/spawner/random/medical/organs = 10, diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index f357bcac8ac..c5da4555329 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -19,7 +19,7 @@ liver_traits = list(TRAIT_MEDICAL_METABOLISM) display_order = JOB_DISPLAY_ORDER_MEDICAL_DOCTOR - bounty_types = CIV_JOB_MED + bounty_types = CIV_JOB_MED_VIRO departments_list = list( /datum/job_department/medical, )