Merge pull request #3392 from Citadel-Station-13/upstream-merge-31677

[MIRROR] Allows mobs to get shocked when they smash things

code/game/machinery/doors/airlock.dm

@@ -756,6 +756,11 @@
 		if(user)
 			src.attack_ai(user)
 
+/obj/machinery/door/airlock/attack_animal(mob/user)
+	. = ..()
+	if(isElectrified())
+		shock(user, 100)
+
 /obj/machinery/door/airlock/attack_paw(mob/user)
 	return src.attack_hand(user)
 

code/game/objects/structures/grille.dm

@@ -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)

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -1583,7 +1583,7 @@
 /datum/reagent/magillitis/on_mob_life(mob/living/carbon/M)
 	..()
 	if((ismonkey(M) || ishuman(M)) && current_cycle >= 10)
-		return M.gorillize()
+		M.gorillize()
 
 /datum/reagent/growthserum
 	name = "Growth Serum"