From 43207c30709c0d3577d673e36f6891ca68531111 Mon Sep 17 00:00:00 2001
From: Lo6a4evskiy <Lo6a4evskiy@gmail.com>
Date: Thu, 18 Feb 2016 02:57:32 +0400
Subject: [PATCH] Fix police and telebatons ignoring shields

---
 code/game/objects/items/weapons/melee/misc.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index 5ec85b1f17c..ff14af9fb40 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/code/game/objects/items/weapons/melee/misc.dm
@@ -56,6 +56,10 @@
 			if(!isrobot(target)) return
 		else
 			if(cooldown <= 0)
+				if(ishuman(target))
+					var/mob/living/carbon/human/H = target
+					if (H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK))
+						return
 				playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
 				target.Weaken(3)
 				add_logs(user, target, "stunned", src)