From 14a1f7aef26d5df90d1a93adecdf378f6eab52bf Mon Sep 17 00:00:00 2001 From: TechnoAlchemist Date: Tue, 18 Oct 2016 15:47:48 -0700 Subject: [PATCH] Fixes Vitrium Frothe metabolization issues. (#21035) * Fixes vitfro healing not stopping after metabolized. * . = 1 * CR's Fixes * = TRUE and bowl pathing fix. * fixes my stupid fucking mistake you animal you beast!! --- code/modules/food_and_drinks/drinks/drinks.dm | 2 +- code/modules/mining/lavaland/ash_flora.dm | 2 +- .../reagents/chemistry/reagents/food_reagents.dm | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 41077807377..7d209adf80b 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -259,7 +259,7 @@ ///Lavaland bowls and bottles/// -/obj/item/reagent_containers/food/drinks/mushroom_bowl +/obj/item/weapon/reagent_containers/food/drinks/mushroom_bowl name = "mushroom bowl" desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point." icon = 'icons/obj/lavaland/ash_flora.dmi' diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index dc6d616d366..f1d0192c094 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -212,7 +212,7 @@ //what you can craft with these things /datum/crafting_recipe/mushroom_bowl name = "Mushroom Bowl" - result = /obj/item/reagent_containers/food/drinks/mushroom_bowl + result = /obj/item/weapon/reagent_containers/food/drinks/mushroom_bowl reqs = list(/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings = 5) time = 30 category = CAT_PRIMAL diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index b70598692e5..2021ac98033 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -475,10 +475,11 @@ . = 1 if(prob(20)) M.losebreath += 4 - M.adjustBrainLoss(2*REM) - M.adjustToxLoss(3*REM,0) - M.adjustStaminaLoss(10*REM,0) - M.blur_eyes(5) + M.adjustBrainLoss(2*REM) + M.adjustToxLoss(3*REM,0) + M.adjustStaminaLoss(10*REM,0) + M.blur_eyes(5) + . = TRUE ..() /datum/reagent/consumable/tinlux @@ -500,7 +501,9 @@ color = "#d3a308" nutriment_factor = 3 * REAGENTS_METABOLISM -datum/reagent/consumable/vitfro/on_mob_life(mob/living/M) +/datum/reagent/consumable/vitfro/on_mob_life(mob/living/M) if(prob(80)) M.adjustBruteLoss(-1*REM, 0) M.adjustFireLoss(-1*REM, 0) + . = TRUE + ..() \ No newline at end of file