k

code/modules/mob/living/carbon/carbon_block.dm

@@ -0,0 +1,4 @@
+/mob/living/carbon/get_blocking_items()
+	. = ..()
+	if(wear_suit)
+		. += wear_suit

code/modules/mob/living/carbon/human/human_block.dm

@@ -0,0 +1,6 @@
+/mob/living/carbon/human/get_blocking_items()
+	. = ..()
+	if(w_uniform)
+		. += w_uniform
+	if(wear_neck)
+		. += wear_neck

code/modules/mob/living/carbon/human/species.dm

@@ -1786,7 +1786,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		return TRUE
 	if(M.mind)
 		attacker_style = M.mind.martial_art
-	if((M != H) && M.a_intent != INTENT_HELP && (H.run_block(M, 0, "[M]", UNARMED_ATTACK, 0, M, M.zone_selected) & BLOCK_SUCCESS))
+	if((M != H) && M.a_intent != INTENT_HELP && (H.run_block(M, 0, "[M]", ATTACK_TYPE_UNARMED, 0, M, M.zone_selected) & BLOCK_SUCCESS))
 		log_combat(M, H, "attempted to touch")
 		H.visible_message("<span class='warning'>[M] attempted to touch [H]!</span>")
 		return TRUE

code/modules/mob/living/living_block.dm

@@ -46,29 +46,28 @@
   */
 /mob/living/proc/do_run_block(real_attack = TRUE, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list = list())
 	// Component signal block runs have highest priority.. for now.
-	. = SEND_SIGNAL(src, COMSIG_MOB_RUN_BLOCK, real_attack, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list)
+	. = SEND_SIGNAL(src, COMSIG_LIVING_RUN_BLOCK, real_attack, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list)
 	if(. & BLOCK_INTERRUPT_CHAIN)
 		return
-	for(var/obj/item/I in held_items)
-		if(istype(I, /obj/item/clothing))			//yeah usually this shouldn't.. uh, work. This is a bad check and should be removed though.
-			continue
-
-
-
-/mob/living/proc/_check_shields()
+	var/list/obj/item/tocheck = get_blocking_items()
+	// i don't like this
 	var/block_chance_modifier = round(damage / -3)
-	for(var/obj/item/I in held_items)
-		if(!istype(I, /obj/item/clothing))
-			var/final_block_chance = I.block_chance - (CLAMP((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
-			if(I.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
-				return TRUE
-	return FALSE
+	for(var/obj/item/I in tocheck)
+		// i don't like this too
+		var/final_block_chance = I.block_chance - (CLAMP((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
+		var/results = I.run_block(src, real_attack, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list)
+		. |= results
+		if(results & BLOCK_INTERRUPT_CHAIN)
+			break
 
-/mob/living/proc/_check_reflect(def_zone) //Reflection checks for anything in your hands, based on the reflection chance of the object(s)
+/// Gets an unsortedlist of objects to run block checks on.
+/mob/living/proc/get_blocking_items()
+	. = list()
 	for(var/obj/item/I in held_items)
-		if(I.IsReflect(def_zone))
-			return TRUE
-	return FALSE
+		// this is a bad check but i am not removing it until a better catchall is made
+		if(istype(I, /obj/item/clothing))
+			continue
+		. |= I
 
 /obj/item
 	/// The 0% to 100% chance for the default implementation of random block rolls.
@@ -87,6 +86,7 @@
 	return 0
 
 
+
 /mob/living/carbon/human/check_reflect(def_zone)
 	if(wear_suit?.IsReflect(def_zone))
 		return TRUE

code/modules/mob/living/living_defense.dm

@@ -302,7 +302,7 @@
 	var/damage = rand(5, 35)
 	if(M.is_adult)
 		damage = rand(20, 40)
-	if(run_block(M, damage, "the [M.name]", ATTACK_TYPE_MELEE, null, M, check_zone(user.zone_selected)) & BLOCK_SUCCESS)
+	if(run_block(M, damage, "the [M.name]", ATTACK_TYPE_MELEE, null, M, check_zone(M.zone_selected)) & BLOCK_SUCCESS)
 		return FALSE
 
 	if (stat != DEAD)