From fef301062e023e8fa9c60236ef371786f11b8223 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sun, 3 Aug 2014 15:42:27 -0400
Subject: [PATCH] Boop

---
 code/game/objects/items/weapons/stunbaton.dm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 20909228642..07d697cc402 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -180,9 +180,19 @@
 		if(istype(hit_atom, /mob/living))
 			var/mob/living/carbon/human/H = hit_atom
 			if(status)
-				H.Stun(stunforce)
-				H.Weaken(stunforce)
-				H.apply_effect(STUTTER, stunforce)
+			//stun effects
+				if (stunforce)
+					H.Stun(stunforce)
+					H.Weaken(stunforce)
+					H.apply_effect(STUTTER, stunforce)
+
+				if (agony)
+					//Siemens coefficient?
+					//TODO: Merge this with taser effects
+					H.apply_effect(agony,AGONY,0)
+					H.apply_effect(STUTTER, agony/10)
+					H.apply_effect(EYE_BLUR, agony/10)
+					H.flash_pain()
 
 				deductcharge(hitcost)