diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index bfe31c71af3..3291c6ace34 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -107,6 +107,7 @@ coffeecups["NKA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nka coffeecups["PRA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra coffeecups["DPRA coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/dpra + coffeecups["sedantis coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/sedantis coffeecups["NT coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt coffeecups["TCFL coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl coffeecups["#1 coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one @@ -126,7 +127,7 @@ coffeecups["tall metal coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall/metal coffeecups["tall rainbow coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tall/rainbow gear_tweaks += new /datum/gear_tweak/path(coffeecups) - gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) + gear_tweaks += new /datum/gear_tweak/reagents(lunchables_drink_reagents()) /datum/gear/coffeecup/spawn_item(var/location, var/metadata) . = ..() diff --git a/code/modules/cooking/recipes/cultural/recipes_vaurca.dm b/code/modules/cooking/recipes/cultural/recipes_vaurca.dm index 10681a658aa..c2ed94cf3d6 100644 --- a/code/modules/cooking/recipes/cultural/recipes_vaurca.dm +++ b/code/modules/cooking/recipes/cultural/recipes_vaurca.dm @@ -4,7 +4,7 @@ result = /obj/item/reagent_containers/food/snacks/friedkois /decl/recipe/koiswaffles - appliance = SKILLET | OVEN + appliance = SKILLET items = list(/obj/item/reagent_containers/food/snacks/soup/kois) result = /obj/item/reagent_containers/food/snacks/koiswaffles @@ -13,3 +13,26 @@ fruit = list("koisspore" = 2) items = list(/obj/item/reagent_containers/food/snacks/soup/kois) result = /obj/item/reagent_containers/food/snacks/koisjelly + +/decl/recipe/koissteak + appliance = SKILLET + items = list(/obj/item/reagent_containers/food/snacks/friedkois) + result = /obj/item/reagent_containers/food/snacks/koissteak + +/decl/recipe/koismuffin + appliance = OVEN + items = list(/obj/item/reagent_containers/food/snacks/soup/kois) + result = /obj/item/reagent_containers/food/snacks/koismuffin + +/decl/recipe/koisburger + items = list( + /obj/item/reagent_containers/food/snacks/friedkois, + /obj/item/reagent_containers/food/snacks/friedkois + ) + result = /obj/item/reagent_containers/food/snacks/koisburger + +/decl/recipe/koisdonut + appliance = FRYER + items = list(/obj/item/reagent_containers/food/snacks/friedkois) + result = /obj/item/reagent_containers/food/snacks/donut/kois + result_quantity = 2 \ 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 c75d096cc57..bf449e33123 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -62,6 +62,8 @@ kois_type = 0 fallback_specific_heat = 1 + glass_icon_state = "glass_kois" + /decl/reagent/kois/black name = "Modified K'ois" description = "A thick goopy substance, rich in K'ois nutrients. This sample appears to be modified." @@ -4730,3 +4732,13 @@ glass_name = "glass of midynhr water" glass_desc = "A soft drink made from honey and tree syrup." glass_center_of_mass = list("x"=15, "y"=9) + +/decl/reagent/drink/toothpaste/caprician_coffee + name = "Caprician Coffee" + description = "A Vaurcesian take on liqueur coffee, quickly becoming a favorite of the Zo'ra hive." + color = "#C00000" + taste_description = "minty coffee" + + 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." \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 4b1344b9bfa..48f7f18c0fb 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3511,4 +3511,11 @@ result = /decl/reagent/alcohol/treebark_firewater required_reagents = list(/decl/reagent/drink/earthenrootjuice = 1, /decl/reagent/sugar = 1, /decl/reagent/woodpulp = 1) catalysts = list(/decl/reagent/enzyme = 5) + result_amount = 3 + +/datum/chemical_reaction/drink/caprician_coffee + name = "Caprician Coffee" + id = "caprician_coffee" + result = /decl/reagent/drink/toothpaste/caprician_coffee + required_reagents = list(/decl/reagent/drink/toothpaste = 1, /decl/reagent/drink/coffee = 2) result_amount = 3 \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 8b0ee3cd0c9..16d3232b484 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -4723,7 +4723,7 @@ desc = "A small, crispy Adhomian pie meant for one person filled with fruits." icon_state = "rikazu_fruit" bitesize = 2 - reagents_to_add = list(/decl/reagent/nutriment = 8) + reagents_to_add = list(/decl/reagent/nutriment = 8) reagent_data = list(/decl/reagent/nutriment = list("crispy dough" = 4, "sweet fruit" = 4)) desc_fluff = "Small pies, often hand-sized, usually made by folding dough overstuffing of fruit and cream cheese; commonly served hot. The simple preparation makes it a fast favorite, and the versatility of the ingredients has gained its favor with Tajara of all creeds. Different variations of Rikazu pop up all over Adhomai, some filled with meats, or vegetables, or even imported ingredients, like chocolate filling." filling_color = "#BD8939" @@ -4733,7 +4733,7 @@ desc = "A small, crispy Adhomian pie meant for one person filled with meat." icon_state = "rikazu_meat" bitesize = 2 - reagents_to_add = list(/decl/reagent/nutriment = 4, /decl/reagent/nutriment/protein = 4) + reagents_to_add = list(/decl/reagent/nutriment = 4, /decl/reagent/nutriment/protein = 4) reagent_data = list(/decl/reagent/nutriment = list("crispy dough" = 4), /decl/reagent/nutriment/protein = list("savory meat" = 4)) desc_fluff = "Small pies, often hand-sized, usually made by folding dough overstuffing of fruit and cream cheese; commonly served hot. The simple preparation makes it a fast favorite, and the versatility of the ingredients has gained its favor with Tajara of all creeds. Different variations of Rikazu pop up all over Adhomai, some filled with meats, or vegetables, or even imported ingredients, like chocolate filling." filling_color = "#BD8939" @@ -4743,7 +4743,7 @@ desc = "A small, crispy Adhomian pie meant for one person filled with vegetables." icon_state = "rikazu_veg" bitesize = 2 - reagents_to_add = list(/decl/reagent/nutriment = 8) + reagents_to_add = list(/decl/reagent/nutriment = 8) reagent_data = list(/decl/reagent/nutriment = list("crispy dough" = 4, "crunchy vegetables" = 4)) desc_fluff = "Small pies, often hand-sized, usually made by folding dough overstuffing of fruit and cream cheese; commonly served hot. The simple preparation makes it a fast favorite, and the versatility of the ingredients has gained its favor with Tajara of all creeds. Different variations of Rikazu pop up all over Adhomai, some filled with meats, or vegetables, or even imported ingredients, like chocolate filling." filling_color = "#BD8939" @@ -4753,7 +4753,7 @@ desc = "A small, crispy Adhomian pie meant for one person filled with chocolate." icon_state = "rikazu_choc" bitesize = 2 - reagents_to_add = list(/decl/reagent/nutriment = 8) + reagents_to_add = list(/decl/reagent/nutriment = 8) reagent_data = list(/decl/reagent/nutriment = list("crispy dough" = 4, "smooth chocolate" = 4)) desc_fluff = "Small pies, often hand-sized, usually made by folding dough overstuffing of fruit and cream cheese; commonly served hot. The simple preparation makes it a fast favorite, and the versatility of the ingredients has gained its favor with Tajara of all creeds. Different variations of Rikazu pop up all over Adhomai, some filled with meats, or vegetables, or even imported ingredients, like chocolate filling." filling_color = "#BD8939" @@ -4801,7 +4801,7 @@ /obj/item/reagent_containers/food/snacks/fatshouterslice/filled reagents_to_add = list(/decl/reagent/nutriment/protein = 2, /decl/reagent/nutriment = 2, /decl/reagent/alcohol/messa_mead = 1) reagent_data = list(/decl/reagent/nutriment/protein = list("juicy meat" = 2), /decl/reagent/nutriment = list("flaky dough" = 1, "savoury vegetables" = 1)) - + /obj/item/reagent_containers/food/snacks/sliceable/zkahnkowafull name = "Zkah'nkowa" desc = "A large smoked sausage." @@ -5151,3 +5151,32 @@ reagent_data = list(/decl/reagent/nutriment = list("diona delicacy" = 5)) reagents_to_add = list(/decl/reagent/nutriment = 8, /decl/reagent/drink/carrotjuice = 2, /decl/reagent/drink/potatojuice = 2, /decl/reagent/radium = 2) filling_color = "#BD8939" + +/obj/item/reagent_containers/food/snacks/koissteak + name = "k'ois steak" + desc = "Some well-done k'ois, grilled to perfection." + icon_state = "kois_steak" + filling_color = "#dcd9cd" + reagents_to_add = list(/decl/reagent/kois = 20, /decl/reagent/toxin/phoron = 15) + +/obj/item/reagent_containers/food/snacks/donut/kois + name = "k'ois donut" + desc = "Deep fried k'ois shaped into a donut." + icon_state = "kois_donut" + filling_color = "#dcd9cd" + overlay_state = "box-kois_donut" + reagents_to_add = list(/decl/reagent/kois = 15, /decl/reagent/toxin/phoron = 10) + +/obj/item/reagent_containers/food/snacks/koismuffin + name = "k'ois muffin" + desc = "Baked k'ois goop, molded into a little cake." + icon_state = "kois_muffin" + filling_color = "#dcd9cd" + reagents_to_add = list(/decl/reagent/kois = 10, /decl/reagent/toxin/phoron = 15) + +/obj/item/reagent_containers/food/snacks/koisburger + name = "k'ois burger" + desc = "K'ois inside k'ois. Peak Vaurcesian cuisine." + icon_state = "kois_burger" + filling_color = "#dcd9cd" + reagents_to_add = list(/decl/reagent/kois = 20, /decl/reagent/toxin/phoron = 20) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index 71b7578be67..08c3b05125f 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -48,6 +48,11 @@ desc = "A metal coffee cup bearing the flag of the Democratic People's Republic of Adhomai." icon_state = "coffeecup_dpra" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/sedantis + name = "\improper Sedantis coffee cup" + desc = "A metal coffee cup bearing the flag of Sedantis." + icon_state = "coffeecup_sedantis" + // Organisations /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt name = "\improper NT coffee cup" diff --git a/html/changelogs/listerla - vaurcafood.yml b/html/changelogs/listerla - vaurcafood.yml new file mode 100644 index 00000000000..39fcccd3c68 --- /dev/null +++ b/html/changelogs/listerla - vaurcafood.yml @@ -0,0 +1,8 @@ +author: listerla & Desven + +delete-after: True + +changes: + - rscadd: "Added a Sedantis coffee cup to loadout." + - rscadd: "Added recipes for k'ois burgers, muffins, donuts, and steaks." + - rscadd: "Added Caprician Coffee, made with 2 parts coffee and 1 toothpaste." \ No newline at end of file diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi index 845d7403aa4..4b45c035ffa 100644 Binary files a/icons/obj/drink_glasses/coffecup.dmi and b/icons/obj/drink_glasses/coffecup.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index ea21f6ecc1b..d46735cdd25 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 2cc2a8a4585..e748ef0c4ab 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ