Merge pull request #10455 from Ghommie/Ghommie-cit501

Porting some runtime fixes.
2020-01-07 01:00:25 +00:00
parent da43d336c3 dcb2ae77fa
commit 2ce3b7fbf5
5 changed files with 21 additions and 17 deletions
@@ -84,7 +84,7 @@

 /obj/structure/grille/attack_animal(mob/user)
 	. = ..()
-	if(!shock(user, 70))
+	if(!shock(user, 70) && !QDELETED(src)) //Last hit still shocks but shouldn't deal damage to the grille)
 		take_damage(rand(5,10), BRUTE, "melee", 1)

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