Merge pull request #9687 from comma/dev

Fixes organs self-rejecting
This commit is contained in:
PsiOmegaDelta
2015-06-10 09:39:43 +02:00
5 changed files with 16 additions and 2 deletions
+6
View File
@@ -57,6 +57,12 @@ var/list/organ_cache = list()
if(internal)
holder.internal_organs |= src
/obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
if(new_dna)
dna = new_dna.Clone()
blood_DNA.Cut()
blood_DNA[dna.unique_enzymes] = dna.b_type
/obj/item/organ/proc/die()
if(status & ORGAN_ROBOT)
return
+1
View File
@@ -1051,6 +1051,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(6 to INFINITY)
flavor_text += "a ton of [wound]\s"
return english_list(flavor_text)
/****************************************************
ORGAN DEFINES
****************************************************/