From 34d22ccde64e8266f4ee539d057b8d96fb6fdecf Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Tue, 10 Oct 2017 13:41:00 -0400 Subject: [PATCH] Diseases will now cure if species is changed (#31495) * Diseases will now cure if species is changed * Update _disease.dm * Update _disease.dm * Update species.dm --- code/datums/diseases/_disease.dm | 4 ++-- code/modules/mob/living/carbon/human/species.dm | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 80dc585eb31..69da2ab96dd 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -98,10 +98,10 @@ V = Temp -/datum/disease/proc/cure() +/datum/disease/proc/cure(add_resistance = TRUE) if(affected_mob) if(disease_flags & CAN_RESIST) - if(!(type in affected_mob.resistances)) + if(add_resistance && !(type in affected_mob.resistances)) affected_mob.resistances += type remove_virus() qdel(src) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 16a70ea1345..2f71b842d97 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -257,6 +257,11 @@ C.dropItemToGround(I) else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand C.put_in_hands(new mutanthands()) + + if(VIRUSIMMUNE in species_traits) + for(var/datum/disease/A in C.viruses) + A.cure(FALSE) + /datum/species/proc/on_species_loss(mob/living/carbon/C) if(C.dna.species.exotic_bloodtype)