k

2020-03-16 04:09:25 -07:00
parent 94db06509c
commit 644273beca
13 changed files with 94 additions and 80 deletions
@@ -237,7 +237,7 @@
 	else
 		return ..()

-/obj/item/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	if(wielded)
-		return ..()
-	return FALSE
+/obj/item/twohanded/bostaff/run_block(mob/living/owner, real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+	if(!wielded)
+		return BLOCK_NONE
+	return ..()