cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Soup's On! (#7041)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
CHOMPStation2
2023-09-26 07:51:44 -07:00
committed by GitHub
parent 13274e1044
commit 0a7a411f88
4 changed files with 91 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
code/modules/food/food/snacks.dm
View File

@@ -2505,13 +2505,12 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#AFC4B5"
center_of_mass = list("x"=16, "y"=8)
nutriment_amt = 8
nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
reagents.add_reagent("vegetable_soup", 10)
/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
name = "Nettle soup"
@@ -2602,13 +2601,11 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#D92929"
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 5
nutriment_desc = list("soup" = 5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup/Initialize()
. = ..()
reagents.add_reagent("tomatojuice", 10)
reagents.add_reagent("tomato_soup", 10)
/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
@@ -2617,10 +2614,12 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#E386BF"
center_of_mass = list("x"=17, "y"=10)
nutriment_amt = 8
nutriment_desc = list("mushroom" = 8, "milk" = 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup/Initialize()
. = ..()
reagents.add_reagent("mushroom_soup", 10)
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
name = "beet soup"
desc = "Wait, how do you spell it again..?"
@@ -2628,13 +2627,12 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#FAC9FF"
center_of_mass = list("x"=15, "y"=8)
nutriment_amt = 8
nutriment_desc = list("tomato" = 4, "beet" = 4)
bitesize = 2
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/beetsoup/Initialize()
. = ..()
name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
reagents.add_reagent("beet_soup", 10)
/obj/item/weapon/reagent_containers/food/snacks/soup/onion
name = "onion soup"
@@ -2643,26 +2641,23 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#E0C367"
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 5
nutriment_desc = list("onion" = 2, "soup" = 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/soup/onion/Initialize()
. = ..()
reagents.add_reagent("onion_soup", 10)
/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_state = "chickennoodlesoup"
filling_color = "#ead90c"
nutriment_amt = 6
nutriment_desc = list("warm soup" = 6)
center_of_mass = list("x"=16, "y"=5)
bitesize = 6
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("water", 5)
reagents.add_reagent("chicken_noodle_soup", 10)
/obj/item/weapon/reagent_containers/food/snacks/stew
name = "Stew"
@@ -6989,7 +6984,7 @@
/obj/item/weapon/reagent_containers/food/snacks/canned/tomato/Initialize()
.=..()
reagents.add_reagent("tomatojuice", 12)
reagents.add_reagent("tomato_soup", 12)
/obj/item/weapon/reagent_containers/food/snacks/canned/spinach
name = "spinach"

7
code/modules/food/food/snacks_vr.dm
View File

@@ -132,7 +132,7 @@
/obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup/Initialize()
. = ..()
bitesize = 2
reagents.add_reagent("hot_n_sour_soup", 10)
/obj/item/weapon/reagent_containers/food/snacks/kitsuneudon
name = "kitsune udon"
@@ -595,12 +595,11 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#E0C367"
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 5
nutriment_desc = list("onion" = 2, "soup" = 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/onionsoup/Initialize()
. = ..()
bitesize = 3
reagents.add_reagent("onion_soup", 10)
//Fennec foods
/obj/item/weapon/storage/box/wings/bucket

7
code/modules/food/recipes_microwave.dm
View File

@@ -831,13 +831,6 @@ I said no!
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup
/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/chilicheesefries
items = list(
/obj/item/weapon/reagent_containers/food/snacks/fries,

73
code/modules/reagents/reagents/food_drinks_vr.dm
View File

@@ -624,3 +624,76 @@
description = "A mixture of water and protein commonly used as a meal supplement. This one has added strawberry flavoring."
taste_description = "strawberry"
color = "#e28585"
//SOUPS. Don't use the base soup reagent.
/datum/reagent/drink/soup
name = "Soup"
id = "generic_soup"
description = "An indistinct soupy mass of nominal goodness, but questionable flavour."
taste_description = "upsettingly bland soup"
color = "#9a9a9a"
nutrition = 30 //same as base nutriment
/datum/reagent/drink/soup/tomato
name = "Tomato Soup"
id = "tomato_soup"
description = "A thick and creamy tomato soup. Delicious! Definitely not ketchup."
taste_description = "rich, creamy tomato"
color = "#e4612d"
allergen_type = ALLERGEN_FRUIT //tomatoes are fruit, etc. etc.
/datum/reagent/drink/soup/mushroom
name = "Cream of Mushroom Soup"
id = "mushroom_soup"
description = "A rich, earthy mushroom soup."
taste_description = "earthy mushrooms"
color = "#a59a83"
allergen_type = ALLERGEN_FUNGI //shrooms!
/datum/reagent/drink/soup/chicken
name = "Cream of Chicken Soup"
id = "chicken_soup"
description = "A fairly thick, warming chicken-based soup."
taste_description = "savoury chicken goodness"
color = "#d4c574"
allergen_type = ALLERGEN_MEAT //plain ol' chimken
/datum/reagent/drink/soup/chicken_noodle
name = "Chicken Noodle Soup"
id = "chicken_noodle_soup"
description = "A thin chicken broth with added noodles. If you're lucky there might be some chunks of chicken and veggies in there! Maybe."
taste_description = "savoury chicken-noodle goodness"
color = "#a27a41"
allergen_type = ALLERGEN_MEAT|ALLERGEN_GRAINS|ALLERGEN_VEGETABLE //chicken + grain-based noodles + veggie chunks
/datum/reagent/drink/soup/onion
name = "Onion Soup"
id = "onion_soup"
description = "A humble staple of humanity throughout the centuries."
taste_description = "caramelized onions"
color = "#5d3918"
allergen_type = ALLERGEN_VEGETABLE //onions are veg, right?
/datum/reagent/drink/soup/vegetable
name = "Vegetable Soup"
id = "vegetable_soup"
description = "A mix of various kinds of tasty vegetables, in soup format!"
taste_description = "mixed vegetables"
color = "#824005"
allergen_type = ALLERGEN_VEGETABLE //mixed veg
/datum/reagent/drink/soup/beet
name = "Beet Soup"
id = "beet_soup"
description = "A hearty mix of tomatoes and beets, with a meat stock base."
taste_description = "sour tomatoes and some killer beets"
color = "#471b1c"
allergen_type = ALLERGEN_MEAT|ALLERGEN_FRUIT|ALLERGEN_VEGETABLE //meat stock, tomatoes, and beets
/datum/reagent/drink/soup/hot_and_sour
name = "Hot & Sour Soup"
id = "hot_n_sour_soup"
description = "A spicy tofu-based soup."
taste_description = "spicy, sour tofu"
color = "#5f1b06"
allergen_type = ALLERGEN_BEANS|ALLERGEN_VEGETABLE|ALLERGEN_FUNGI //tofu is soy-based, ergo, beans. base recipe also uses cabbage and mushroom.