From a653dfd69dfd59b5826a575c334e24423e30bd3f Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Sat, 12 Mar 2016 00:49:36 -0500
Subject: [PATCH 01/18] god its late

---
 code/game/gamemodes/changeling/powers/augmented_eyesight.dm | 3 +++
 code/modules/surgery/organs/augments_eyes.dm                | 2 ++
 code/modules/surgery/organs/organ.dm                        | 2 +-
 code/modules/surgery/organs/organ_external.dm               | 3 ++-
 code/modules/surgery/organs/organ_internal.dm               | 6 ++++++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
index 832973d4ce6..21d703b9a83 100644
--- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
@@ -43,6 +43,7 @@
 	origin_tech = "biotech=4"
 	slot = "eye_ling"
 	status = 0
+	aug_message = "We feel a minute twitch in our eyes, our eyes feel more durable."
 
 /obj/item/organ/internal/cyberimp/eyes/shield/ling/on_life()
 	..()
@@ -64,6 +65,8 @@
 	implant_overlay = null
 	origin_tech = "biotech=5;magnets=5"
 	slot = "eye_ling"
+	darkness_view = 8
+	see_darkness = 0
 	status = 0
 	aug_message = "We feel a minute twitch in our eyes, and darkness creeps away."
 
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index 6dcd76bedfa..f3cf645f3a0 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -8,6 +8,8 @@
 	w_class = 1
 
 	var/vision_flags = 0
+	var/darkness_view = 0
+	var/see_darkness = 1
 	var/list/eye_colour = list(0,0,0)
 	var/list/old_eye_colour = list(0,0,0)
 	var/flash_protect = 0
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index fee4aaa1eb6..eceb5d03737 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -81,7 +81,7 @@ var/list/organ_cache = list()
 		return
 
 	//Process infections
-	if ((status & ORGAN_ROBOT) || (sterile) ||(owner && owner.species && (owner.species.flags & IS_PLANT)))
+	if ((status & ORGAN_ROBOT) || sterile == 1 ||(owner && owner.species && (owner.species.flags & IS_PLANT)))
 		germ_level = 0
 		return
 
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index c020b873354..f7c51acc6d7 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -312,7 +312,8 @@ This function completely restores a damaged organ to perfect condition.
 
 	// handle internal organs
 	for(var/obj/item/organ/internal/current_organ in internal_organs)
-		current_organ.rejuvenate()
+		if(!istype(current_organ,/obj/item/organ/internal/cyberimp))
+			current_organ.rejuvenate()
 
 
 	// remove embedded objects and drop them on the floor
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 48b97ed4c88..33dd362f81b 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -15,6 +15,12 @@
 		insert(holder)
 	..()
 
+
+/obj/item/organ/internal/process()
+
+	..()
+
+
 /obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0)
 	if(!iscarbon(M) || owner == M)
 		return

From 2eaff84f42aba91458cd05fdbb3fe73eeca66a1e Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Sun, 13 Mar 2016 08:08:15 -0400
Subject: [PATCH 02/18] mogjtbosdopm ues

---
 .../changeling/powers/augmented_eyesight.dm   |  6 ++---
 code/modules/surgery/organs/augments_eyes.dm  |  2 --
 code/modules/surgery/organs/organ.dm          |  2 +-
 code/modules/surgery/organs/organ_external.dm |  2 +-
 code/modules/surgery/organs/organ_internal.dm | 13 +++++------
 code/modules/surgery/other.dm                 | 22 +++++++++++++------
 6 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
index 21d703b9a83..c7a858d7be7 100644
--- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
@@ -13,7 +13,6 @@
 	if(!istype(user))
 		return
 	if(user.get_int_organ(/obj/item/organ/internal/cyberimp/eyes/thermals/ling))
-		user << "<span class='notice'>Our eyes are protected from flashes.</span>"
 		var/obj/item/organ/internal/cyberimp/eyes/O = new /obj/item/organ/internal/cyberimp/eyes/shield/ling()
 		O.insert(user)
 
@@ -65,8 +64,6 @@
 	implant_overlay = null
 	origin_tech = "biotech=5;magnets=5"
 	slot = "eye_ling"
-	darkness_view = 8
-	see_darkness = 0
 	status = 0
 	aug_message = "We feel a minute twitch in our eyes, and darkness creeps away."
 
@@ -78,9 +75,12 @@
 	if(ishuman(owner))
 		var/mob/living/carbon/human/H = owner
 		H.weakeyes = 1
+		if(!H.vision_type)
+			H.vision_type = new /datum/vision_override/nightvision
 
 /obj/item/organ/internal/cyberimp/eyes/thermals/ling/remove(mob/living/carbon/M, special = 0)
 	if(ishuman(owner))
 		var/mob/living/carbon/human/H = owner
 		H.weakeyes = 0
+		H.vision_type = null
 	..()
\ No newline at end of file
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index f3cf645f3a0..6dcd76bedfa 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -8,8 +8,6 @@
 	w_class = 1
 
 	var/vision_flags = 0
-	var/darkness_view = 0
-	var/see_darkness = 1
 	var/list/eye_colour = list(0,0,0)
 	var/list/old_eye_colour = list(0,0,0)
 	var/flash_protect = 0
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index eceb5d03737..5209237339f 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -81,7 +81,7 @@ var/list/organ_cache = list()
 		return
 
 	//Process infections
-	if ((status & ORGAN_ROBOT) || sterile == 1 ||(owner && owner.species && (owner.species.flags & IS_PLANT)))
+	if ((status & ORGAN_ROBOT) || sterile ||(owner && owner.species && (owner.species.flags & IS_PLANT)))
 		germ_level = 0
 		return
 
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index f7c51acc6d7..7060cfa034f 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -312,7 +312,7 @@ This function completely restores a damaged organ to perfect condition.
 
 	// handle internal organs
 	for(var/obj/item/organ/internal/current_organ in internal_organs)
-		if(!istype(current_organ,/obj/item/organ/internal/cyberimp))
+		if(!istype(current_organ,/obj/item/organ/internal/cyberimp)|| !istype(current_organ,/obj/item/organ/internal/xenos) || !istype(current_organ,/obj/item/organ/internal/hivelord_core))
 			current_organ.rejuvenate()
 
 
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 33dd362f81b..bff48e21bc4 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -16,15 +16,12 @@
 	..()
 
 
-/obj/item/organ/internal/process()
-
-	..()
-
-
 /obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0)
 	if(!iscarbon(M) || owner == M)
 		return
 
+	processing_objects -= src
+
 	var/obj/item/organ/internal/replaced = M.get_organ_slot(slot)
 	if(replaced)
 		replaced.remove(M, special = 1)
@@ -48,6 +45,8 @@
 
 /obj/item/organ/internal/remove(mob/living/carbon/M, special = 0)
 	owner = null
+
+	processing_objects |= src
 	if(M)
 		M.internal_organs -= src
 		if(vital && !special)
@@ -350,7 +349,7 @@
 
 /obj/item/organ/internal/shadowtumor/New()
 	..()
-	processing_objects.Add(src)
+	processing_objects |= src
 
 /obj/item/organ/internal/shadowtumor/Destroy()
 	processing_objects.Remove(src)
@@ -383,7 +382,7 @@
 
 /obj/item/organ/internal/honktumor/New()
 	..()
-	processing_objects.Add(src)
+	processing_objects |= src
 
 /obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
 	..()
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 004cea35e59..f5859bd6541 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -2,10 +2,16 @@
 //////////////////////////////////////////////////////////////////
 //					INTERNAL WOUND PATCHING						//
 //////////////////////////////////////////////////////////////////
+
+/datum/surgery/infection
+	name = "external infection treatment/autopsy"
+	steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/generic/cauterize)
+	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg")
+
 /datum/surgery/bleeding
 	name = "internal bleeding"
 	steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders,/datum/surgery_step/generic/retract_skin,/datum/surgery_step/fix_vein,/datum/surgery_step/generic/cauterize)
-	possible_locs = list("chest","head","groin")
+	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg")
 
 /datum/surgery/bleeding/can_start(mob/user, mob/living/carbon/target)
 	if(ishuman(target))
@@ -14,9 +20,10 @@
 		if(!affected) return 0
 
 		var/internal_bleeding = 0
-		for(var/datum/wound/W in affected.wounds) if(W.internal)
-			internal_bleeding = 1
-			break
+		for(var/datum/wound/W in affected.wounds)
+			if(W.internal)
+				internal_bleeding = 1
+				break
 		if(internal_bleeding)
 			return 1
 		return 0
@@ -37,9 +44,10 @@
 	if(!affected) return 0
 
 	var/internal_bleeding = 0
-	for(var/datum/wound/W in affected.wounds) if(W.internal)
-		internal_bleeding = 1
-		break
+	for(var/datum/wound/W in affected.wounds)
+		if(W.internal)
+			internal_bleeding = 1
+			break
 
 	return affected.open == 2 && internal_bleeding
 

From 84caa73a3c01a8dca86618f2aa7a3ce6a183f5e5 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Mon, 14 Mar 2016 23:45:47 -0400
Subject: [PATCH 03/18] rrollback

---
 code/modules/mob/living/living.dm             | 1 -
 code/modules/surgery/organs/organ_external.dm | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index dd37b374fd1..5e1614f3cff 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -363,7 +363,6 @@
 		var/mob/living/carbon/C = src
 		C.handcuffed = initial(C.handcuffed)
 		C.heart_attack = 0
-		C.brain_op_stage = 0
 
 		// restore all of the human's blood and reset their shock stage
 		if(ishuman(src))
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 7060cfa034f..c020b873354 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -312,8 +312,7 @@ This function completely restores a damaged organ to perfect condition.
 
 	// handle internal organs
 	for(var/obj/item/organ/internal/current_organ in internal_organs)
-		if(!istype(current_organ,/obj/item/organ/internal/cyberimp)|| !istype(current_organ,/obj/item/organ/internal/xenos) || !istype(current_organ,/obj/item/organ/internal/hivelord_core))
-			current_organ.rejuvenate()
+		current_organ.rejuvenate()
 
 
 	// remove embedded objects and drop them on the floor

From 13184b27e7a1955ffeea92306ec0e04e535a1f0f Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Tue, 15 Mar 2016 02:26:50 -0400
Subject: [PATCH 04/18] fixesd an issue with some eyes

---
 code/modules/surgery/organs/subtypes/diona.dm | 18 +++++++++++++++++
 .../surgery/organs/subtypes/machine.dm        | 20 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index 170f93ecddc..0447cbff139 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -194,6 +194,24 @@
 	parent_organ = "head"
 	slot = "eyes"
 
+
+/obj/item/organ/internal/diona_receptor/remove(var/mob/living/user,special = 0)
+	if(!special)
+		owner.disabilities |= NEARSIGHTED
+		owner.sdisabilities |= BLIND
+		owner.eye_blind = 20
+		owner.eye_blurry = 40
+	..()
+
+/obj/item/organ/internal/diona_receptor/surgeryize()
+	if(!owner)
+		return
+	owner.disabilities &= ~NEARSIGHTED
+	owner.sdisabilities &= ~BLIND
+	owner.eye_blurry = 0
+	owner.eye_blind = 0
+
+
 //TODO:Make absorb rads on insert
 
 /obj/item/organ/internal/liver/diona
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index 6ba6f5055db..12b3d8aded1 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -129,6 +129,26 @@
 	robotize()
 	..()
 
+
+/obj/item/organ/internal/optical_sensor/remove(var/mob/living/user,special = 0)
+	if(!special)
+		owner.disabilities |= NEARSIGHTED
+		owner.sdisabilities |= BLIND
+		owner.eye_blind = 20
+		owner.eye_blurry = 40
+		owner << "Error 404:Optical Sensors not found."
+
+	..()
+
+/obj/item/organ/internal/optical_sensor/surgeryize()
+	if(!owner)
+		return
+	owner.disabilities &= ~NEARSIGHTED
+	owner.sdisabilities &= ~BLIND
+	owner.eye_blurry = 0
+	owner.eye_blind = 0
+
+
 // Used for an MMI or posibrain being installed into a human.
 /obj/item/organ/internal/brain/mmi_holder
 	name = "brain"

From 7dbc03555afc2119a7edde61da48d7ef17c540e8 Mon Sep 17 00:00:00 2001
From: taukausanake <ronnie_mullins@hotmail.com>
Date: Tue, 15 Mar 2016 23:37:21 -0500
Subject: [PATCH 05/18] Held mice sprite fix

FoS made notice that dead mice don't have a sprite when held. An oversight on my part but I fixed it. Shouldn't cause anymore problems
---
 code/modules/mob/holder.dm |   1 +
 icons/obj/objects.dmi      | Bin 144613 -> 143638 bytes
 2 files changed, 1 insertion(+)

diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 10ea0c752c7..64ad7a2417c 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -91,4 +91,5 @@
 /obj/item/weapon/holder/mouse
 	name = "mouse"
 	desc = "It's a small, disease-ridden rodent."
+	icon = 'icons/mob/animal.dmi'
 	icon_state = "mouse_gray"
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 225f1b19ed31d8f13c3e298d34f914dc04625799..3ec5db973f520828b0c324d330719ba548a2f1f5 100644
GIT binary patch
delta 4739
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
COHR%J

delta 5751
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
V$I&xn^%)2Qs60%rSk^f3{{R?pFyR0I


From 4a2bd5cc1675f3ea54348495f178c72934a63161 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Thu, 17 Mar 2016 02:09:41 -0400
Subject: [PATCH 06/18] infection surgery edit

---
 code/modules/surgery/other.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index f5859bd6541..37192dbdc72 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -5,7 +5,7 @@
 
 /datum/surgery/infection
 	name = "external infection treatment/autopsy"
-	steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/generic/cauterize)
+	steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/cauterize)
 	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg")
 
 /datum/surgery/bleeding

From d748ef23b88fd0bfb377ab778f5ef5dd7b679141 Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Thu, 17 Mar 2016 23:07:45 -0700
Subject: [PATCH 07/18] Makes DNA swapping methods more reliable

- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
---
 code/datums/datumvars.dm                      |  3 --
 .../objects/items/weapons/dna_injector.dm     | 15 ++++++--
 .../objects/items/weapons/dnascrambler.dm     |  2 +-
 code/modules/admin/admin.dm                   |  3 ++
 code/modules/admin/topic.dm                   |  8 +++++
 code/modules/client/preferences.dm            |  5 +--
 code/modules/mob/dead/observer/observer.dm    | 10 ++++++
 .../mob/living/carbon/human/human_organs.dm   |  7 ++--
 code/modules/surgery/limb_reattach.dm         |  2 +-
 code/modules/surgery/organs/organ.dm          |  2 +-
 code/modules/surgery/organs/organ_external.dm | 35 ++++++++++++++-----
 code/modules/surgery/organs/organ_icon.dm     | 18 +++++++---
 12 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 2088a50d748..01963850559 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -219,9 +219,6 @@
 
 	body += "<td width='50%'><div align='center'><a href='?_src_=vars;datumrefresh=\ref[D]'>Refresh</a>"
 
-	//if(ismob(D))
-	//	body += "<br><a href='?_src_=vars;mob_player_panel=\ref[D]'>Show player panel</a></div></td></tr></table></div><hr>"
-
 	body += {"	<form>
 				<select name="file" size="1"
 				onchange="loadPage(this.form.elements\[0\])"
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 8a522c08f3b..85818ac7767 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -63,15 +63,24 @@
 /obj/item/weapon/dnainjector/proc/inject(mob/living/M as mob, mob/user as mob)
 	if(istype(M,/mob/living))
 		M.apply_effect(rand(10,25),IRRADIATE,0,1)
+	var/mob/living/carbon/human/H
+	if(istype(M, /mob/living/carbon/human))
+		H = M
 
-	if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
+	if (!(NOCLONE in M.mutations) && !(H && (H.species.flags & NO_DNA))) // prevents drained people from having their DNA changed
+		var/prev_ue = M.dna.unique_enzymes
 		// UI in syringe.
 		if (buf.types & DNA2_BUF_UI)
 			if (!block) //isolated block?
-				M.UpdateAppearance(buf.dna.UI.Copy())
+				M.dna.UI = buf.dna.UI.Copy()
+				M.dna.UpdateUI()
+				M.UpdateAppearance()
 				if (buf.types & DNA2_BUF_UE) //unique enzymes? yes
+
 					M.real_name = buf.dna.real_name
 					M.name = buf.dna.real_name
+					M.dna.real_name = buf.dna.real_name
+					M.dna.unique_enzymes = buf.dna.unique_enzymes
 				uses--
 			else
 				M.dna.SetUIValue(block,src.GetValue())
@@ -86,6 +95,8 @@
 			domutcheck(M, null, block!=null)
 			uses--
 			M.update_mutations()
+		if(H)
+			H.sync_organ_dna(assimilate = 0, old_ue = prev_ue)
 
 	spawn(0)//this prevents the collapse of space-time continuum
 		if (user)
diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm
index e654e4ff941..b452c9f7236 100644
--- a/code/game/objects/items/weapons/dnascrambler.dm
+++ b/code/game/objects/items/weapons/dnascrambler.dm
@@ -38,7 +38,7 @@
 		target.generate_name()
 		if(istype(target, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = target
-			H.sync_organ_dna(1)
+			H.sync_organ_dna(assimilate = 1)
 			H.update_body(0)
 			H.reset_hair() // No more winding up with hairstyles you're not supposed to have, and blowing your cover
 			H.dna.ResetUIFrom(H)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 0896a6e5488..f497a645f95 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -139,6 +139,9 @@ var/global/nologevent = 0
 			else
 				body += "<A href='?_src_=holder;makeanimal=\ref[M]'>Animalize</A> | "
 
+			if(istype(M, /mob/dead/observer))
+				body += "<a href='?_src_=holder;incarn_ghost=\ref[M]'>Re-incarnate</a> | "
+
 			// DNA2 - Admin Hax
 			if(M.dna && iscarbon(M))
 				body += "<br><br>"
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 26813c0ba91..4431a8363d6 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1523,6 +1523,14 @@
 
 		usr.client.cmd_admin_animalize(M)
 
+	else if(href_list["incarn_ghost"])
+		if(!check_rights(R_SPAWN)) return
+
+		var/mob/dead/observer/G = locate(href_list["incarn_ghost"])
+		if(!istype(G))
+			usr << "This will only work on /mob/dead/observer"
+		G.incarnate_ghost()
+
 	else if(href_list["togmutate"])
 		if(!check_rights(R_SPAWN))	return
 
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 077af57dfee..c51fccc381f 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1585,8 +1585,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 	character.real_name = real_name
 	character.name = character.real_name
-	if(character.dna)
-		character.dna.real_name = character.real_name
 
 	character.flavor_text = flavor_text
 	character.med_record = med_record
@@ -1696,6 +1694,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			message_admins("[key_name_admin(character)] has spawned with their gender as plural or neuter. Please notify coders.")
 			character.change_gender(MALE)
 
+	character.dna.ready_dna(character)
+	character.sync_organ_dna(assimilate=1)
+
 /datum/preferences/proc/open_load_dialog(mob/user)
 
 	var/DBQuery/query = dbcon.NewQuery("SELECT slot,real_name FROM [format_table_name("characters")] WHERE ckey='[user.ckey]' ORDER BY slot")
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 90b568110b3..3ad595cdc15 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -636,3 +636,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return 0
 	usr.visible_message("<span class='deadsay'><b>[src]</b> points to [A].</span>")
 	return 1
+
+/mob/dead/observer/proc/incarnate_ghost()
+	if(!client)
+		return
+	var/mob/living/carbon/human/new_char = new(get_turf(src))
+	client.prefs.copy_to(new_char)
+	if(mind)
+		mind.transfer_to(new_char)
+	else
+		new_char.key = key
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 100eff321d4..56838b8d14e 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -147,11 +147,14 @@
 /*
 When assimilate is 1, organs that have a different UE will still have their DNA overriden by that of the host
 Otherwise, this restricts itself to organs that share the UE of the host.
+
+old_ue: Set this to a UE string, and this proc will overwrite the dna of organs that have that UE, instead of the host's present UE
 */
-/mob/living/carbon/human/proc/sync_organ_dna(var/assimilate = 1)
+/mob/living/carbon/human/proc/sync_organ_dna(var/assimilate = 1, var/old_ue = null)
+	var/ue_to_compare = (old_ue) ? old_ue : dna.unique_enzymes
 	var/list/all_bits = internal_organs|organs
 	for(var/obj/item/organ/O in all_bits)
-		if(assimilate || O.dna.unique_enzymes == dna.unique_enzymes)
+		if(assimilate || O.dna.unique_enzymes == ue_to_compare)
 			O.set_dna(dna)
 
 /*
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index 002eeb9e024..e9464fab9a1 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -151,7 +151,7 @@
 	return 1
 
 /datum/surgery_step/limb/connect/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-	var/obj/item/organ/external/E = tool
+	var/obj/item/organ/external/E = target.get_organ(target_zone)
 	user.visible_message("<span class='alert'>[user]'s hand slips, damaging [target]'s [E.amputation_point]!</span>", \
 	"<span class='alert'>Your hand slips, damaging [target]'s [E.amputation_point]!</span>")
 	target.apply_damage(10, BRUTE, null, sharp=1)
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index fee4aaa1eb6..c47693a358c 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -57,7 +57,7 @@ var/list/organ_cache = list()
 /obj/item/organ/proc/set_dna(var/datum/dna/new_dna)
 	if(new_dna)
 		dna = new_dna.Clone()
-		blood_DNA.Cut()
+		blood_DNA = list()
 		blood_DNA[dna.unique_enzymes] = dna.b_type
 
 /obj/item/organ/proc/die()
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index c020b873354..3204d82f607 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -30,8 +30,9 @@
 	var/cannot_amputate
 	var/cannot_break
 	var/s_tone
-	var/list/s_col = list()
+	var/list/s_col = null // If this is instantiated, it should be a list of length 3
 	var/list/wounds = list()
+	var/list/child_icons = list()
 	var/number_wounds = 0 // cache the number of wounds, which is NOT wounds.len!
 	var/perma_injury = 0
 	// 0: Don't fail when at full damage
@@ -64,6 +65,7 @@
 	var/amputation_point // Descriptive string used in amputation.
 	var/can_grasp
 	var/can_stand
+	var/wound_cleanup_timer
 
 /obj/item/organ/external/Destroy()
 	if(parent && parent.children)
@@ -78,6 +80,10 @@
 		for(var/obj/item/organ/external/C in children)
 			qdel(C)
 
+	if(wound_cleanup_timer)
+		deltimer(wound_cleanup_timer)
+		wound_cleanup_timer = null
+
 	return ..()
 
 /obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -105,7 +111,7 @@
 						O.status |= ORGAN_CUT_AWAY
 						if(!O.sterile)
 							spread_germs_to_organ(O,user) // This wouldn't be any cleaner than the actual surgery
-						O.forceMove(src)
+						O.forceMove(get_turf(src))
 					if(!(user.l_hand && user.r_hand))
 						user.put_in_hands(removing)
 					user.visible_message("<span class='danger'><b>[user]</b> extracts [removing] from [src] with [W]!")
@@ -392,6 +398,11 @@ This function completely restores a damaged organ to perfect condition.
 		last_dam = brute_dam + burn_dam
 	if(germ_level)
 		return 1
+	if(!wound_cleanup_timer)
+		wound_cleanup_timer = addtimer(src, "cleanup_wounds", SecondsToTicks(600), 1, wounds)
+
+	if (update_icon())
+		owner.UpdateDamageIcon(1)
 	return 0
 
 /obj/item/organ/external/process()
@@ -525,11 +536,6 @@ Note that amputating the affected organ does in fact remove the infection from t
 		return
 
 	for(var/datum/wound/W in wounds)
-		// wounds can disappear after 10 minutes at the earliest
-		if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time)
-			wounds -= W
-			continue
-			// let the GC handle the deletion of the wound
 
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
 		if(W.internal && !W.can_autoheal() && owner.bodytemperature >= 170)
@@ -892,13 +898,13 @@ Note that amputating the affected organ does in fact remove the infection from t
 	// Attached organs also fly off.
 	if(!ignore_children)
 		for(var/obj/item/organ/external/O in children)
-			O.remove()
+			O.remove(victim)
 			if(O)
 				O.forceMove(src)
 
 	// Grab all the internal giblets too.
 	for(var/obj/item/organ/internal/organ in internal_organs)
-		organ.remove()
+		organ.remove(victim)
 		organ.forceMove(src)
 
 	release_restraints(victim)
@@ -941,3 +947,14 @@ Note that amputating the affected organ does in fact remove the infection from t
 	if (!istype(O)) // You're not the primary organ of ANYTHING, bucko
 		return 0
 	return src == O.organs_by_name[limb_name]
+
+// The callback we use to remove wounds from an un-processed limb
+/obj/item/organ/external/proc/cleanup_wounds(var/list/slated_wounds)
+	wound_cleanup_timer = null
+	for(var/datum/wound/W in slated_wounds)
+		if(!W)
+			continue
+		if(W.damage > 0)
+			continue
+		wounds -= W
+		qdel(W)
diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm
index 2b591e6a302..fbc26625e00 100644
--- a/code/modules/surgery/organs/organ_icon.dm
+++ b/code/modules/surgery/organs/organ_icon.dm
@@ -1,34 +1,42 @@
 var/global/list/limb_icon_cache = list()
 
 /obj/item/organ/external/proc/compile_icon()
-	overlays.Cut()
+	// I do this so the head's overlays don't get obliterated
+	for(var/child_i in child_icons)
+		overlays -= child_i
+	child_icons.Cut()
 	 // This is a kludge, only one icon has more than one generation of children though.
 	for(var/obj/item/organ/external/organ in contents)
 		if(organ.children && organ.children.len)
 			for(var/obj/item/organ/external/child in organ.children)
 				overlays += child.mob_icon
+				child_icons += child.mob_icon
 		overlays += organ.mob_icon
+		child_icons += organ.mob_icon
 
 /obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/human)
-	s_tone = null
-	s_col = null
 	if(status & ORGAN_ROBOT && !(species && species.name == "Machine")) //machine people get skin color
 		return
 	if(species && human.species && species.name != human.species.name)
 		return
+	if(dna.unique_enzymes != human.dna.unique_enzymes) // This isn't MY arm
+		sync_colour_to_dna()
+		return
 	if(!isnull(human.s_tone) && (human.species.bodyflags & HAS_SKIN_TONE))
+		s_col = null
 		s_tone = human.s_tone
 	if(human.species.bodyflags & HAS_SKIN_COLOR)
+		s_tone = null
 		s_col = list(human.r_skin, human.g_skin, human.b_skin)
 
 /obj/item/organ/external/proc/sync_colour_to_dna()
-	s_tone = null
-	s_col = null
 	if(status & ORGAN_ROBOT)
 		return
 	if(!isnull(dna.GetUIValue(DNA_UI_SKIN_TONE)) && (species.flags & HAS_SKIN_TONE))
+		s_col = null
 		s_tone = dna.GetUIValue(DNA_UI_SKIN_TONE)
 	if(species.flags & HAS_SKIN_COLOR)
+		s_tone = null
 		s_col = list(dna.GetUIValue(DNA_UI_SKIN_R), dna.GetUIValue(DNA_UI_SKIN_G), dna.GetUIValue(DNA_UI_SKIN_B))
 
 /obj/item/organ/external/head/sync_colour_to_human(var/mob/living/carbon/human/human)

From c379361305ef4d163bf2a917c562e3a92df31857 Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Thu, 17 Mar 2016 23:36:22 -0700
Subject: [PATCH 08/18] Brains now rename on removal and insertion

---
 code/modules/mob/living/carbon/brain/brain_item.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index e95315bb88c..28afdf4032b 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -59,6 +59,8 @@
 
 /obj/item/organ/internal/brain/remove(var/mob/living/user,special = 0)
 
+	name = "[dna.real_name]'s [initial(name)]"
+
 	if(!owner) return ..() // Probably a redundant removal; just bail
 
 	var/obj/item/organ/internal/brain/B = src
@@ -77,7 +79,7 @@
 
 /obj/item/organ/internal/brain/insert(var/mob/living/target,special = 0)
 
-	name = "brain"
+	name = "[initial(name)]"
 	var/brain_already_exists = 0
 	if(istype(target,/mob/living/carbon/human)) // No more IPC multibrain shenanigans
 		if(target.get_int_organ(/obj/item/organ/internal/brain))

From bffb90d392ff1ab3c339c41f430c143434c0ce31 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Fri, 18 Mar 2016 14:06:36 -0400
Subject: [PATCH 09/18] removes somethings...

---
 code/modules/mob/living/carbon/brain/MMI.dm   | 3 ---
 code/modules/surgery/organs/organ_internal.dm | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index f5e832cdaa7..7aa4cd44554 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -30,9 +30,6 @@
 			user << "<span class='userdanger'>Somehow, this MMI still has a brain in it. Report this to the bug tracker.</span>"
 			log_to_dd("[user] tried to stick a [O] into [src] in [get_area(src)], but the held brain variable wasn't cleared")
 			return
-		if(B.status & ORGAN_DEAD) // As it stood, a brain would never become unviable for MMI usage. Perhaps we should keep it that way?
-			user << "<span class='warning'>This [B] is dead</span>"
-			return
 		for(var/mob/V in viewers(src, null))
 			V.show_message("<span class='notice'>[user] sticks \a [O] into \the [src].</span>")
 		brainmob = B.brainmob
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index bff48e21bc4..abe2107821e 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -20,8 +20,6 @@
 	if(!iscarbon(M) || owner == M)
 		return
 
-	processing_objects -= src
-
 	var/obj/item/organ/internal/replaced = M.get_organ_slot(slot)
 	if(replaced)
 		replaced.remove(M, special = 1)
@@ -46,7 +44,6 @@
 /obj/item/organ/internal/remove(mob/living/carbon/M, special = 0)
 	owner = null
 
-	processing_objects |= src
 	if(M)
 		M.internal_organs -= src
 		if(vital && !special)

From 8270e1edef470b561735768c1cbf21e193c92927 Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Fri, 18 Mar 2016 14:54:00 -0700
Subject: [PATCH 10/18] pAIs and drones are now vulnerable to EMPs when held

---
 code/modules/mob/holder.dm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 10ea0c752c7..53518145d1a 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -34,6 +34,14 @@
 	for(var/mob/living/M in contents)
 		M.show_message(message,m_type)
 
+/obj/item/weapon/holder/emp_act(var/intensity)
+	for(var/mob/living/M in contents)
+		M.emp_act(intensity)
+
+/obj/item/weapon/holder/ex_act(var/intensity)
+	for(var/mob/living/M in contents)
+		M.ex_act(intensity)
+
 /obj/item/weapon/holder/container_resist(var/mob/living/L)
 	var/mob/M = src.loc                      //Get our mob holder (if any).
 

From 3704bfa8779430f3a942fc0312f3222a5ec3978c Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Fri, 18 Mar 2016 18:49:33 -0400
Subject: [PATCH 11/18] Automatic changelog generation for PR #3926

---
 html/changelogs/AutoChangeLog-pr-3926.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-3926.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3926.yml b/html/changelogs/AutoChangeLog-pr-3926.yml
new file mode 100644
index 00000000000..6bcc739d487
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3926.yml
@@ -0,0 +1,4 @@
+author: Crazylemon64
+delete-after: True
+changes: 
+  - bugfix: "pAIs and Drones are now affected by EMPs and explosions while held."

From fd65c752bf1543e86827025f814884e15720a076 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Fri, 18 Mar 2016 20:32:36 -0400
Subject: [PATCH 12/18] OMG CONFLICT R GRIFFING ME HALP

---
 code/modules/surgery/organs/organ_internal.dm | 69 ++++++++++++++-----
 1 file changed, 52 insertions(+), 17 deletions(-)

diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index abe2107821e..5ea3682a02f 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -9,20 +9,23 @@
 	var/slot
 	vital = 0
 	var/organ_action_name = null
+	var/non_primary = 0
 
 /obj/item/organ/internal/New(var/mob/living/carbon/holder)
 	if(istype(holder))
 		insert(holder)
 	..()
 
-
-/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, var/dont_remove_slot = 0)
 	if(!iscarbon(M) || owner == M)
 		return
 
 	var/obj/item/organ/internal/replaced = M.get_organ_slot(slot)
 	if(replaced)
-		replaced.remove(M, special = 1)
+		if(dont_remove_slot)
+			non_primary = 1
+		else
+			replaced.remove(M, special = 1)
 
 	owner = M
 
@@ -43,7 +46,6 @@
 
 /obj/item/organ/internal/remove(mob/living/carbon/M, special = 0)
 	owner = null
-
 	if(M)
 		M.internal_organs -= src
 		if(vital && !special)
@@ -124,31 +126,64 @@
 
 
 // Brain is defined in brain_item.dm.
+
 /obj/item/organ/internal/heart
 	name = "heart"
 	icon_state = "heart-on"
 	organ_tag = "heart"
 	parent_organ = "chest"
+	slot = "heart"
+	origin_tech = "biotech=3"
+	var/beating = 1
 	dead_icon = "heart-off"
-	vital = 1
-	var/beating = 0
+	var/icon_base = "heart"
 
 /obj/item/organ/internal/heart/update_icon()
 	if(beating)
-		icon_state = "heart-on"
+		icon_state = "[icon_base]-on"
 	else
-		icon_state = "heart-off"
-
-/obj/item/organ/internal/heart/insert(mob/living/carbon/M, special = 0)
-	..()
-	beating = 1
-	update_icon()
+		icon_state = "[icon_base]-off"
 
 /obj/item/organ/internal/heart/remove(mob/living/carbon/M, special = 0)
 	..()
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.stat == DEAD || H.heart_attack)
+			Stop()
+			return
+		if(!special)
+			H.heart_attack = 1
+
 	spawn(120)
-		beating = 0
-		update_icon()
+		if(!owner)
+			Stop()
+
+/obj/item/organ/internal/heart/attack_self(mob/user)
+	..()
+	if(!beating)
+		Restart()
+		spawn(80)
+			if(!owner)
+				Stop()
+
+
+/obj/item/organ/internal/heart/insert(mob/living/carbon/M, special = 0)
+	..()
+	if(ishuman(M) && beating)
+		var/mob/living/carbon/human/H = M
+		if(H.heart_attack)
+			H.heart_attack = 0
+			return
+
+/obj/item/organ/internal/heart/proc/Stop()
+	beating = 0
+	update_icon()
+	return 1
+
+/obj/item/organ/internal/heart/proc/Restart()
+	beating = 1
+	update_icon()
+	return 1
 
 /obj/item/organ/internal/heart/prepare_eat()
 	var/obj/S = ..()
@@ -346,7 +381,7 @@
 
 /obj/item/organ/internal/shadowtumor/New()
 	..()
-	processing_objects |= src
+	processing_objects.Add(src)
 
 /obj/item/organ/internal/shadowtumor/Destroy()
 	processing_objects.Remove(src)
@@ -379,7 +414,7 @@
 
 /obj/item/organ/internal/honktumor/New()
 	..()
-	processing_objects |= src
+	processing_objects.Add(src)
 
 /obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
 	..()

From 83d3e392aeaea4e2899b3a59878e387e08bef566 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Fri, 18 Mar 2016 20:40:54 -0400
Subject: [PATCH 13/18] Revert "OMG CONFLICT R GRIFFING ME HALP"

This reverts commit fd65c752bf1543e86827025f814884e15720a076.
---
 code/modules/surgery/organs/organ_internal.dm | 67 +++++--------------
 1 file changed, 16 insertions(+), 51 deletions(-)

diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 5ea3682a02f..abe2107821e 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -9,23 +9,20 @@
 	var/slot
 	vital = 0
 	var/organ_action_name = null
-	var/non_primary = 0
 
 /obj/item/organ/internal/New(var/mob/living/carbon/holder)
 	if(istype(holder))
 		insert(holder)
 	..()
 
-/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, var/dont_remove_slot = 0)
+
+/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0)
 	if(!iscarbon(M) || owner == M)
 		return
 
 	var/obj/item/organ/internal/replaced = M.get_organ_slot(slot)
 	if(replaced)
-		if(dont_remove_slot)
-			non_primary = 1
-		else
-			replaced.remove(M, special = 1)
+		replaced.remove(M, special = 1)
 
 	owner = M
 
@@ -46,6 +43,7 @@
 
 /obj/item/organ/internal/remove(mob/living/carbon/M, special = 0)
 	owner = null
+
 	if(M)
 		M.internal_organs -= src
 		if(vital && !special)
@@ -126,64 +124,31 @@
 
 
 // Brain is defined in brain_item.dm.
-
 /obj/item/organ/internal/heart
 	name = "heart"
 	icon_state = "heart-on"
 	organ_tag = "heart"
 	parent_organ = "chest"
-	slot = "heart"
-	origin_tech = "biotech=3"
-	var/beating = 1
 	dead_icon = "heart-off"
-	var/icon_base = "heart"
+	vital = 1
+	var/beating = 0
 
 /obj/item/organ/internal/heart/update_icon()
 	if(beating)
-		icon_state = "[icon_base]-on"
+		icon_state = "heart-on"
 	else
-		icon_state = "[icon_base]-off"
-
-/obj/item/organ/internal/heart/remove(mob/living/carbon/M, special = 0)
-	..()
-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		if(H.stat == DEAD || H.heart_attack)
-			Stop()
-			return
-		if(!special)
-			H.heart_attack = 1
-
-	spawn(120)
-		if(!owner)
-			Stop()
-
-/obj/item/organ/internal/heart/attack_self(mob/user)
-	..()
-	if(!beating)
-		Restart()
-		spawn(80)
-			if(!owner)
-				Stop()
-
+		icon_state = "heart-off"
 
 /obj/item/organ/internal/heart/insert(mob/living/carbon/M, special = 0)
 	..()
-	if(ishuman(M) && beating)
-		var/mob/living/carbon/human/H = M
-		if(H.heart_attack)
-			H.heart_attack = 0
-			return
-
-/obj/item/organ/internal/heart/proc/Stop()
-	beating = 0
-	update_icon()
-	return 1
-
-/obj/item/organ/internal/heart/proc/Restart()
 	beating = 1
 	update_icon()
-	return 1
+
+/obj/item/organ/internal/heart/remove(mob/living/carbon/M, special = 0)
+	..()
+	spawn(120)
+		beating = 0
+		update_icon()
 
 /obj/item/organ/internal/heart/prepare_eat()
 	var/obj/S = ..()
@@ -381,7 +346,7 @@
 
 /obj/item/organ/internal/shadowtumor/New()
 	..()
-	processing_objects.Add(src)
+	processing_objects |= src
 
 /obj/item/organ/internal/shadowtumor/Destroy()
 	processing_objects.Remove(src)
@@ -414,7 +379,7 @@
 
 /obj/item/organ/internal/honktumor/New()
 	..()
-	processing_objects.Add(src)
+	processing_objects |= src
 
 /obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
 	..()

From ff798ae9ecf79884a6cca07ca3a9d29b49040f17 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Fri, 18 Mar 2016 20:53:28 -0400
Subject: [PATCH 14/18] This is the exact file from the master branch of the
 Repo

---
 code/modules/surgery/organs/organ_internal.dm | 69 ++++++++++++++-----
 1 file changed, 52 insertions(+), 17 deletions(-)

diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index abe2107821e..5ea3682a02f 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -9,20 +9,23 @@
 	var/slot
 	vital = 0
 	var/organ_action_name = null
+	var/non_primary = 0
 
 /obj/item/organ/internal/New(var/mob/living/carbon/holder)
 	if(istype(holder))
 		insert(holder)
 	..()
 
-
-/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/proc/insert(mob/living/carbon/M, special = 0, var/dont_remove_slot = 0)
 	if(!iscarbon(M) || owner == M)
 		return
 
 	var/obj/item/organ/internal/replaced = M.get_organ_slot(slot)
 	if(replaced)
-		replaced.remove(M, special = 1)
+		if(dont_remove_slot)
+			non_primary = 1
+		else
+			replaced.remove(M, special = 1)
 
 	owner = M
 
@@ -43,7 +46,6 @@
 
 /obj/item/organ/internal/remove(mob/living/carbon/M, special = 0)
 	owner = null
-
 	if(M)
 		M.internal_organs -= src
 		if(vital && !special)
@@ -124,31 +126,64 @@
 
 
 // Brain is defined in brain_item.dm.
+
 /obj/item/organ/internal/heart
 	name = "heart"
 	icon_state = "heart-on"
 	organ_tag = "heart"
 	parent_organ = "chest"
+	slot = "heart"
+	origin_tech = "biotech=3"
+	var/beating = 1
 	dead_icon = "heart-off"
-	vital = 1
-	var/beating = 0
+	var/icon_base = "heart"
 
 /obj/item/organ/internal/heart/update_icon()
 	if(beating)
-		icon_state = "heart-on"
+		icon_state = "[icon_base]-on"
 	else
-		icon_state = "heart-off"
-
-/obj/item/organ/internal/heart/insert(mob/living/carbon/M, special = 0)
-	..()
-	beating = 1
-	update_icon()
+		icon_state = "[icon_base]-off"
 
 /obj/item/organ/internal/heart/remove(mob/living/carbon/M, special = 0)
 	..()
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.stat == DEAD || H.heart_attack)
+			Stop()
+			return
+		if(!special)
+			H.heart_attack = 1
+
 	spawn(120)
-		beating = 0
-		update_icon()
+		if(!owner)
+			Stop()
+
+/obj/item/organ/internal/heart/attack_self(mob/user)
+	..()
+	if(!beating)
+		Restart()
+		spawn(80)
+			if(!owner)
+				Stop()
+
+
+/obj/item/organ/internal/heart/insert(mob/living/carbon/M, special = 0)
+	..()
+	if(ishuman(M) && beating)
+		var/mob/living/carbon/human/H = M
+		if(H.heart_attack)
+			H.heart_attack = 0
+			return
+
+/obj/item/organ/internal/heart/proc/Stop()
+	beating = 0
+	update_icon()
+	return 1
+
+/obj/item/organ/internal/heart/proc/Restart()
+	beating = 1
+	update_icon()
+	return 1
 
 /obj/item/organ/internal/heart/prepare_eat()
 	var/obj/S = ..()
@@ -346,7 +381,7 @@
 
 /obj/item/organ/internal/shadowtumor/New()
 	..()
-	processing_objects |= src
+	processing_objects.Add(src)
 
 /obj/item/organ/internal/shadowtumor/Destroy()
 	processing_objects.Remove(src)
@@ -379,7 +414,7 @@
 
 /obj/item/organ/internal/honktumor/New()
 	..()
-	processing_objects |= src
+	processing_objects.Add(src)
 
 /obj/item/organ/internal/honktumor/insert(mob/living/carbon/M, special = 0)
 	..()

From b9fd5042f62ceb392c7a20ee8079d7abfa0bb5f6 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Fri, 18 Mar 2016 21:13:29 -0400
Subject: [PATCH 15/18] look ma, hands....

---
 code/modules/surgery/other.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 37192dbdc72..1d28d404b92 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -6,12 +6,12 @@
 /datum/surgery/infection
 	name = "external infection treatment/autopsy"
 	steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/cauterize)
-	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg")
+	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand")
 
 /datum/surgery/bleeding
 	name = "internal bleeding"
 	steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders,/datum/surgery_step/generic/retract_skin,/datum/surgery_step/fix_vein,/datum/surgery_step/generic/cauterize)
-	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg")
+	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand")
 
 /datum/surgery/bleeding/can_start(mob/user, mob/living/carbon/target)
 	if(ishuman(target))

From ac5968fb84f3550ebc5228fce52efc2899535c95 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Fri, 18 Mar 2016 21:25:31 -0400
Subject: [PATCH 16/18] I FORGOT THE FEEET!

---
 code/modules/surgery/other.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 1d28d404b92..42c35dd5106 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -6,12 +6,12 @@
 /datum/surgery/infection
 	name = "external infection treatment/autopsy"
 	steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/cauterize)
-	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand")
+	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand", "r_foot", "l_foot")
 
 /datum/surgery/bleeding
 	name = "internal bleeding"
 	steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders,/datum/surgery_step/generic/retract_skin,/datum/surgery_step/fix_vein,/datum/surgery_step/generic/cauterize)
-	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand")
+	possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand", "r_foot", "l_foot")
 
 /datum/surgery/bleeding/can_start(mob/user, mob/living/carbon/target)
 	if(ishuman(target))

From 57f7ac7555e271882d9e1dfde144d0d08f2933ed Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Fri, 18 Mar 2016 21:37:23 -0400
Subject: [PATCH 17/18] Automatic changelog generation for PR #3920

---
 html/changelogs/AutoChangeLog-pr-3920.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-3920.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3920.yml b/html/changelogs/AutoChangeLog-pr-3920.yml
new file mode 100644
index 00000000000..e2619487951
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3920.yml
@@ -0,0 +1,12 @@
+author: Crazylemon64
+delete-after: True
+changes: 
+  - bugfix: "Makes heads keep hair on removal"
+  - bugfix: "Amputated limbs from a DNA-injected individual now will keep their appearance of the DNA-injected person"
+  - bugfix: "Wounds will vanish on their own now"
+  - rscadd: "Admins now have an \"incarnate\" option on the player panel when viewing ghosts for quick player instantiation"
+  - bugfix: "Fixes a runtime regarding failing a limb reconnection surgery"
+  - bugfix: "Copying a client's preferences now overrides the previous mob's DNA"
+  - bugfix: "A DNA injector is now more thorough, and affects the DNA of mobs' limbs and organs"
+  - bugfix: "DNA-lacking species can no longer be DNA-injected"
+  - bugfix: "Brains are now labeled again"

From 46f55008484c2e674fa26e1a52cd310a38b93828 Mon Sep 17 00:00:00 2001
From: ParadiseSS13-Bot <leonardo.o.costa7+GITBOT@gmail.com>
Date: Fri, 18 Mar 2016 21:40:55 -0400
Subject: [PATCH 18/18] Automatic changelog generation for PR #3849

---
 html/changelogs/AutoChangeLog-pr-3849.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-3849.yml

diff --git a/html/changelogs/AutoChangeLog-pr-3849.yml b/html/changelogs/AutoChangeLog-pr-3849.yml
new file mode 100644
index 00000000000..c7cb057e244
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-3849.yml
@@ -0,0 +1,5 @@
+author: Fethas
+delete-after: True
+changes: 
+  - rscadd: "Adds a surgery for infection treatmne/autopsys that is simply cut open, retract, cauterize"
+  - bugfix: "fixes a dumb error in internal bleeeding surgerys"