From 6192180e4f725420bbac97f53f8909088c2ba600 Mon Sep 17 00:00:00 2001 From: Alan Date: Sat, 22 Nov 2025 22:06:59 -0500 Subject: [PATCH] Tweak new soft drink effects. (#30979) * Tweak new soft drink effects. * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Alan --------- Signed-off-by: Alan Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- .../chemistry/reagents/drinks_reagents.dm | 44 +++++++++++++------ 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index b644ccab414..c15e73eea7d 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -23,6 +23,12 @@ drink_desc = "Are you sure this is tomato juice?" taste_description = "tomato juice" +/datum/reagent/consumable/drink/tomatojuice/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + if(prob(20)) + update_flags |= M.adjustFireLoss(-1, FALSE) + return ..() | update_flags + /datum/reagent/consumable/drink/pineapplejuice name = "Pineapple Juice" id = "pineapplejuice" @@ -33,12 +39,6 @@ drink_desc = "A bright drink, sweet and sugary." taste_description = "pineapple juice" -/datum/reagent/consumable/drink/tomatojuice/on_mob_life(mob/living/M) - var/update_flags = STATUS_UPDATE_NONE - if(prob(20)) - update_flags |= M.adjustFireLoss(-1, FALSE) - return ..() | update_flags - /datum/reagent/consumable/drink/limejuice name = "Lime Juice" id = "limejuice" @@ -65,6 +65,14 @@ drink_desc = "Just like a carrot, but without the crunching." taste_description = "carrot juice" +/datum/reagent/consumable/drink/carrotjuice/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + M.AdjustEyeBlurry(-2 SECONDS) + M.AdjustEyeBlind(-2 SECONDS) + if(current_cycle > 20 && prob(current_cycle - 10)) + update_flags |= M.cure_nearsighted(EYE_DAMAGE, FALSE) + return ..() | update_flags + /datum/reagent/consumable/drink/beetjuice name = "Beet juice" id = "beetjuice" @@ -95,14 +103,6 @@ drink_desc = "They say you should eat your greens, but drinking them is just as good." taste_description = "lettuce juice" -/datum/reagent/consumable/drink/carrotjuice/on_mob_life(mob/living/M) - var/update_flags = STATUS_UPDATE_NONE - M.AdjustEyeBlurry(-2 SECONDS) - M.AdjustEyeBlind(-2 SECONDS) - if(current_cycle > 20 && prob(current_cycle - 10)) - update_flags |= M.cure_nearsighted(EYE_DAMAGE, FALSE) - return ..() | update_flags - /datum/reagent/consumable/drink/doctor_delight name = "The Doctor's Delight" id = "doctorsdelight" @@ -862,6 +862,11 @@ drink_desc = "Rich coffee with custard foam." taste_description = "rich foam" +/datum/reagent/consumable/drink/coffee/eggcoffee/on_mob_life(mob/living/M) + if(prob(3)) + M.reagents.add_reagent("cholesterol", rand(1, 2)) + return ..() + /datum/reagent/consumable/drink/horchata name = "Horchata" description = "Sweetened rice milk topped with cinnamon." @@ -902,6 +907,11 @@ drink_desc = "You now have a glass of custard." taste_description = "sweet egg" +/datum/reagent/consumable/drink/eggcream/on_mob_life(mob/living/M) + if(prob(2)) + M.reagents.add_reagent("cholesterol", rand(1, 2)) + return ..() + /datum/reagent/consumable/drink/beetshrub name = "Beet Shrub" description = "So, so sour." @@ -969,10 +979,16 @@ /datum/reagent/consumable/drink/vegetablemix/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE + M.AdjustEyeBlurry(-0.5 SECONDS) + M.AdjustEyeBlind(-0.5 SECONDS) if(M.satiety < 600) M.satiety += 5 if(prob(10)) update_flags |= M.adjustToxLoss(-1, FALSE) + if(current_cycle > 20 && prob(2)) + update_flags |= M.cure_nearsighted(EYE_DAMAGE, FALSE) + if(prob(5)) + update_flags |= M.adjustFireLoss(-1, FALSE) return ..() | update_flags /datum/reagent/consumable/drink/electrolytes