cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9875 from KillianKirilenko/7940fix

Browse Source 
Update Chemistry-Reagents-Food-Drinks.dm
This commit is contained in:
Novacat
2021-03-07 16:47:42 -05:00
committed by GitHub
parent 56aceb9f28 b14f711aae
commit d9c3e74dbd
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+1 -11
View File
@@ -54,23 +54,13 @@
if(IS_UNATHI) removed *= 0.5
if(IS_CHIMERA) removed *= 0.25 //VOREStation Edit
if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume.
<<<<<<< HEAD
//VOREStation Edits Start
if(!M.isSynthetic())
if(M.species.allergens & allergen_type)
M.adjustToxLoss(M.species.allergen_severity * removed)
else
if(!(M.species.allergens & allergen_type)) //assuming it doesn't cause a horrible reaction, we'll be ok!
M.heal_organ_damage(0.5 * removed, 0)
M.adjust_nutrition((nutriment_factor * removed) * M.species.organic_food_coeff)
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
//VOREStation Edits Stop
=======
if(!(M.species.allergens & allergen_type)) //assuming it doesn't cause a horrible reaction, we'll be ok!
M.heal_organ_damage(0.5 * removed, 0)
M.adjust_nutrition(nutriment_factor * removed)
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
>>>>>>> 948d43a... Diet/Allergy Rework & Refactor Pt2 (#7940)
// Aurora Cooking Port Insertion Begin