Merge remote-tracking branch 'upstream/upstream-merge-7864' into kk-traits

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

@@ -52,6 +52,8 @@
 	var/active_regen_mult = 1								// Multiplier for 'Regenerate' power speed, in human_powers.dm
 
 	var/taste_sensitivity = TASTE_NORMAL					// How sensitive the species is to minute tastes.
+	var/allergens = null							// Things that will make this species very sick
+	var/allergen_severity = 0.5						// How bad are reactions to the allergen? This is raw toxin damage per metabolism tick, multiplied by the amount metabolized
 
 	var/min_age = 17
 	var/max_age = 70

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

@@ -225,6 +225,7 @@
 	base_color = "#333333"
 
 	reagent_tag = IS_TAJARA
+	allergens = COFFEE
 
 	move_trail = /obj/effect/decal/cleanable/blood/tracks/paw
 
@@ -312,6 +313,7 @@
 	breath_heat_level_3 = 1350	//Default 1250
 
 	reagent_tag = IS_SKRELL
+	allergens = MEAT|FISH|DAIRY
 
 	has_limbs = list(
 		BP_TORSO =  list("path" = /obj/item/organ/external/chest),

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm

@@ -82,6 +82,8 @@
 
 	var/nutriment_factor = 0
 	var/strength = 10 // This is, essentially, units between stages - the lower, the stronger. Less fine tuning, more clarity.
+	var/allergen_type = GENERIC	// What potential allergens does this contain?
+	var/allergen_factor = 0.5	// If the potential allergens are mixed and low-volume, they're a bit less dangerous. Needed for drinks because they're a single reagent compared to food which contains multiple seperate reagents.
 	var/toxicity = 1
 
 	var/druggy = 0
@@ -139,6 +141,9 @@
 
 	if(halluci)
 		M.hallucination = max(M.hallucination, halluci*3)
+	
+	if(M.species.allergens & allergen_type)
+		M.adjustToxLoss(((M.species.allergen_severity*allergen_factor)*4) * removed)
 
 /datum/reagent/ethanol/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	if(issmall(M)) removed *= 2
@@ -183,6 +188,9 @@
 
 	if(halluci)
 		M.hallucination = max(M.hallucination, halluci)
+	
+	if(M.species.allergens & allergen_type)
+		M.adjustToxLoss((M.species.allergen_severity*allergen_factor) * removed)
 
 /datum/reagent/ethanol/touch_obj(var/obj/O)
 	if(istype(O, /obj/item/weapon/paper))