From d993f2466177dd5f6099b485b581c8f45bc3c492 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 24 Jan 2021 19:49:59 -0500 Subject: [PATCH 1/2] Merge pull request #9607 from VOREStation/upstream-merge-7822 [MIRROR] Adds Chicken noodle soup --- code/modules/food/food/snacks.dm | 17 +++++++++++++++++ code/modules/food/recipes_microwave.dm | 7 +++++++ 2 files changed, 24 insertions(+) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 9ad92265a9..88764af536 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -6054,6 +6054,23 @@ . = ..() reagents.add_reagent("protein", 8) bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup + name = "chicken noodle soup" + gender = PLURAL + desc = "A bright bowl of yellow broth with cuts of meat, noodles and carrots." + icon = 'icons/obj/food_custom.dmi' + icon_state = "chickennoodlesoup" + filling_color = "#ead90c" + nutriment_amt = 6 + nutriment_desc = list("warm soup" = 6) + center_of_mass = list("x"=16, "y"=5) + +/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup/Initialize() + . = ..() + reagents.add_reagent("protein", 4) + reagents.add_reagent("water", 5) + bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup name = "chicken noodle soup" diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index b615932f43..216eb0303c 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -940,6 +940,13 @@ I said no! /obj/item/weapon/reagent_containers/food/snacks/bun ) result = /obj/item/weapon/reagent_containers/food/snacks/chickenfillet + +/datum/recipe/chickennoodlesoup + fruit = list("carrot" = 1) + reagents = list("water" = 10) + items = list( /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/rawcutlet) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup /datum/recipe/chickennoodlesoup fruit = list("carrot" = 1)