More work on severing, improvements to yank-out-object.

code/modules/organs/organ_external.dm

@@ -627,14 +627,27 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 	src.removed(null, ignore_children)
 
+	wounds.Cut()
 	if(parent)
+		var/datum/wound/W
+		if(max_damage < 50)
+			W = new/datum/wound/lost_limb/small(max_damage)
+		else
+			W = new/datum/wound/lost_limb(max_damage)
 		parent.children -= src
-		if(!clean)
-			new /obj/item/organ/external/stump(owner, 0, src)
+		if(clean)
+			parent.wounds |= W
+			parent.update_damages()
+		else
+			var/obj/item/organ/external/stump/stump = new (owner, 0, src)
+			stump.wounds |= W
+			owner.organs |= stump
+			stump.update_damages()
 		parent = null
 
 	update_health()
 	owner.update_body()
+	dir = SOUTH
 
 	switch(disintegrate)
 		if(0)

code/modules/organs/organ_stump.dm

@@ -16,20 +16,6 @@
 	if(istype(limb))
 		max_damage = limb.max_damage
 
-/obj/item/organ/external/stump/process()
-	damage = max_damage
-
-/obj/item/organ/external/stump/handle_rejection()
-	return
-
-/obj/item/organ/external/stump/rejuvenate()
-	return
-
-/obj/item/organ/external/stump/is_damaged()
-	return 1
-
-/obj/item/organ/external/stump/is_bruised()
-	return 1
-
-/obj/item/organ/external/stump/is_broken()
-	return 1
+/obj/item/organ/external/stump/removed()
+	..()
+	del(src)

code/modules/organs/pain.dm

@@ -89,7 +89,6 @@ mob/living/carbon/human/proc/handle_pain()
 	var/maxdam = 0
 	var/obj/item/organ/external/damaged_organ = null
 	for(var/obj/item/organ/external/E in organs)
-		// amputated limbs don't cause pain
 		if(E.status & ORGAN_DEAD) continue
 		var/dam = E.get_damage()
 		// make the choice of the organ depend on damage,