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
This commit is contained in:
MoreRobustThanYou
2017-10-10 13:41:00 -04:00
committed by CitadelStationBot
parent f8d0646b09
commit bc318af840
2 changed files with 7 additions and 2 deletions
+2 -2
View File
@@ -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)
@@ -265,6 +265,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)
if(NOAROUSAL in species_traits)
C.canbearoused = FALSE