From dcd5900f837aba4d7ab9c62b7dc226c0df00ad84 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 10 Nov 2019 22:04:40 -0500 Subject: [PATCH] Update Chemistry-Reagents-Food-Drinks.dm --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index ed31aece96e..b077dd52c16 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -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)