diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index 064d649254a..51ece9f90d7 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -33,10 +33,6 @@ return 0 if(M == user) - if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 ) - M << "You don't feel like drinking any more sugary drink at the moment." - return 0 - M << "You swallow a gulp of [src]." if(reagents.total_volume) reagents.reaction(M, INGEST) diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm index 774ab4fa801..02419159876 100644 --- a/code/modules/food&drinks/food/condiment.dm +++ b/code/modules/food&drinks/food/condiment.dm @@ -40,9 +40,6 @@ return 0 if(M == user) - if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 ) - M << "You don't feel like drinking any more sugary food at the moment." - return 0 M << "You swallow some of contents of \the [src]." if(reagents.total_volume) reagents.reaction(M, INGEST) diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm index bc39bb04a71..1550da227c1 100644 --- a/code/modules/food&drinks/food/snacks.dm +++ b/code/modules/food&drinks/food/snacks.dm @@ -59,8 +59,8 @@ fullness += C.nutriment_factor * C.volume / C.metabolization_rate if(M == user) //If you're eating it yourself. - if(src.reagents.has_reagent("sugar") && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 ) - M << "You don't feel like eating any more sugary food at the moment." + if(junkiness && M.satiety < -150 && M.nutrition > NUTRITION_LEVEL_STARVING + 50 ) + M << "You don't feel like eating any more junk food at the moment." return 0 if(wrapped) diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm index 966bcd00c57..d008c2e5352 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm @@ -55,12 +55,6 @@ datum/reagent/consumable/sugar metabolization_rate = 2 * REAGENTS_METABOLISM overdose_threshold = 200 // Hyperglycaemic shock -datum/reagent/consumable/sugar/on_mob_life(var/mob/living/M as mob) - if(M.satiety > -200) - M.satiety -= 20 //eating sugar makes you more hungry over time by making your hunger drop faster. - M.nutrition += max(((NUTRITION_LEVEL_FED + 50) - M.nutrition )/100, 0) * nutriment_factor // sugar doesn't help your hunger if your stomach is nearly full - holder.remove_reagent(src.id, metabolization_rate) - datum/reagent/consumable/sugar/overdose_start(var/mob/living/M as mob) M << "You go into hyperglycaemic shock! Lay off the twinkies!" M.sleeping += 30