From 91004b5cc93330dc644c6de7ccfd9c8dd6f61d09 Mon Sep 17 00:00:00 2001 From: Rodey125 <55065395+Rodey125@users.noreply.github.com> Date: Sun, 15 Sep 2019 00:13:56 -0500 Subject: [PATCH] Pets can no longer nuzzle grilles into oblivion (#46430) --- code/game/objects/structures/grille.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 0f4b2feed60..cb197db5e94 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -87,6 +87,8 @@ /obj/structure/grille/attack_animal(mob/user) . = ..() + if(!.) + return if(!shock(user, 70)) take_damage(rand(5,10), BRUTE, "melee", 1)