diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index cc359cfc0e..457962aa6d 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -87,6 +87,24 @@ /obj/item/weapon/reagent_containers/food/drinks/h_chocolate price_tag = 3 +/datum/reagent/bubbletea/watermelon + price_tag = 5 + +price_list.dm +/datum/reagent/bubbletea/strawberry + price_tag = 5 + +price_list.dm +/datum/reagent/bubbletea/cherry + price_tag = 5 + +price_list.dm +/datum/reagent/bubbletea/coffee + price_tag = 5 + +price_list.dm +/datum/reagent/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 ddf3a70de1..5a1e936225 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -152,3 +152,7 @@ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge ) result = /obj/item/weapon/reagent_containers/food/snacks/makaroni + +/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 diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 878b3fd0c0..4b5e7d27b8 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1495,6 +1495,66 @@ glass_name = "Love Potion" glass_desc = "Love me tender, love me sweet." +/datum/reagent/drink/juice/gelatin + name = "Gelatin" + id = "gelatin" + description = "It doesnt taste like anything." + taste_description = "nothing" + nutrition = 0 + color = "#aaabcf" + + glass_name = "Gelatin" + glass_desc = "It's like flavourless slime." + +/datum/reagent/bubbletea/watermelon + name = "Watermelon bubble tea" + id = "bubbleteawatermelon" + description = "A tea with milk and watermelon in it and gelatin balls as well." + taste_description = "creamy tea and watermelon" + color = "#b83333" + + glass_name = "watermelon bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with watermelon." + +/datum/reagent/bubbletea/strawberry + name = "Strawberry bubble tea" + id = "bubbleteastrawberry" + description = "A tea with milk and strawberry in it and gelatin balls as well." + taste_description = "creamy tea and strawberry" + color = "#eb6c77" + + glass_name = "strawberry bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with strawberry." + +/datum/reagent/bubbletea/cherry + name = "Cherry bubble tea" + id = "bubbleteacherry" + description = "A tea with milk and cherry in it and gelatin balls as well." + taste_description = "creamy tea and cherry" + color = "#801e28" + + glass_name = "cherry bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with cherry." + +/datum/reagent/bubbletea/coffee + name = "Coffee bubble tea" + id = "bubbleteacoffee" + description = "A tea with milk and coffee in it and gelatin balls as well." + taste_description = "creamy tea and coffee" + color = "#482910" + + glass_name = "coffee bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with coffee." + +/datum/reagent/bubbletea/banana + name = "Banana bubble tea" + id = "bubbleteabanana" + description = "A tea with milk and banana in it and gelatin balls as well." + taste_description = "creamy tea and banana" + color = "#c3af00" + + glass_name = "banana bubble tea" + glass_desc = "A sweet tea with tasty little flavoured gelatin balls in it, this one is with banana." /* Alcohol */ diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 47eac480f0..92627a4ef6 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2223,6 +2223,41 @@ required_reagents = list("spidertoxin" = 1, "clonexadone" = 5, "absinthe" = 4) result_amount = 10 +/datum/chemical_reaction/drinks/bubbletea/watermelon + name = "Watermelon bubble tea" + id = "bubbleteawatermelon" + result = "watermelon bubble tea" + required_reagents = list("gelatin" = 2, "tea" = 5, "watermelonjuice" = 1, "milk" = 2) + result_amount = 10 + +/datum/chemical_reaction/drinks/bubbletea/strawberry + name = "Strawberry bubble tea" + id = "bubbleteastrawberry" + result = "strawberry bubble tea" + required_reagents = list("gelatin" = 2, "berrytea" = 6, "milk" = 2) + result_amount = 10 + +/datum/chemical_reaction/drinks/bubbletea/cherry + name = "Cherry bubble tea" + id = "bubbleteacherry" + result = "cherry bubble tea" + required_reagents = list("gelatin" = 2, "tea" = 5, "cherryjelly" = 1, "milk" = 2) + result_amount = 10 + +/datum/chemical_reaction/drinks/bubbletea/coffee + name = "Coffee bubble tea" + id = "bubbleteacoffee" + result = "coffee bubble tea" + required_reagents = list("gelatin" = 2, "tea" = 5, "cafe_latte" = 3) + result_amount = 10 + +/datum/chemical_reaction/drinks/bubbletea/banana + name = "Banana bubble tea" + id = "bubbleteabanana" + result = "banana bubble tea" + required_reagents = list("gelatin" = 2, "tea" = 5, "banana" = 1, "milk" = 2) + result_amount = 10 + //R-UST Port /datum/chemical_reaction/hyrdophoron name = "Hydrophoron" diff --git a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm index 543d5dbd90..d334ff5b89 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm +++ b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm @@ -513,4 +513,24 @@ Drinks Data glass_center_of_mass = list("x"=16, "y"=6) /datum/reagent/ethanol/spiderdrink - glass_icon_state = "glassofspiders" \ No newline at end of file + glass_icon_state = "glassofspiders" + +/datum/reagent/bubbletea/watermelon + glass_icon_state = "bubbleteawatermelonglass" + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/bubbletea/watermelon + glass_icon_state = "bubbleteastrawberryglass" + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/bubbletea/watermelon + glass_icon_state = "bubbleteacherryglass" + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/bubbletea/watermelon + glass_icon_state = "bubbleteacoffeeglass" + glass_center_of_mass = list("x"=16, "y"=9) + +/datum/reagent/bubbletea/watermelon + glass_icon_state = "bubbleteabananaglass" + glass_center_of_mass = list("x"=16, "y"=9) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index 0b3db9b065..8be64873d6 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -277,6 +277,20 @@ reagents.add_reagent("shockchem", 6) bitesize = 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_state = "gelbowl" + trash = /obj/item/trash/snack_bowl + nutriment_amt = 0 + nutriment_desc = list("something?" = 1, "nothing" = 4) + +/obj/item/weapon/reagent_containers/food/snacks/gelbowl/New() + ..() + reagents.add_reagent("gelatin", 15) + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" monkey_type = "Sobaka" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 6b88bde9e9..e622b44620 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index d282fb3e6a..8ab0af2bdb 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ