Skip to content

Commit

Permalink
534
Browse files Browse the repository at this point in the history
  • Loading branch information
Very-Soft committed Sep 24, 2023
1 parent 6d9681b commit 2fdd171
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/carbon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -553,4 +553,4 @@

if(allergen_type in species.food_preference)
return species.food_preference_bonus
return 1
return 0
11 changes: 7 additions & 4 deletions code/modules/reagents/reagents/food_drinks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,13 @@
if(IS_CHIMERA) removed *= 0.25 //VOREStation Edit
if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume.
//VOREStation Edits Start
var/bonus = M.food_preference(allergen_type)
if(!M.isSynthetic())
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 + bonus) * removed) * M.species.organic_food_coeff)
M.adjust_nutrition(((nutriment_factor + M.food_preference(allergen_type)) * removed) * M.species.organic_food_coeff)
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
else
M.adjust_nutrition(((nutriment_factor * bonus) * removed) * M.species.synthetic_food_coeff)
M.adjust_nutrition(((nutriment_factor + M.food_preference(allergen_type)) * removed) * M.species.synthetic_food_coeff)

//VOREStation Edits Stop

Expand Down Expand Up @@ -958,7 +957,8 @@

/datum/reagent/drink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(!(M.species.allergens & allergen_type))
M.adjust_nutrition((nutrition + M.food_preference(allergen_type)) * removed)
var/bonus = M.food_preference(allergen_type)
M.adjust_nutrition((nutrition + bonus) * removed)
M.dizziness = max(0, M.dizziness + adj_dizzy)
M.drowsyness = max(0, M.drowsyness + adj_drowsy)
M.AdjustSleeping(adj_sleepy)
Expand Down Expand Up @@ -2586,6 +2586,9 @@
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
if(alien == IS_DIONA)
return

M.adjust_nutrition((M.food_preference(allergen_type) / 2) * removed)

M.jitteriness = max(M.jitteriness - 3, 0)

/datum/reagent/ethanol/beer/lite
Expand Down

0 comments on commit 2fdd171

Please sign in to comment.