From 6fda2e8c59d73aa0f41f4afcb8ffcad576c02ad8 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Thu, 27 Jul 2017 17:40:32 -0500
Subject: [PATCH] Prevents attachment of limbs over limb stumps while still
 allowing FBP construction

---
 code/modules/surgery/limb_reattach.dm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index 0d10b535c3..3310ffe6a5 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -25,15 +25,16 @@
 	can_use(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/P = target.organs_by_name[E.parent_organ]
+		var/obj/item/organ/external/affected = target.get_organ(target_zone)
+		if (affected)
+			user << "<span class='warning'>Something is in the way! You can't attach [E] here!</span>"
+			return 0
 		if(!P)
 			user << "<span class='warning'>There's nothing to attach [E] to!</span>"
 			return 0
 		else if((P.robotic >= ORGAN_ROBOT) && (E.robotic < ORGAN_ROBOT))
 			user << "<span class='warning'>Attaching [E] to [P] wouldn't work well.</span>"
 			return 0
-		else if(P.children.len)
-			user << "<span class='warning'>Something is in the way! You can't attach [E] here!</span>"
-			return 0
 		else
 			return 1