From de5186026d676ef8f2823df96798d6ecdddfbe7e Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 6 Feb 2020 01:10:47 -0700
Subject: [PATCH] Update twohanded.dm

---
 code/game/objects/items/twohanded.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 056abf0172..bce9e47554 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1034,7 +1034,7 @@
 	force_wielded = 10
 	throwforce = 15			//if you are a madman and finish someone off with this, power to you.
 	throw_speed = 1
-	block_chance = 50
+	block_chance = 30
 	materials = list(MAT_METAL = 4000, MAT_SILVER = 2000)
 	attack_verb = list("struck", "beaten", "thwacked", "pulped")
 	total_mass = 5		//yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors. (to curb stun-kill rampaging without it being on)
@@ -1066,6 +1066,8 @@
 		. = R.get_cell()
 
 /obj/item/twohanded/electrostaff/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(!on)
+		return FALSE
 	if((attack_type == PROJECTILE_ATTACK) && !can_block_projectiles)
 		return FALSE
 	return ..()