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

[MIRROR] Allows mobs to get shocked when they smash things
2017-10-15 08:48:26 -04:00
parent b0a20f0dce 4f6462bad4
commit e2914c5987
3 changed files with 10 additions and 1 deletions
@@ -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"