Allows mobs to get shocked when they smash things (#31677)

also fixes an unrelated runtime involving magillitis
2017-10-14 23:18:07 +03:00
parent 0c663a6a9c
commit 1831bc8ea9
3 changed files with 10 additions and 1 deletions
@@ -66,6 +66,10 @@
 	var/mob/M = AM
 	shock(M, 70)

+/obj/structure/grille/attack_animal(mob/user)
+	. = ..()
+	if(!shock(user, 70))
+		take_damage(rand(5,10), BRUTE, "melee", 1)

 /obj/structure/grille/attack_paw(mob/user)
 	attack_hand(user)