diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 7494e5e6757..fac3cf573d5 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -236,4 +236,8 @@ /obj/item/trash/broken_electronics name = "broken electronics" - icon_state = "door_electronics_smoked" \ No newline at end of file + icon_state = "door_electronics_smoked" + +/obj/item/trash/phoroncandy + name = "\improper phoron rock candy stick" + icon_state = "rock_candy" \ No newline at end of file diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index d796b6dbfe3..e4c0cfe4224 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -61,6 +61,15 @@ ) result = /obj/item/reagent_containers/food/snacks/flatbread +/decl/recipe/moroz_flatbread + appliance = OVEN + fruit = list ("tomato" = 1) + reagents = list(/decl/reagent/sodiumchloride = 1) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough + ) + result = /obj/item/reagent_containers/food/snacks/moroz_flatbread + /decl/recipe/meatbread appliance = OVEN items = list( diff --git a/code/modules/cooking/recipes/recipes_soup.dm b/code/modules/cooking/recipes/recipes_soup.dm index 9e124eee415..1fa3c88789e 100644 --- a/code/modules/cooking/recipes/recipes_soup.dm +++ b/code/modules/cooking/recipes/recipes_soup.dm @@ -100,6 +100,13 @@ items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/soup/pozole +/decl/recipe/brudet + appliance = SAUCEPAN | POT + fruit = list ("tomato" = 1) + reagents = list(/decl/reagent/water = 10) + items = list(/obj/item/reagent_containers/food/snacks/fish) + result = /obj/item/reagent_containers/food/snacks/soup/brudet + // Stews /decl/recipe/stew appliance = POT 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 59b2982cddb..38af0fded7c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -4588,6 +4588,17 @@ metabolism = REM * 0.33 M.adjustToxLoss(1.5 * removed) +/decl/reagent/alcohol/butanol/pulque + name = "Xuizi pulque" + description = "A variation of Mictlanian pulque that is safe to consume for Unathi." + color = "#80f580" + strength = 5 + taste_description = "sweet yeast" + + glass_icon_state = "pulque_butanol" + glass_name = "cup of xuizi pulque" + glass_desc = "A variation of Mictlanian pulque that is safe to consume for Unathi." + //ZZZZOOOODDDDAAAAA /decl/reagent/drink/zorasoda @@ -4836,11 +4847,22 @@ description = "A Vaurcesian take on liqueur coffee, quickly becoming a favorite of the Zo'ra hive." color = "#C00000" taste_description = "minty coffee" + strength = 15 glass_icon_state = "caprician_coffee" glass_name = "glass of caprician coffee" glass_desc = "A Vaurcesian take on liqueur coffee, quickly becoming a favorite of the Zo'ra hive." +/decl/reagent/drink/toothpaste/ichor + name = "Xsain Ichor" + description = "A slushy beverage popular in Tret, often used as an example of K'laxan pride." + color = "#584721" + taste_description = "minty cactus water" + + glass_icon_state = "ichor" + glass_name = "glass of xsain ichor" + glass_desc = "A slushy beverage popular in Tret, often used as an example of K'laxan pride." + /decl/reagent/alcohol/mojito name = "Mojito" description = "Originated from Sol, now popular all around the Spur." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index d94c1bdab78..b24a7494f21 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3652,4 +3652,18 @@ id = "pulque_coffee" result = /decl/reagent/alcohol/pulque/coffee required_reagents = list(/decl/reagent/alcohol/pulque = 1, /decl/reagent/drink/coffee = 1) - result_amount = 2 \ No newline at end of file + result_amount = 2 + +/datum/chemical_reaction/drink/pulque_butanol + name = "xuizi pulque" + id = "pulque_butanol" + result = /decl/reagent/alcohol/butanol/pulque + required_reagents = list(/decl/reagent/alcohol/pulque = 1, /decl/reagent/alcohol/butanol/xuizijuice = 1) + result_amount = 2 + +/datum/chemical_reaction/drink/ichor + name = "xsain ichor" + id = "ichor" + result = /decl/reagent/drink/toothpaste/ichor + required_reagents = list(/decl/reagent/alcohol/butanol/xuizijuice = 1, /decl/reagent/kois/clean = 1, /decl/reagent/drink/toothpaste = 1) + result_amount = 3 \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 57fa3e331d2..0a12438b6f9 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -659,8 +659,10 @@ drink_flags = NO_EMPTY_ICON /obj/item/reagent_containers/food/drinks/bottle/pulque - name = "Pulque" - desc = "A glass bottle of Mictlanian pulque. The label states that it is a handmade recipe." + name = "Don Augusto's pulque" + desc = "A glass bottle of Mictlanian pulque. The label states that it is still produced by hand." + desc_fluff = "Don Augusto's pulqlueria is a famous saloon in Lago de Abundancia, known for its quality pulque. After Idris invested in the city, the family-owned business became part of the \ + megacorporation. Nowadays, it is bottled and sold all around the galaxy." icon_state = "pulquebottle" center_of_mass = list("x" = 16, "y" = 5) reagents_to_add = list(/decl/reagent/alcohol/pulque = 100) diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 15e93fb0ffa..3c80897c60c 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -88,7 +88,8 @@ var/list/lunchables_vaurca_snack_ = list( /obj/item/reagent_containers/food/snacks/donut/kois, /obj/item/reagent_containers/food/snacks/koiskebab3, /obj/item/reagent_containers/food/snacks/friedkois, - /obj/item/reagent_containers/food/snacks/koismuffin + /obj/item/reagent_containers/food/snacks/koismuffin, + /obj/item/reagent_containers/food/snacks/phoroncandy ) var/list/lunchables_utensil_ = list( diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index b20acd035bb..9146b3398c7 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1743,6 +1743,13 @@ reagent_data = list(/decl/reagent/nutriment = list("peppermint" = 2, "salad" = 4, "hot stew" = 2)) reagents_to_add = list(/decl/reagent/nutriment = 8, /decl/reagent/water = 5, /decl/reagent/drink/dynjuice =2) +/obj/item/reagent_containers/food/snacks/soup/brudet + name = "morozian brudet" + desc = "The most popular dish from the Dominian Empire, this stew is a staple of Imperial cuisine." + icon_state = "brudet" + reagent_data = list(/decl/reagent/nutriment = list("hot stew" = 3, "spices" = 1, "vegetables" = 1, "fish" = 2)) + reagents_to_add = list(/decl/reagent/nutriment = 8, /decl/reagent/water = 5) + /obj/item/reagent_containers/food/snacks/hotchili name = "hot chili" desc = "A five alarm Texan Chili!" @@ -3673,6 +3680,16 @@ reagent_data = list(/decl/reagent/nutriment = list("bread" = 3)) filling_color = "#B89F61" +/obj/item/reagent_containers/food/snacks/moroz_flatbread + name = "morozian flatbread" + desc = "One of the fundamental dishes of the Dominian Empire, also known as Imperial flatbread." + icon_state = "moroz_flatbread" + bitesize = 2 + center_of_mass = list("x"=16, "y"=16) + reagents_to_add = list(/decl/reagent/nutriment = 10) + reagent_data = list(/decl/reagent/nutriment = list("bread" = 3)) + filling_color = "#B89F61" + // potato + knife = raw sticks /obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/material/kitchen/utensil/knife)) @@ -5315,4 +5332,13 @@ icon_state = "sintapudding" reagents_to_add = list(/decl/reagent/nutriment = 1, /decl/reagent/nutriment/protein = 1, /decl/reagent/blood = 6, /decl/reagent/nutriment/coco = 3) reagent_data = list(/decl/reagent/nutriment = list("iron" = 3)) - bitesize = 6 \ No newline at end of file + bitesize = 6 + +/obj/item/reagent_containers/food/snacks/phoroncandy + name = "phoron rock candy" + desc = "Rock candy popular in Flagsdale. Actually contains phoron." + icon_state = "rock_candy" + filling_color = "#ff22d9" + reagents_to_add = list(/decl/reagent/toxin/phoron = 25) + bitesize = 5 + trash = /obj/item/trash/phoroncandy diff --git a/html/changelogs/desven-lore_foods.yml b/html/changelogs/desven-lore_foods.yml new file mode 100644 index 00000000000..617c18b19b9 --- /dev/null +++ b/html/changelogs/desven-lore_foods.yml @@ -0,0 +1,8 @@ +author: Desven & CoffeeToffee +delete-after: True +changes: + - rscadd: "Added two new dishes for Dominia: brudet and flatbread." + - rscadd: "Added a variant of pulque that is safe to consume for Unathi." + - rscadd: "Added a K'laxan toothpaste cocktail." + - rscadd: "Added phoron rock candy, it can be selected in the Vaurca lunchbox." + - rscadd: "Added a name to the pulque bottle, and a bit of lore fluff." \ No newline at end of file diff --git a/icons/mob/items/lefthand_food.dmi b/icons/mob/items/lefthand_food.dmi index 710ee3a5576..d67de4f6fb6 100644 Binary files a/icons/mob/items/lefthand_food.dmi and b/icons/mob/items/lefthand_food.dmi differ diff --git a/icons/mob/items/righthand_food.dmi b/icons/mob/items/righthand_food.dmi index 2b5d43c44f1..8879a1f7779 100644 Binary files a/icons/mob/items/righthand_food.dmi and b/icons/mob/items/righthand_food.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 343ed5fc5bf..a0b3216fe9b 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 fb465c4d1af..79234c89a5c 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index c60d2b055ec..d2caa23ca11 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ