Merge pull request #12153 from duncathan/destroyfixes

Destroy() fixes
This commit is contained in:
Razharas
2015-10-06 09:27:41 +03:00
28 changed files with 52 additions and 57 deletions
+2 -2
View File
@@ -188,9 +188,9 @@ var/list/diseases = typesof(/datum/disease) - /datum/disease
return type
/datum/disease/Del()
/datum/disease/Destroy()
SSdisease.processing.Remove(src)
..()
return ..()
/datum/disease/proc/IsSpreadByTouch()
+2 -2
View File
@@ -69,11 +69,11 @@ var/list/advance_cures = list(
..(process, D)
return
/datum/disease/advance/Del()
/datum/disease/advance/Destroy()
if(processing)
for(var/datum/symptom/S in symptoms)
S.End(src)
..()
return ..()
// Randomly pick a symptom to activate.
/datum/disease/advance/stage_act()
+2 -2
View File
@@ -61,7 +61,7 @@
return
/datum/disease/dnaspread/Del()
/datum/disease/dnaspread/Destroy()
if (original_dna && transformed && affected_mob)
original_dna.transfer_identity(affected_mob, transfer_SE = 1)
affected_mob.real_name = affected_mob.dna.real_name
@@ -69,4 +69,4 @@
affected_mob.domutcheck()
affected_mob << "<span class='notice'>You feel more like yourself.</span>"
..()
return ..()