Merge pull request #6521 from Meghan-Rossi/foodfix

Stop protein's affect_ingest calling nutriment's affect_ingest twice
This commit is contained in:
Anewbe
2019-11-10 21:49:08 -05:00
committed by GitHub

View File

@@ -66,13 +66,12 @@
switch(alien)
if(IS_SKRELL)
M.adjustToxLoss(0.5 * removed)
return
if(IS_TESHARI)
..(M, alien, removed*1.2) // Teshari get a bit more nutrition from meat.
return
if(IS_UNATHI)
..(M, alien, removed*2.25) //Unathi get most of their nutrition from meat.
..()
else
..()
/datum/reagent/nutriment/protein/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien && alien == IS_SKRELL)