From aa0b23e205d8ff15b45e78442ba220ab18140f77 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Wed, 24 Jun 2015 00:20:11 -0400
Subject: [PATCH] Fixes #9910

---
 code/game/objects/structures/grille.dm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 7829705a63e..569a4eb3b95 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -157,9 +157,7 @@
 		return
 //window placing end
 
-	else if(istype(W, /obj/item/weapon/material/shard))
-		health -= W.force * 0.1
-	else if(!shock(user, 70))
+	else if(!(W.flags & CONDUCT) || !shock(user, 70))
 		user.do_attack_animation(src)
 		playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
 		switch(W.damtype)