Skip to content

Commit 2fdd171

Browse files
committed
534
1 parent 6d9681b commit 2fdd171

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

code/modules/mob/living/carbon/carbon.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,4 +553,4 @@
553553

554554
if(allergen_type in species.food_preference)
555555
return species.food_preference_bonus
556-
return 1
556+
return 0

code/modules/reagents/reagents/food_drinks.dm

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,13 @@
5555
if(IS_CHIMERA) removed *= 0.25 //VOREStation Edit
5656
if(issmall(M)) removed *= 2 // Small bodymass, more effect from lower volume.
5757
//VOREStation Edits Start
58-
var/bonus = M.food_preference(allergen_type)
5958
if(!M.isSynthetic())
6059
if(!(M.species.allergens & allergen_type)) //assuming it doesn't cause a horrible reaction, we'll be ok!
6160
M.heal_organ_damage(0.5 * removed, 0)
62-
M.adjust_nutrition(((nutriment_factor + bonus) * removed) * M.species.organic_food_coeff)
61+
M.adjust_nutrition(((nutriment_factor + M.food_preference(allergen_type)) * removed) * M.species.organic_food_coeff)
6362
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
6463
else
65-
M.adjust_nutrition(((nutriment_factor * bonus) * removed) * M.species.synthetic_food_coeff)
64+
M.adjust_nutrition(((nutriment_factor + M.food_preference(allergen_type)) * removed) * M.species.synthetic_food_coeff)
6665

6766
//VOREStation Edits Stop
6867

@@ -958,7 +957,8 @@
958957

959958
/datum/reagent/drink/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
960959
if(!(M.species.allergens & allergen_type))
961-
M.adjust_nutrition((nutrition + M.food_preference(allergen_type)) * removed)
960+
var/bonus = M.food_preference(allergen_type)
961+
M.adjust_nutrition((nutrition + bonus) * removed)
962962
M.dizziness = max(0, M.dizziness + adj_dizzy)
963963
M.drowsyness = max(0, M.drowsyness + adj_drowsy)
964964
M.AdjustSleeping(adj_sleepy)
@@ -2586,6 +2586,9 @@
25862586
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
25872587
if(alien == IS_DIONA)
25882588
return
2589+
2590+
M.adjust_nutrition((M.food_preference(allergen_type) / 2) * removed)
2591+
25892592
M.jitteriness = max(M.jitteriness - 3, 0)
25902593

25912594
/datum/reagent/ethanol/beer/lite

0 commit comments

Comments
 (0)