Merge pull request #2465 from tigercat2000/WHY_DOES_NO_ONE_TEST_THINGS_GODDAMNIT

Critical fix: Simple_animal invincibility.

code/modules/mob/living/living.dm

@@ -69,7 +69,7 @@
 		health = maxHealth
 		stat = CONSCIOUS
 		return
-	health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss() - halloss
+	health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss()
 
 
 //This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -87,9 +87,11 @@
 	..()
 
 /mob/living/simple_animal/updatehealth()
-	return
+	..()
+	health = Clamp(health, 0, maxHealth)
 
 /mob/living/simple_animal/Life()
+	updatehealth()
 
 	update_gravity(mob_has_gravity())
 	update_canmove()
@@ -107,9 +109,6 @@
 	if(health < 1)
 		Die()
 
-	if(health > maxHealth)
-		health = maxHealth
-
 	if(resting && icon_resting && stat != DEAD)
 		icon_state = icon_resting
 	else if(icon_resting && stat != DEAD)