Merge remote-tracking branch 'citadel/master' into clickcd_experimental

code/_onclick/other_mobs.dm

@@ -4,12 +4,18 @@
 
 	Otherwise pretty standard.
 */
+
 /mob/living/carbon/human/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 
 	if(!has_active_hand()) //can't attack without a hand.
 		to_chat(src, "<span class='notice'>You look at your arm and sigh.</span>")
 		return
 
+	var/obj/item/bodypart/check_arm = get_active_hand()
+	if(check_arm && check_arm.is_disabled() == BODYPART_DISABLED_WOUND)
+		to_chat(src, "<span class='warning'>The damage in your [check_arm.name] is preventing you from using it! Get it fixed, or at least splinted!</span>")
+		return
+
 	// Special glove functions:
 	// If the gloves do anything, have them return 1 to stop
 	// normal attack_hand() here.