From f2fdbf2f6a4ccb2430640261529ee98a7f9204a9 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Fri, 22 Apr 2016 17:55:16 +0100
Subject: [PATCH] Organ/surgical changes/fixes

---
 code/modules/organs/organ_external.dm | 9 +++++++--
 code/modules/surgery/limb_reattach.dm | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index d351ca9cdd0..9ea6cb65bf0 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -199,11 +199,11 @@
 
 /obj/item/organ/external/replaced(var/mob/living/carbon/human/target)
 	owner = target
+	forceMove(owner)
 	if(istype(owner))
 		owner.organs_by_name[organ_tag] = src
 		owner.organs |= src
 		for(var/obj/item/organ/organ in src)
-			organ.loc = owner
 			organ.replaced(owner,src)
 
 	if(parent_organ)
@@ -212,6 +212,12 @@
 			if(!parent.children)
 				parent.children = list()
 			parent.children.Add(src)
+			//Remove all stump wounds since limb is not missing anymore
+			for(var/datum/wound/lost_limb/W in parent.wounds)
+				parent.wounds -= W
+				qdel(W)
+				break
+			parent.update_damages()
 
 /****************************************************
 			   DAMAGE PROCS
@@ -750,7 +756,6 @@ Note that amputating the affected organ does in fact remove the infection from t
 	removed(null, ignore_children)
 	victim.traumatic_shock += 60
 
-	wounds.Cut()
 	if(parent_organ)
 		var/datum/wound/lost_limb/W = new (src, disintegrate, clean)
 		if(clean)
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index 352dd9232d0..af872a29e68 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -32,7 +32,6 @@
 		"<span class='notice'>You have attached [target]'s [E.name] to the [E.amputation_point].</span>")
 		user.removeItem(E)
 		E.replaced(target)
-		E.loc = target
 		target.update_body()
 		target.updatehealth()
 		target.UpdateDamageIcon()