From 13593d757b872a4af521f557d255f57d6e78040f Mon Sep 17 00:00:00 2001 From: fludd12 Date: Mon, 26 Mar 2018 14:10:12 -0400 Subject: [PATCH 1/2] Nutriment can get you fat again. --- .../reagents/chemistry/reagents/food_reagents.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 47bbc899a9..8b035de0b5 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -616,6 +616,22 @@ M.blind_eyes(2) +<<<<<<< HEAD +======= +/datum/reagent/consumable/nutriment/stabilized + name = "Stabilized Nutriment" + id = "stabilizednutriment" + description = "A bioengineered protien-nutrient structure designed to decompose in high saturation. In layman's terms, it won't get you fat." + reagent_state = SOLID + nutriment_factor = 15 * REAGENTS_METABOLISM + color = "#664330" // rgb: 102, 67, 48 + +/datum/reagent/consumable/nutriment/stabilized/on_mob_life(mob/living/M) + if(M.nutrition > NUTRITION_LEVEL_FULL - 25) + M.nutrition -= 3*nutriment_factor + ..() + +>>>>>>> 8637339... Nutriment can get you fat again. ////Lavaland Flora Reagents//// From 88f328651f20f932bb90892e2fe552bcf54485e7 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 1 Apr 2018 04:39:21 -0500 Subject: [PATCH 2/2] Update food_reagents.dm --- code/modules/reagents/chemistry/reagents/food_reagents.dm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 8b035de0b5..45838de5e7 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -615,9 +615,6 @@ to_chat(M, "Your eyes sting!") M.blind_eyes(2) - -<<<<<<< HEAD -======= /datum/reagent/consumable/nutriment/stabilized name = "Stabilized Nutriment" id = "stabilizednutriment" @@ -630,8 +627,7 @@ if(M.nutrition > NUTRITION_LEVEL_FULL - 25) M.nutrition -= 3*nutriment_factor ..() - ->>>>>>> 8637339... Nutriment can get you fat again. + ////Lavaland Flora Reagents//// @@ -689,4 +685,4 @@ description = "The sorrow and melancholy of a thousand bereaved clowns, forever denied their Honkmechs." nutriment_factor = 5 * REAGENTS_METABOLISM color = "#eef442" // rgb: 238, 244, 66 - taste_description = "mournful honking" \ No newline at end of file + taste_description = "mournful honking"