Merge remote-tracking branch 'citadel/master' into combat_v7

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

@@ -840,7 +840,7 @@
 		override = dna.species.override_float
 	..()
 
-/mob/living/carbon/human/vomit(lost_nutrition = 10, blood = 0, stun = 1, distance = 0, message = 1, toxic = 0)
+/mob/living/carbon/human/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, vomit_type = VOMIT_TOXIC, harm = TRUE, force = FALSE, purge_ratio = 0.1)
 	if(blood && dna?.species && (NOBLOOD in dna.species.species_traits))
 		if(message)
 			visible_message("<span class='warning'>[src] dry heaves!</span>", \
@@ -1095,7 +1095,7 @@
  * * Rock / Brownish if a golem
  * * Green if none of the others apply (aka, generic organic)
 */
-/mob/living/carbon/human/proc/spec_trait_examine_font() 
+/mob/living/carbon/human/proc/spec_trait_examine_font()
 	if(HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM))
 		return "<font color='#aaa9ad'>"
 	if(HAS_TRAIT(src, TRAIT_TOXINLOVER))

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

@@ -273,7 +273,7 @@
 		if(getToxLoss() >= 45 && nutrition > 20 && !HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM))
 			lastpuke += prob(50)
 			if(lastpuke >= 50) // about 25 second delay I guess
-				vomit(20, toxic = TRUE)
+				vomit(20)
 				lastpuke = 0