Merge pull request #4183 from Citadel-Station-13/upstream-merge-33191

[MIRROR] Fixes a division by zero in humans' ex_act()
2017-12-03 06:13:43 -06:00
parent 13779a4b10 4b17988bf6
commit 6fe319af5a
1 changed files with 2 additions and 1 deletions
@@ -361,10 +361,11 @@


 /mob/living/carbon/human/ex_act(severity, target, origin)
-
 	if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
 		return
 	..()
+	if (!severity)
+		return
 	var/b_loss = 0
 	var/f_loss = 0
 	var/bomb_armor = getarmor(null, "bomb")