From 515bc4adb426e4fe9edb0b9893d7f05e12eab7f1 Mon Sep 17 00:00:00 2001
From: Remie Richards <toiletbrush95@gmail.com>
Date: Sun, 11 Sep 2016 19:16:02 +0100
Subject: [PATCH] all "hand" /bodyparts correctly draw a HUD element

---
 .../surgery/bodyparts/dismemberment.dm        | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 2214798dae9..92bc44d3582 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -239,6 +239,10 @@
 	H.bodyparts += src
 	if(held_index)
 		H.hand_bodyparts += src
+		if(H.hud_used)
+			var/obj/screen/inventory/hand/hand = H.hud_used.hand_slots["[held_index]"]
+			if(hand)
+				hand.update_icon()
 
 	if(special) //non conventional limb attachment
 		for(var/X in H.surgeries) //if we had an ongoing surgery to attach a new limb, we stop it.
@@ -256,21 +260,6 @@
 	H.update_damage_overlays()
 	H.update_canmove()
 
-
-/obj/item/bodypart/r_arm/attach_limb(mob/living/carbon/human/H, special)
-	..()
-	if(H.hud_used)
-		var/obj/screen/inventory/hand/R = H.hud_used.hand_slots["[held_index]"]
-		if(R)
-			R.update_icon()
-
-/obj/item/bodypart/l_arm/attach_limb(mob/living/carbon/human/H, special)
-	..()
-	if(H.hud_used)
-		var/obj/screen/inventory/hand/L = H.hud_used.hand_slots["[held_index]"]
-		if(L)
-			L.update_icon()
-
 /obj/item/bodypart/head/attach_limb(mob/living/carbon/human/H, special)
 	//Transfer some head appearance vars over
 	if(brain)