Merge pull request #9687 from comma/dev

Fixes organs self-rejecting

code/modules/mob/living/carbon/human/human.dm

@@ -41,7 +41,9 @@
 	..()
 
 	if(dna)
+		dna.ready_dna(src)
 		dna.real_name = real_name
+		sync_organ_dna()
 	make_blood()
 
 /mob/living/carbon/human/Destroy()

code/modules/mob/living/carbon/human/human_organs.dm

@@ -171,4 +171,9 @@
 	//New are added for reagents to random organs.
 	for(var/datum/reagent/A in reagents.reagent_list)
 		var/obj/item/organ/O = pick(organs)
-		O.trace_chemicals[A.name] = 100
+		O.trace_chemicals[A.name] = 100
+
+/mob/living/carbon/human/proc/sync_organ_dna()
+	var/list/all_bits = internal_organs|organs
+	for(var/obj/item/organ/O in all_bits)
+		O.set_dna(dna)

code/modules/mob/new_player/new_player.dm

@@ -467,7 +467,7 @@
 		new_character.name = real_name
 		new_character.dna.ready_dna(new_character)
 		new_character.dna.b_type = client.prefs.b_type
-
+		new_character.sync_organ_dna()
 		if(client.prefs.disabilities)
 			// Set defer to 1 if you add more crap here so it only recalculates struc_enzymes once. - N3X
 			new_character.dna.SetSEState(GLASSESBLOCK,1,0)

code/modules/organs/organ.dm

@@ -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

code/modules/organs/organ_external.dm

@@ -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
 ****************************************************/