cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 13:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6521 from Meghan-Rossi/foodfix

Browse Source 
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
parent 0b4d9f7194 673fdb25aa
commit 2ff11b2bad
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

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