diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 04c7ee6cf9..6726c9051e 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -89,23 +89,19 @@ /obj/item/weapon/reagent_containers/food/drinks/h_chocolate price_tag = 3 -/datum/reagent/bubbletea/watermelon +/datum/reagent/drink/bubbletea/watermelon price_tag = 5 -price_list.dm -/datum/reagent/bubbletea/strawberry +/datum/reagent/drink/bubbletea/strawberry price_tag = 5 -price_list.dm -/datum/reagent/bubbletea/cherry +/datum/reagent/drink/bubbletea/cherry price_tag = 5 -price_list.dm -/datum/reagent/bubbletea/coffee +/datum/reagent/drink/bubbletea/coffee price_tag = 5 -price_list.dm -/datum/reagent/bubbletea/banana +/datum/reagent/drink/bubbletea/banana price_tag = 5 // Spirituous liquors // diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index 5a1e936225..c4c923178d 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -155,4 +155,18 @@ /datum/recipe/gelbowl reagents = list("potatojuice" = 5, "sugar" = 5, "water" = 5, "flour" = 5) - result = /obj/item/weapon/reagent_containers/food/snacks/gelbowl \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/gelbowl + +/datum/recipe/sauerkraut + reagents = list("sodiumchloride" = 3) + fruit = list("cabbage" = 1) + result = /obj/item/weapon/reagent_containers/food/snacks/sauerkraut + +/datum/recipe/bigos + reagents = list("flour" = 5, "water" = 5) + fruit = list("onion" = 1, "carrot" = 1, "mushroom" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/sauerkraut, + /obj/item/weapon/reagent_containers/food/snacks/sausage + ) + result = /obj/item/weapon/reagent_containers/food/snacks/bigos \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm index fa52c72f19..460aa19b68 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm @@ -515,23 +515,23 @@ Drinks Data /datum/reagent/ethanol/spiderdrink glass_icon_state = "glassofspiders" -/datum/reagent/bubbletea/watermelon +/datum/reagent/drink/bubbletea/watermelon glass_icon_state = "bubbleteawatermelonglass" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/bubbletea/watermelon +/datum/reagent/drink/bubbletea/watermelon glass_icon_state = "bubbleteastrawberryglass" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/bubbletea/watermelon +/datum/reagent/drink/bubbletea/watermelon glass_icon_state = "bubbleteacherryglass" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/bubbletea/watermelon +/datum/reagent/drink/bubbletea/watermelon glass_icon_state = "bubbleteacoffeeglass" glass_center_of_mass = list("x"=16, "y"=9) -/datum/reagent/bubbletea/watermelon +/datum/reagent/drink/bubbletea/watermelon glass_icon_state = "bubbleteabananaglass" glass_center_of_mass = list("x"=16, "y"=9) diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index 8be64873d6..8347a94c20 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -280,7 +280,7 @@ /obj/item/weapon/reagent_containers/food/snacks/gelbowl name = "bowl of gelatin" desc = "This bowl contains boring and flavourless gelatin, its probably better to make something tasty with it rather than eat it like this." - icon = 'icons/obj/food_vr.dmi' + icon = 'icons/obj/food.dmi' icon_state = "gelbowl" trash = /obj/item/trash/snack_bowl nutriment_amt = 0 @@ -290,6 +290,34 @@ ..() reagents.add_reagent("gelatin", 15) bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/sauerkraut + name = "Sauerkraut" + desc = "What happens when you mix salt and minced cabbage and forget it on a shelf." + icon = 'icons/obj/food.dmi' + icon_state = "sauerkraut" + trash = /obj/item/trash/snack_bowl + nutriment_amt = 3 + nutriment_desc = list("sour cabbage" = 3) + +/obj/item/weapon/reagent_containers/food/snacks/sauerkraut/New() + ..() + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/bigos + name = "Bigos" + desc = "What happens when you put minced sour cabbage and whats left in the fridge in a pot, start slowcooking it and then forget it for three hours." + icon = 'icons/obj/food.dmi' + icon_state = "bigos" + trash = /obj/item/trash/snack_bowl + nutriment_amt = 6 + nutriment_desc = list("sour cabbage" = 4, "sausage" = 3, "mildly sweet vegetables" = 3) + +/obj/item/weapon/reagent_containers/food/snacks/stew/New() + ..() + reagents.add_reagent("protein", 4) + reagents.add_reagent("water", 3) + bitesize = 7 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 8ab0af2bdb..fe9b372f8f 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ