From 85201d098139ca4f7be679506a835820f6495be6 Mon Sep 17 00:00:00 2001 From: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Date: Sat, 2 Aug 2025 15:41:34 +0100 Subject: [PATCH] Fixes some medical issue stuff (#18112) * Fixes some medical issue stuff Fixed medical issues not proccing for species that can't be infected. Fixed medical issues so that they can be cured by ingested reagents too. * Make the symptoms less frequent --- code/modules/eventkit/medical_issues.dm | 5 ++++- code/modules/organs/organ.dm | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/eventkit/medical_issues.dm b/code/modules/eventkit/medical_issues.dm index 39e84adaa83..dd8998a51de 100644 --- a/code/modules/eventkit/medical_issues.dm +++ b/code/modules/eventkit/medical_issues.dm @@ -43,7 +43,7 @@ handle_curing() if(symptom_text) - if(prob(5)) + if(prob(1)) to_chat(owner, span_danger("[symptom_text]")) if(symptom_affect) @@ -83,6 +83,9 @@ for(var/datum/reagent/R in owner.reagents.reagent_list) if(R.name == cure_reagent) unhealth = unhealth - reagent_strength + for(var/datum/reagent/R in owner.ingested.reagent_list) + if(R.name == cure_reagent) + unhealth = unhealth - reagent_strength /datum/medical_issue/proc/handle_symptoms() switch(symptom_affect) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 6715c71e610..7f10f273119 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -166,6 +166,9 @@ var/list/organ_cache = list() handle_organ_proc_special() + for(var/datum/medical_issue/I in medical_issues) + I.handle_effects() + //Process infections if(robotic >= ORGAN_ROBOT || (istype(owner) && (owner.species && (owner.species.flags & (IS_PLANT | NO_INFECT))))) germ_level = 0 @@ -191,9 +194,6 @@ var/list/organ_cache = list() handle_rejection() handle_germ_effects() - for(var/datum/medical_issue/I in medical_issues) - I.handle_effects() - /obj/item/organ/examine(mob/user) . = ..() if(status & ORGAN_DEAD)