diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 74a193bf10c..46571624c1b 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -317,3 +317,17 @@ /obj/item/trash/stick name = "candy stick" icon_state = "rock_candy" + +/obj/item/trash/imperial_pot_empty + name = "imperial pot" + desc = "This large wooden pot was probably used to house a grand, elaborate, dominian feast at some point. How majestic it must have been. Oh well, get rid of it now before it draws rats." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "imperialpotempty" + drop_sound = 'sound/items/drop/shovel.ogg' + pickup_sound = 'sound/items/pickup/shovel.ogg' + +/obj/item/trash/wooden_platter + name = "wooden platter" + icon_state = "woodentray" + drop_sound = 'sound/items/drop/bottle.ogg' + pickup_sound = 'sound/items/pickup/bottle.ogg' diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index bd113fbf1e3..b4d09eb0596 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -207,7 +207,45 @@ items = list(/obj/item/reagent_containers/food/snacks/fish) result = /obj/item/reagent_containers/food/snacks/soup/brudet -// Europan food +/singleton/recipe/imperial_pot + appliance = POT + fruit = list("potato" = 2, "lemon" = 2, "garlic" = 1, "onion" = 1) + reagents = list(/singleton/reagent/water = 15, /singleton/reagent/nutriment/rice = 30) + items = list( + /obj/item/reagent_containers/food/snacks/fish, + /obj/item/reagent_containers/food/snacks/fish, + /obj/item/reagent_containers/food/snacks/fish/mollusc, + /obj/item/reagent_containers/food/snacks/fish/mollusc + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/imperial_pot + +/singleton/recipe/jadrica + appliance = OVEN + fruit = list("carrot" = 2, "garlic" = 1) + reagents = list(/singleton/reagent/enzyme = 5, /singleton/reagent/alcohol/wine = 5, /singleton/reagent/spacespice = 1, /singleton/reagent/sodiumchloride = 1, /singleton/reagent/blackpepper = 1) + items = list( + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/bacon, + /obj/item/reagent_containers/food/snacks/bacon + ) + result = /obj/item/reagent_containers/food/snacks/jadrica + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/imperial_scallops + appliance = SAUCEPAN | POT + fruit = list("lemon" = 1, "garlic" = 1) + reagents = list(/singleton/reagent/water = 5, /singleton/reagent/sodiumchloride = 2, /singleton/reagent/blackpepper = 1) + items = list( + /obj/item/reagent_containers/food/snacks/fish/mollusc, + /obj/item/reagent_containers/food/snacks/fish/mollusc, + /obj/item/reagent_containers/food/snacks/spreads/butter + ) + result = /obj/item/reagent_containers/food/snacks/imperial_scallops + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace + +// New Hai Phong + /singleton/recipe/chetroinuoc appliance = SAUCEPAN | POT reagents = list(/singleton/reagent/nutriment/vanilla = 5, /singleton/reagent/nutriment/rice = 10) @@ -215,6 +253,7 @@ reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/chetroinuoc +// Europan Food /singleton/recipe/deepdive fruit = list ("seaweed" = 1) @@ -235,3 +274,44 @@ items = list(/obj/item/reagent_containers/food/snacks/whitechocolate) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/bluemoon + +//Eridani + +/singleton/recipe/puffpuffs + appliance = SKILLET + reagents = list(/singleton/reagent/nutriment/flour = 10, /singleton/reagent/water = 5, /singleton/reagent/spacespice = 2, /singleton/reagent/sodiumchloride = 1) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/bowl/puffpuffs + +/singleton/recipe/fufu + appliance = SAUCEPAN | POT + fruit = list("banana" = 2) + reagents = list(/singleton/reagent/water = 5) + result = /obj/item/reagent_containers/food/snacks/bowl/fufus + reagent_mix = RECIPE_REAGENT_REPLACE + +//Silversun + +/singleton/recipe/clams_casino + appliance = SKILLET + reagents = list(/singleton/reagent/spacespice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/fish/mollusc, + /obj/item/reagent_containers/food/snacks/fish/mollusc, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/breadslice, + /obj/item/reagent_containers/food/snacks/bacon + ) + result = /obj/item/reagent_containers/food/snacks/clams_casino + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace + +/singleton/recipe/lady_lulaine + appliance = MIX + fruit = list ("blueberries" = 1 , "berries" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/muffin, + /obj/item/reagent_containers/food/snacks/muffin + ) + reagents = list(/singleton/reagent/nutriment/protein/egg = 6, /singleton/reagent/drink/ice = 5, /singleton/reagent/drink/milk/cream = 5, /singleton/reagent/sugar = 10) + result = /obj/item/reagent_containers/food/snacks/sliceable/lady_lulaine + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace diff --git a/code/modules/hydroponics/seed_datums/fruits.dm b/code/modules/hydroponics/seed_datums/fruits.dm index fdcffc5b9f6..28e7dad0bfc 100644 --- a/code/modules/hydroponics/seed_datums/fruits.dm +++ b/code/modules/hydroponics/seed_datums/fruits.dm @@ -130,6 +130,7 @@ display_name = "blueberry bush" mutants = list("berries","poisonberries","glowberries") chems = list(/singleton/reagent/nutriment = list(1,10), /singleton/reagent/drink/blueberryjuice = list(10,10)) + kitchen_tag = "blueberries" /datum/seed/berry/blue/setup_traits() ..() diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index 748bc2fa7e6..91bdc8772fb 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -138,6 +138,15 @@ /singleton/reagent/drink/NTellamilkshake value = 0.14 +/singleton/reagent/drink/shake_caramel + value = 0.13 + +/singleton/reagent/drink/shake_strawberry + value = 0.13 + +/singleton/reagent/drink/shake_dirtberry + value = 0.13 + /singleton/reagent/drink/NTellahotchocolate value = 0.13 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 272bee384fb..8e7f474b016 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2418,6 +2418,40 @@ glass_desc = "Oh look, it's that thing you actually want to get but probably shouldn't." glass_center_of_mass = list("x"=16, "y"=7) +/singleton/reagent/drink/shake_strawberry + name = "Strawberry Milkshake" + description = "Milkshake with a healthy heaping of strawberry syrup mixed in." + color = "#ff7575" + taste_description = "sugary strawberry" + + glass_icon_state = "shake_strawberry" + glass_name = "glass of Strawberry Milkshake" + glass_desc = "A sweet, chilly milkshake with neon red syrup. So sweet you could pop!" + glass_center_of_mass = list("x"=16, "y"=7) + +/singleton/reagent/drink/shake_caramel + name = "Caramel Milkshake" + description = "Milkshake with a healthy heaping of caramel syrup mixed in." + color = "#d19d4e" + taste_description = "smooth caramel" + + glass_icon_state = "shake_caramel" + glass_name = "glass of Caramel Milkshake" + glass_desc = "In case there wasn't enough sugar in your sugar." + glass_center_of_mass = list("x"=16, "y"=7) + + +/singleton/reagent/drink/shake_dirtberry + name = "Dirtberry Milkshake" + description = "Milkshake with a healthy heaping of dirtberry syrup mixed in." + color = "#92692c" + taste_description = "smooth dirtberries" + + glass_icon_state = "shake_dirtberry" + glass_name = "glass of Dirtberry Milkshake" + glass_desc = "Don't let the name fool you, this dairy delight is smooth and sweet!" + glass_center_of_mass = list("x"=16, "y"=7) + /singleton/reagent/drink/NTellahotchocolate name = "NTella Hot Chocolate" description = "It's like a cup of hot chocolate except... More everything." @@ -5683,7 +5717,7 @@ name = "Strawberry Syrup" description = "Thick strawberry syrup used to flavor drinks." taste_description = "strawberry" - color = "#f3e5ab" + color = "#b40000" glass_name = "strawberry syrup" glass_desc = "Thick strawberry syrup used to flavor drinks." //blueberry @@ -5691,7 +5725,7 @@ name = "Blueberry Syrup" description = "Thick blueberry syrup used to flavor drinks." taste_description = "blueberry" - color = "#f3e5ab" + color = "#0a0094" glass_name = "blueberry syrup" glass_desc = "Thick blueberry syrup used to flavor drinks." //rasp @@ -5699,7 +5733,7 @@ name = "Raspberry Syrup" description = "Thick raspberry syrup used to flavor drinks." taste_description = "raspberry" - color = "#f3e5ab" + color = "#ad0042" glass_name = "raspberry syrup" glass_desc = "Thick raspberry syrup used to flavor drinks." //black rasp @@ -5707,7 +5741,7 @@ name = "Black Raspberry Syrup" description = "Thick black raspberry syrup used to flavor drinks." taste_description = "black raspberry" - color = "#f3e5ab" + color = "#1b1618" glass_name = "black raspberry syrup" glass_desc = "Thick black raspberry syrup used to flavor drinks." //blue rasp @@ -5715,7 +5749,7 @@ name = "Blue Raspberry Syrup" description = "Thick blue raspberry syrup used to flavor drinks." taste_description = "blue raspberry" - color = "#f3e5ab" + color = "#21154d" glass_name = "blue raspberry syrup" glass_desc = "Thick blue raspberry syrup used to flavor drinks." //glow @@ -5747,7 +5781,7 @@ name = "Ylpha Berry Syrup" description = "Thick ylpha berry syrup used to flavor drinks." taste_description = "ylpha berry" - color = "#f3e5ab" + color = "#f3d1ab" glass_name = "ylpha berry syrup" glass_desc = "Thick ylpha berry syrup used to flavor drinks." //dirt @@ -5755,7 +5789,7 @@ name = "Dirt Berry Syrup" description = "Thick dirt berry syrup used to flavor drinks." taste_description = "dirt berry" - color = "#f3e5ab" + color = "#85572c" glass_name = "dirt berry syrup" glass_desc = "Thick dirt berry syrup used to flavor drinks." diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 0459136292b..8b3ebfb948b 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3027,6 +3027,27 @@ required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/nutriment/choconutspread = 1) result_amount = 6 +/datum/chemical_reaction/drink/caramelshake + name = "Caramel Milkshake" + id = "shake_caramel" + result = /singleton/reagent/drink/shake_caramel + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_caramel = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/strawberryshake + name = "Strawberry Milkshake" + id = "shake_strawberry" + result = /singleton/reagent/drink/shake_strawberry + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_strawberry = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/dirtberryshake + name = "Dirtberry Milkshake" + id = "shake_dirtberry" + result = /singleton/reagent/drink/shake_dirtberry + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_dirtberry = 1) + result_amount = 6 + /datum/chemical_reaction/drink/NTellahotchocolate name = "NTella hot chocolate" id = "NTellahotchocolate" diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm index 75b460fa2d1..45bfa521af4 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -370,6 +370,53 @@ reagent_data = list(/singleton/reagent/nutriment = list("hot stew" = 3, "spices" = 1, "vegetables" = 1, "fish" = 2)) reagents_to_add = list(/singleton/reagent/nutriment = 8, /singleton/reagent/water = 5) +/obj/item/reagent_containers/food/snacks/imperial_pot + name = "imperial pot" + desc = "A massive wooden pot of morozian seafood and rice, traditionally served in dominian feasts and festivals. It is a communal dish shared among friends, family and neighbors. Grab a bowl, you're not finishing this one by yourself." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "imperialpotfull" + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list ("seafood" = 10), /singleton/reagent/nutriment = list("rice" = 10, "potatoes" = 8, "vegetables" = 6)) + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 20, /singleton/reagent/nutriment/rice = 20, /singleton/reagent/nutriment = 20, /singleton/reagent/drink/lemonjuice = 20, /singleton/reagent/spacespice = 5, /singleton/reagent/dylovene = 5) + filling_color = "#d4b756" + center_of_mass = list("x"=16, "y"=10) + bitesize = 3 + trash = /obj/item/trash/imperial_pot_empty + drop_sound = 'sound/items/drop/shovel.ogg' + pickup_sound = 'sound/items/pickup/shovel.ogg' + is_liquid = TRUE + +/obj/item/reagent_containers/food/snacks/imperial_pot/update_icon() + var/percent_chetroinuoc = round((reagents.total_volume / 10) * 100) + switch(percent_chetroinuoc) + if(0 to 1) + icon_state = "imperialpotempty" + if(2 to INFINITY) + icon_state = "imperialpotfull" + +/obj/item/reagent_containers/food/snacks/jadrica + name = "jadrica" + desc = "A high-end dominian dish from Novi Jadran made of slow cooked braised beef, cloves, carrots and bacon. It is a very complex and difficult dish to make properly - A task usually only succeeded by the most skilled, high-end chefs. In a time crunch, enzymes can be used to speed along the slow cooking process." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "jadrica" + trash = /obj/item/trash/wooden_platter + reagents_to_add = list(/singleton/reagent/nutriment/protein = 8, /singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/triglyceride = 4, /singleton/reagent/spacespice = 2) + reagent_data = list(/singleton/reagent/nutriment/protein = list("braised beef" = 10, "bacon" = 10), /singleton/reagent/nutriment = list("cloves" = 5, "vinegar" = 5)) + bitesize = 3 + filling_color = "#49251b" + +/obj/item/reagent_containers/food/snacks/imperial_scallops + name = "imperial scallops" + desc = "Saltwater boiled dominian scallops. While originally this dish was served with just a few herbs, newer iterations add an abundance of flavor to show the dish and the Dominian culture's lavishness." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "imperialscallops" + trash = /obj/item/trash/plate + bitesize = 2 + filling_color = "#dbb06f" + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood/mollusc = 6, /singleton/reagent/nutriment = 2, /singleton/reagent/water = 5, /singleton/reagent/sodiumchloride = 2) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood/mollusc = list("pillowy scallops" = 10, "salt" = 5), /singleton/reagent/nutriment = list("butter" = 10)) + +//New Hai Phong + /obj/item/reagent_containers/food/snacks/chetroinuoc name = "che troi nuoc" desc = "Traditional solarian dessert from New Hai Phong, these triangular sweet rice dumplings are filled with beans." @@ -390,6 +437,7 @@ icon_state = "chetroinuoc2" if(67 to INFINITY) icon_state = "chetroinuoc3" + // Europa /obj/item/reagent_containers/food/snacks/deepdive @@ -417,3 +465,117 @@ reagent_data = list(/singleton/reagent/nutriment = list("blue raspberry" = 5, "white chocolate" = 3)) drop_sound = 'sound/items/drop/glass.ogg' pickup_sound = 'sound/items/pickup/glass.ogg' + + +// Eridani + +/obj/item/reagent_containers/food/snacks/bowl + abstract_type = /obj/item/reagent_containers/food/snacks/bowl + name = "a bowl of item" + desc = "If you're seeing this, something has gone wrong D:" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "puffpuffbowl" + trash = /obj/item/trash/snack_bowl + var/vendingobject = /obj/item/reagent_containers/food/snacks/puffpuff + ///This is the item itself that the bowl dispenses, as an obj. I have it set to puff puffs by default but if you reuse this code for a different food - change accordingly. + reagent_data = list(/singleton/reagent/nutriment = list("fried dough" = 10, "ginger" = 4)) + bitesize = 4 + reagents_to_add = list(/singleton/reagent/nutriment = 24) + var/unitname = "contained_food" ///this is the NAME of the item the bowl dispenses, as it would show up in a sentence. + +/obj/item/reagent_containers/food/snacks/bowl/puffpuffs + name = "puff-puff bowl" + desc = "A bowl of puffy dough balls. Much like donut balls except pan fried, chewier, and often served savory, not just sweet. It originates in Nigeria, but this is the Eridani variant, which is made with ginger instead of pepper." + bitesize = 4 + reagents_to_add = list(/singleton/reagent/nutriment/ = 24) + unitname = "puff-puff" + filling_color = "#bb8a41" + +/obj/item/reagent_containers/food/snacks/bowl/attack_hand(mob/user as mob) + var/obj/item/reagent_containers/food/snacks/returningitem = new vendingobject(loc) + returningitem.reagents.clear_reagents() + reagents.trans_to(returningitem, bitesize) + returningitem.bitesize = bitesize/2 + user.put_in_hands(returningitem) + if (reagents && reagents.total_volume) + to_chat(user, "You take a [unitname] from the plate.") + else + to_chat(user, "You take the last [unitname] from the plate.") + var/obj/waste = new trash(loc) + if (loc == user) + user.put_in_hands(waste) + qdel(src) + +/obj/item/reagent_containers/food/snacks/bowl/puffpuffs/update_icon() + switch(reagents.total_volume) + if(1 to 8) + icon_state = "puffpuffbowlfew" + if(9 to INFINITY) + icon_state = "puffpuffbowl" + +/obj/item/reagent_containers/food/snacks/puffpuff + name = "puff-puff" + desc = "A nice, puffy, puff-puff. Mmmm, fried dough. You can feel your arteries clogging already!" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "puffpuff" + bitesize = 2 + filling_color = "#bb8a41" + +/obj/item/reagent_containers/food/snacks/bowl/fufus + name = "fufu dumplings" + desc = "These Eridanian dumplings are made from plantains, and while dense, they are not typically supposed to be served on their own, but rather as a side dish for various Eridanian soups." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "fufubowl" + filling_color = "#eee0b1" + vendingobject = /obj/item/reagent_containers/food/snacks/fufu + bitesize = 3 + reagents_to_add = list(/singleton/reagent/nutriment = 9) + reagent_data = list(/singleton/reagent/nutriment = list("plantains" = 10)) + +/obj/item/reagent_containers/food/snacks/bowl/fufus/update_icon() + switch(reagents.total_volume) + if(1 to 4) + icon_state = "fufufew" + if(5 to INFINITY) + icon_state = "fufubowl" + +/obj/item/reagent_containers/food/snacks/fufu + name = "fufu dumpling" + desc = "A big plantain dumpling meant to be dipped or eaten alongside soup." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "fufuone" + bitesize = 2 + filling_color = "#eee0b1" + +//Silversun + +/obj/item/reagent_containers/food/snacks/clams_casino + name = "silversun clams casino" + desc = "A true silversun classic, clams on the halfshell with breadcrumbs, bacon, and bell peppers. Somehow landing right in the middle ring between average joe finger food and upper class fanciness." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "clamscasino" + trash = /obj/item/trash/plate + bitesize = 2 + filling_color = "#a5683f" + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood/mollusc = 6, /singleton/reagent/nutriment/protein = 2, /singleton/reagent/nutriment = 2) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood/mollusc = list("buttery clams" = 15), /singleton/reagent/nutriment/protein = list ("bacon" = 15), /singleton/reagent/nutriment = list("breadcrumbs" = 10, "bell peppers" = 10)) + +/obj/item/reagent_containers/food/snacks/sliceable/lady_lulaine + name = "lady lulaine" + desc = "This rich and creamy berry-coated dessert was invented in a small coastal town on Silversun. It's very tricky to get it stable enough to not collapse under it's own weight. What are you waiting for? Slice it up!" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "ladylulaine" + slice_path = /obj/item/reagent_containers/food/snacks/lady_lulaine_slice + trash = /obj/item/trash/plate + slices_num = 5 + filling_color = "#dbddff" + reagents_to_add = list(/singleton/reagent/nutriment = 15, /singleton/reagent/drink/berryjuice = 5) + reagent_data = list(/singleton/reagent/nutriment = list("custard" = 10, "blueberries" = 10, "tangy berries" = 5)) + +/obj/item/reagent_containers/food/snacks/lady_lulaine_slice + name = "lady lulaine slice" + desc = "A Silversun classic, this dessert is somewhere between a frozen custard, ice cream cake, and berry pie. It is often photographed next to a cocktail with a sunset or a sunrise behind it." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "ladylulaine_slice" + filling_color = "#dbddff" + trash = /obj/item/trash/plate diff --git a/html/changelogs/TOMIXCOMICS-PR-DOMINIAERIDANIANDMOREFOODS.yml b/html/changelogs/TOMIXCOMICS-PR-DOMINIAERIDANIANDMOREFOODS.yml new file mode 100644 index 00000000000..76fac45ad27 --- /dev/null +++ b/html/changelogs/TOMIXCOMICS-PR-DOMINIAERIDANIANDMOREFOODS.yml @@ -0,0 +1,46 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Tomixcomics + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added several new foods for Dominia, Eridani, and Silversun." + - rscadd: "Added three new kinds of milkshakes." + - tweak: "Changed some of the syrup colors to match the color they're supposed to have." + - backend: "Added kitchen tag for blueberries." + - backend: "Added correct cuisine category for che troi nuoc" + - bugfix: "Fixed naming issue that was keeping NTella jar from showing up" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 55d5f0f5c09..af1a6d9106d 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/item/reagent_containers/food/condiment.dmi b/icons/obj/item/reagent_containers/food/condiment.dmi index c1e06d09fd3..a4194a1c686 100644 Binary files a/icons/obj/item/reagent_containers/food/condiment.dmi and b/icons/obj/item/reagent_containers/food/condiment.dmi differ diff --git a/icons/obj/item/reagent_containers/food/cultural/human.dmi b/icons/obj/item/reagent_containers/food/cultural/human.dmi index 2cbaa261144..90698d4485a 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/human.dmi and b/icons/obj/item/reagent_containers/food/cultural/human.dmi differ