From d2907e3631ae2bb5ed2e0d4018470e334cb83139 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 30 Mar 2016 22:52:36 -0400 Subject: [PATCH] oh hell --- code/modules/events/disease_outbreak.dm | 2 ++ code/modules/events/spontaneous_appendicitis.dm | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index e810b76819c..ce6e214053d 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -16,6 +16,8 @@ for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) if(issmall(H)) //don't infect monkies; that's a waste continue + if(H.species.virus_immune) //don't let virus immune things get diseases they're not supposed to get. + continue var/turf/T = get_turf(H) if(!T) continue diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index 57b860159ca..964b3c9e50d 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -1,6 +1,8 @@ /datum/event/spontaneous_appendicitis/start() for(var/mob/living/carbon/human/H in shuffle(living_mob_list)) - if(issmall(H)) //don't infect monkies; that's a waste + if(issmall(H)) //don't infect monkies; that's a waste. + continue + if(H.species.virus_immune) //don't count things that are virus immune; they'll just get picked and auto-cure continue var/foundAlready = 0 //don't infect someone that already has the virus for(var/datum/disease/D in H.viruses)