From 918bb6e02211b8fd7aa0b916aea63f3fcd2edee7 Mon Sep 17 00:00:00 2001 From: Guti <32563288+TheCaramelion@users.noreply.github.com> Date: Sun, 18 Jan 2026 22:42:05 +0100 Subject: [PATCH] Viro Fixes (#19058) * Fixes * Change --- code/datums/diseases/advance/advance.dm | 2 +- code/modules/mob/mob.dm | 1 + code/modules/reagents/reagents/core.dm | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index b083b3e5df..b2fd25b14f 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -379,7 +379,7 @@ GLOBAL_LIST_INIT(advance_cures, list( if(global_flag_check(disease_flags, DORMANT) || global_flag_check(disease.disease_flags, DORMANT)) continue if(IsSame(disease)) - continue + return FALSE if(channel == other_channel) advance_diseases += disease if(advance_diseases.len > 0) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d780eee1ac..17e9d28ba1 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -26,6 +26,7 @@ QDEL_NULL(hud_used) for(var/key in alerts) //clear out alerts clear_alert(key) + QDEL_NULL_LIST(viruses) if(pulling) stop_pulling() //TG does this on atom/movable but our stop_pulling proc is here so whatever diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm index b537fccd93..2620efe147 100644 --- a/code/modules/reagents/reagents/core.dm +++ b/code/modules/reagents/reagents/core.dm @@ -88,7 +88,6 @@ var/datum/disease/D = ID if((D.spread_flags & DISEASE_SPREAD_SPECIAL) || (D.spread_flags & DISEASE_SPREAD_NON_CONTAGIOUS)) continue - M.ForceContractDisease(D) D.try_infect(M) /datum/reagent/blood/affect_touch(var/mob/living/carbon/M, var/alien, var/removed)