diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 252586fb064..2f9c81a45ca 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -47,6 +47,7 @@ * This proc needs to be run at some point to ensure the event has candidates to infect. */ /datum/round_event_control/disease_outbreak/proc/generate_candidates() + disease_candidates.Cut() //We clear the list and rebuild it again. for(var/mob/living/carbon/human/candidate in shuffle(GLOB.player_list)) //Player list is much more up to date and requires less checks(?) if(!(candidate.mind.assigned_role.job_flags & JOB_CREW_MEMBER) || candidate.stat == DEAD) continue diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index e5ba47dd79a..c60473aa1a7 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -26,6 +26,7 @@ * later, at the round_event level, so this proc mostly just checks users for whether or not a heart attack should be possible. */ /datum/round_event_control/heart_attack/proc/generate_candidates() + heart_attack_candidates.Cut() for(var/mob/living/carbon/human/candidate in shuffle(GLOB.player_list)) if(candidate.stat == DEAD || HAS_TRAIT(candidate, TRAIT_CRITICAL_CONDITION) || !candidate.can_heartattack() || (/datum/disease/heart_failure in candidate.diseases) || candidate.undergoing_cardiac_arrest()) continue