Fixes brain dna

2018-04-11 21:58:11 +02:00
parent 4063781baf
commit 2aff700c14
2 changed files with 22 additions and 2 deletions
@@ -13,9 +13,29 @@
 	var/mob/living/holder

 /datum/dna/New(mob/living/new_holder)
+<<<<<<< HEAD
 	if(new_holder)
 		holder = new_holder

+=======
+	if(istype(new_holder))
+		holder = new_holder
+
+/datum/dna/Destroy()
+	if(iscarbon(holder))
+		var/mob/living/carbon/cholder = holder
+		if(cholder.dna == src)
+			cholder.dna = null
+	holder = null
+	QDEL_NULL(species)
+
+	mutations.Cut()					//This only references mutations, just dereference.
+	temporary_mutations.Cut()		//^
+	previous.Cut()					//^
+
+	return ..()
+
+>>>>>>> a6e8247... Fixes brain dna (#37132)
 /datum/dna/proc/transfer_identity(mob/living/carbon/destination, transfer_SE = 0)
 	if(!istype(destination))
 		return