Revert "Merge branch 'master' into Yeehaw"

This reverts commit 972c03f79f, reversing changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
parent 972c03f79f
commit 05a644cc41
256 changed files with 12890 additions and 18839 deletions
@@ -84,7 +84,7 @@

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

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