Fixes vomiting.

code/modules/mob/living/carbon/human/life.dm

@@ -1324,7 +1324,7 @@
 
 	// Puke if toxloss is too high
 	if(!stat)
-		if (getToxLoss() >= 45 && nutrition > 20)
+		if (getToxLoss() >= 45)
 			spawn vomit()
 
 	//0.1% chance of playing a scary sound to someone who's in complete darkness

code/modules/mob/living/living.dm

@@ -814,14 +814,11 @@ default behaviour is:
 		return
 
 	if(!lastpuke)
-
+		lastpuke = 1
 		if (nutrition <= 100)
 			src << "<span class='danger'>You gag as you want to throw up, but there's nothing in your stomach!</span>"
 			src.Weaken(10)
-			src.adjustToxLoss(3)
-			return
-
-		lastpuke = 1
+		else
 			src << "<span class='warning'>You feel nauseous...</span>"
 
 			if(!skip_wait)

html/changelogs/EmperorJon - Vomit.yml

@@ -0,0 +1,15 @@
+# Your name.  
+author: Yoshax
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Having between 25 and 100 nutrition and over 45 toxin damage will no longer cause you to gag ad-infinitum and die. It now respects vomit time restraints."
+  - tweak: "Gagging now occurs only when the mob has no nutrition at all. It no longer causes three toxin damage, only weakens as before."
+  - tweak: "Vomiting and/or gagging from toxins now occurs regardless of nutrition, not only 20+."