cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 03:56:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Chemistry-Reagents-Food-Drinks.dm

Browse Source
This commit is contained in:
Novacat
2019-11-10 22:04:40 -05:00
committed by GitHub
parent c9abdaabe9
commit dcd5900f83
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
-4
View File
@@ -72,16 +72,12 @@
..(M, alien, removed*1.2) // Teshari get a bit more nutrition from meat.
if(IS_UNATHI)
..(M, alien, removed*2.25) //Unathi get most of their nutrition from meat.
<<<<<<< HEAD
//VOREStation Edit Start
if(IS_CHIMERA)
..(M, alien, removed*4) //Xenochimera are obligate carnivores.
//VOREStation Edit End
..()
=======
else
..()
>>>>>>> 2ff11b2... Merge pull request #6521 from Meghan-Rossi/foodfix
/datum/reagent/nutriment/protein/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien && alien == IS_SKRELL)