s

2020-03-14 21:48:23 -07:00
parent 2113b63428
commit 4d0677daa9
8 changed files with 29 additions and 35 deletions
@@ -182,10 +182,10 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	var/active = 0

-/obj/item/shield/riot/tele/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(active)
-		return ..()
-	return 0
+/obj/item/shield/riot/tele/run_block(real_attack, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance)
+	if(!active)
+		return BLOCK_NONE
+	return ..()

 /obj/item/shield/riot/tele/attack_self(mob/living/user)
 	active = !active