From 95f388e7957663e4c5dd18d44a47141db8b90882 Mon Sep 17 00:00:00 2001 From: Kyani <65205627+EmeraldCandy@users.noreply.github.com> Date: Mon, 25 Aug 2025 21:48:31 -0400 Subject: [PATCH] Makes some wizard disease admin-spreadable (#30133) * Makes some wizard disease admin-spreadable * remove duped flags --- code/datums/diseases/wizard_diseases.dm | 15 +++++++++++---- code/game/gamemodes/wizard/artefact.dm | 6 +++--- code/modules/events/disease_outbreak.dm | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/code/datums/diseases/wizard_diseases.dm b/code/datums/diseases/wizard_diseases.dm index 39a8bf52610..e27e6cda287 100644 --- a/code/datums/diseases/wizard_diseases.dm +++ b/code/datums/diseases/wizard_diseases.dm @@ -27,15 +27,17 @@ max_stages = 5 stage_prob = 5 spread_text = "Non-contagious" - spread_flags = SPREAD_NON_CONTAGIOUS cure_text = "Pyrotech stabilizing agents" agent = "Eruca Stomachum" cures = list("stabilizing_agent") viable_mobtypes = list(/mob/living/carbon/human) - desc = "A magic-infused disease that builds up VIRUS_DANGEROUSly high pressure bile within the stomach." + desc = "A magic-infused disease that builds up DANGEROUSLY high pressure bile within the stomach." severity = VIRUS_DANGEROUS virus_heal_resistant = TRUE +/datum/disease/grut_gut/wizard_variant + spread_flags = SPREAD_NON_CONTAGIOUS + /datum/disease/grut_gut/stage_act() if(!..()) return FALSE @@ -98,7 +100,6 @@ max_stages = 5 stage_prob = 5 spread_text = "Non-contagious" - spread_flags = SPREAD_NON_CONTAGIOUS cure_text = "Acetaldehyde" agent = "nasum magicum" cures = list("acetaldehyde") @@ -107,6 +108,9 @@ severity = VIRUS_DANGEROUS virus_heal_resistant = TRUE +/datum/disease/wand_rot/wizard_variant + spread_flags = SPREAD_NON_CONTAGIOUS + /datum/disease/wand_rot/stage_act() if(!..()) return FALSE @@ -165,7 +169,7 @@ max_stages = 5 stage_prob = 5 spread_text = "Non-contagious" - spread_flags = SPREAD_NON_CONTAGIOUS + spread_flags = SPREAD_CONTACT_GENERAL cure_text = "liquid dark matter" agent = "Spatio Ventrem" cures = list("liquid_dark_matter") @@ -174,6 +178,9 @@ severity = VIRUS_DANGEROUS virus_heal_resistant = TRUE +/datum/disease/mystic_malaise/wizard_variant + spread_flags = SPREAD_NON_CONTAGIOUS + /datum/disease/mystic_malaise/stage_act() if(!..()) return FALSE diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index a2cac902462..e9e6af44cfa 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -930,9 +930,9 @@ GLOBAL_LIST_EMPTY(multiverse) /datum/disease/wizarditis/wizard_variant, /datum/disease/berserker, /datum/disease/appendicitis, - /datum/disease/grut_gut, - /datum/disease/wand_rot, - /datum/disease/mystic_malaise + /datum/disease/grut_gut/wizard_variant, + /datum/disease/wand_rot/wizard_variant, + /datum/disease/mystic_malaise/wizard_variant, ) picked_disease = pick(possible_diseases) return picked_disease diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 1c160c90eef..89ab8a71991 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_EMPTY(current_pending_diseases) /datum/disease/gbs, /datum/disease/transformation, /datum/disease/food_poisoning, /datum/disease/berserker, /datum/disease/zombie, /datum/disease/beesease/wizard_variant, /datum/disease/cold9/wizard_variant, /datum/disease/fluspanish/wizard_variant, /datum/disease/kingstons_advanced/wizard_variant, /datum/disease/dna_retrovirus/wizard_variant, /datum/disease/tuberculosis/wizard_variant, /datum/disease/wizarditis/wizard_variant, /datum/disease/anxiety/wizard_variant, - /datum/disease/grut_gut, /datum/disease/wand_rot, /datum/disease/mystic_malaise) + /datum/disease/grut_gut, /datum/disease/grut_gut/wizard_variant, /datum/disease/wand_rot, /datum/disease/wand_rot/wizard_variant, /datum/disease/mystic_malaise, /datum/disease/mystic_malaise/wizard_variant) var/static/list/transmissable_symptoms = list() var/static/list/diseases_minor = list() var/static/list/diseases_moderate_major = list()