diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index 536385d7614..627fbf3062c 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -37,7 +37,7 @@ name = "Beer" id = "beer" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." - nutriment_factor = 2 * REAGENTS_METABOLISM + nutriment_factor = 1 * REAGENTS_METABOLISM color = "#664300" // rgb: 102, 67, 0 alcohol_perc = 0.2 drink_icon ="beerglass" @@ -49,6 +49,7 @@ id = "cider" description = "An alcoholic beverage derived from apples." color = "#174116" + nutriment_factor = 1 * REAGENTS_METABOLISM alcohol_perc = 0.2 drink_icon = "rewriter" drink_name = "Cider" @@ -217,6 +218,7 @@ description = "A potent mixture of caffeine and alcohol." reagent_state = LIQUID color = "#102000" // rgb: 16, 32, 0 + nutriment_factor = 1 * REAGENTS_METABOLISM alcohol_perc = 0.3 heart_rate_increase = 1 drink_icon = "thirteen_loko_glass" @@ -240,6 +242,7 @@ description = "This appears to be beer mixed with milk. Disgusting." reagent_state = LIQUID color = "#895C4C" // rgb: 137, 92, 76 + nutriment_factor = 2 * REAGENTS_METABOLISM alcohol_perc = 0.2 drink_icon = "glass_brown" drink_name = "Glass of bilk" @@ -714,6 +717,7 @@ description = "A Vikings drink, though a cheap one." reagent_state = LIQUID color = "#664300" // rgb: 102, 67, 0 + nutriment_factor = 1 * REAGENTS_METABOLISM alcohol_perc = 0.2 drink_icon = "meadglass" drink_name = "Mead" diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm index 489eac3eb81..cf60d77c2c1 100644 --- a/code/modules/reagents/chemistry/reagents/drinks.dm +++ b/code/modules/reagents/chemistry/reagents/drinks.dm @@ -213,7 +213,7 @@ name = "Hot Chocolate" id = "hot_coco" description = "Made with love! And coco beans." - nutriment_factor = 2 * REAGENTS_METABOLISM + nutriment_factor = 3 * REAGENTS_METABOLISM color = "#403010" // rgb: 64, 48, 16 adj_temp_hot = 5 drink_icon = "hot_coco" @@ -225,6 +225,7 @@ id = "coffee" description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant." color = "#482000" // rgb: 72, 32, 0 + nutriment_factor = 0 adj_dizzy = -5 adj_drowsy = -3 adj_sleepy = -2 @@ -307,6 +308,7 @@ id = "tea" description = "Tasty black tea: It has antioxidants. It's good for you!" color = "#101000" // rgb: 16, 16, 0 + nutriment_factor = 0 adj_dizzy = -2 adj_drowsy = -1 adj_sleepy = -3 diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index ffac4411fbc..52a0f2e8a24 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -383,6 +383,7 @@ id = "rice" description = "Enjoy the great taste of nothing." reagent_state = SOLID + nutriment_factor = 3 * REAGENTS_METABOLISM color = "#FFFFFF" // rgb: 0, 0, 0 /datum/reagent/consumable/cherryjelly @@ -441,9 +442,10 @@ description = "A sweet substance produced by bees through partial digestion. Bee barf." reagent_state = LIQUID color = "#d3a308" + nutriment_factor = 15 * REAGENTS_METABOLISM /datum/reagent/consumable/honey/on_mob_life(mob/living/M) - M.reagents.add_reagent("sugar", 0.4) + M.reagents.add_reagent("sugar", 3) if(prob(20)) M.adjustBruteLoss(-3) M.adjustFireLoss(-1)