diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 46571624c1b..5557c0d0a4c 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -328,6 +328,6 @@ /obj/item/trash/wooden_platter name = "wooden platter" - icon_state = "woodentray" + icon_state = "wooden_platter" drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.ogg' diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 877009eb1e4..03524b5f76e 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -328,7 +328,7 @@ ) /datum/bounty/item/chef/roulades name = "Roulades" - description = "%BOSSNAME is retiring after many beloved years in the company and we need some tasty treats for the retirement party we're throwing them." + description = "%PERSONNAME is retiring after many beloved years in the company and we need some tasty treats for the retirement party we're throwing them." reward_low = 2600 reward_high = 3500 required_count = 2 diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index b4d09eb0596..6bede37d2c2 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -87,6 +87,20 @@ ) result = /obj/item/reagent_containers/food/snacks/tofurkey +/singleton/recipe/roast_chicken + appliance = OVEN + fruit = list("potato" = 2) + reagents = list(/singleton/reagent/blackpepper = 1, /singleton/reagent/sodiumchloride = 1) + items = list( + /obj/item/reagent_containers/food/snacks/meat/chicken, + /obj/item/reagent_containers/food/snacks/meat/chicken, + /obj/item/reagent_containers/food/snacks/meat/chicken, + /obj/item/reagent_containers/food/snacks/meat/chicken, + /obj/item/reagent_containers/food/snacks/stuffing + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/reagent_containers/food/snacks/sliceable/roast_chicken + /singleton/recipe/meatbun appliance = SAUCEPAN | POT reagents = list(/singleton/reagent/spacespice = 1, /singleton/reagent/water = 5) @@ -149,6 +163,14 @@ reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/crab_legs +/singleton/recipe/hash_browns + appliance = GRILL | SKILLET + reagents = list(/singleton/reagent/blackpepper = 1, /singleton/reagent/sodiumchloride = 1) + items = list( + /obj/item/reagent_containers/food/snacks/rawsticks + ) + result = /obj/item/reagent_containers/food/snacks/hash_browns + // Konyang /singleton/recipe/mossbowl diff --git a/code/modules/cooking/recipes/cultural/recipes_vaurca.dm b/code/modules/cooking/recipes/cultural/recipes_vaurca.dm index 7bb098b45d3..bdc6f188d97 100644 --- a/code/modules/cooking/recipes/cultural/recipes_vaurca.dm +++ b/code/modules/cooking/recipes/cultural/recipes_vaurca.dm @@ -66,3 +66,11 @@ reagents = list(/singleton/reagent/mental/vkrexi = 1) //NOTE: This means the RAEGENT of vkrexi taffy, not the solid item! you might have to grind the item to get it. reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/vkrexiwrap/veggie + +/singleton/recipe/phoron_river_loaf + appliance = OVEN + items = list( + /obj/item/reagent_containers/food/snacks/friedkois, + /obj/item/reagent_containers/food/snacks/phoroncandy + ) + result = /obj/item/reagent_containers/food/snacks/phoron_river_loaf diff --git a/code/modules/cooking/recipes/recipes_meat.dm b/code/modules/cooking/recipes/recipes_meat.dm index 60ca2bf04e1..bd38af875fb 100644 --- a/code/modules/cooking/recipes/recipes_meat.dm +++ b/code/modules/cooking/recipes/recipes_meat.dm @@ -117,7 +117,7 @@ fruit = list("tomato" = 1, "cabbage" = 1) reagents = list(/singleton/reagent/sodiumchloride = 1, /singleton/reagent/spacespice = 1) items = list( - /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/pita, /obj/item/reagent_containers/food/snacks/cutlet ) result = /obj/item/reagent_containers/food/snacks/donerkebab diff --git a/code/modules/cooking/recipes/recipes_pastries.dm b/code/modules/cooking/recipes/recipes_pastries.dm index e9f430ff9eb..049d6ca657a 100644 --- a/code/modules/cooking/recipes/recipes_pastries.dm +++ b/code/modules/cooking/recipes/recipes_pastries.dm @@ -4,22 +4,26 @@ ////////////////////////////////////////////MUFFINS//////////////////////////////////////////// /singleton/recipe/muffin appliance = OVEN - reagents = list(/singleton/reagent/drink/milk = 5, /singleton/reagent/sugar = 5) + reagents = list(/singleton/reagent/drink/milk = 20, /singleton/reagent/sugar = 20) reagent_mix = RECIPE_REAGENT_REPLACE items = list( + /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough ) result = /obj/item/reagent_containers/food/snacks/muffin + result_quantity = 6 /singleton/recipe/berrymuffin appliance = OVEN - reagents = list(/singleton/reagent/drink/milk = 5, /singleton/reagent/sugar = 5) + reagents = list(/singleton/reagent/drink/milk = 20, /singleton/reagent/sugar = 20) reagent_mix = RECIPE_REAGENT_REPLACE items = list( + /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough ) - fruit = list("berries" = 1) + fruit = list("berries" = 2) result = /obj/item/reagent_containers/food/snacks/berrymuffin + result_quantity = 6 ////////////////////////////////////////////PANCAKES//////////////////////////////////////////// diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index 91bdc8772fb..fec650bc5e3 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -147,6 +147,27 @@ /singleton/reagent/drink/shake_dirtberry value = 0.13 +/singleton/reagent/drink/shake_blueberry + value = 0.13 + +/singleton/reagent/drink/shake_chocolate + value = 0.13 + +/singleton/reagent/drink/shake_blue_raspberry + value = 0.13 + +/singleton/reagent/drink/shake_raspberry + value = 0.13 + +/singleton/reagent/drink/shake_berry + value = 0.13 + +/singleton/reagent/drink/shake_ylpha + value = 0.13 + +/singleton/reagent/drink/shake_choco_mint + 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 7d8333d7e57..8e2535f3b02 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2483,7 +2483,7 @@ taste_description = "sugary strawberry" glass_icon_state = "shake_strawberry" - glass_name = "glass of Strawberry Milkshake" + 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) @@ -2494,11 +2494,10 @@ taste_description = "smooth caramel" glass_icon_state = "shake_caramel" - glass_name = "glass of Caramel Milkshake" + 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." @@ -2506,10 +2505,87 @@ taste_description = "smooth dirtberries" glass_icon_state = "shake_dirtberry" - glass_name = "glass of Dirtberry Milkshake" + 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/shake_blueberry + name = "Blueberry Milkshake" + description = "Milkshake with some neon blue blueberry syrup mixed in." + color = "#0c00b3" + taste_description = "creamy blueberries" + + glass_icon_state = "shake_blueberry" + glass_name = "glass of blueberry milkshake" + glass_desc = "This is an alarming level of neon blue for something that's supposed to be ingested. Probably still delicious though!" + glass_center_of_mass = list("x"=16, "y"=7) + +/singleton/reagent/drink/shake_chocolate + name = "Chocolate Milkshake" + description = "Vanilla milkshake with a heaping of chocolate syrup mixed in." + color = "#79452c" + taste_description = "chocolatey vanilla" + + glass_icon_state = "shake_chocolate" + glass_name = "glass of chocolate milkshake" + glass_desc = "A vanilla milkshake with a hefty heap of delicious chocolate syrup mixed in. Eh, that diet can wait until tomorrow, right?" + glass_center_of_mass = list("x"=16, "y"=7) + +/singleton/reagent/drink/shake_blue_raspberry + name = "Blue Raspberry Milkshake" + description = "A milkshake with a heaping of blue raspberry syrup mixed in." + color = "#3955a3" + taste_description = "creamy raspberry" + + glass_icon_state = "shake_blue_raspberry" + glass_name = "glass of blue raspberry milkshake" + glass_desc = "Formerly this used to be created with artificial food dyes. Now it's made with real blue raspberries! Make no mistake, though, this is still absolutely and deliciously bad for you." + glass_center_of_mass = list("x"=16, "y"=7) + +/singleton/reagent/drink/shake_raspberry + name = "Raspberry Milkshake" + description = "A milkshake with a heaping of raspberry syrup mixed in." + color = "#a03257" + taste_description = "creamy raspberry" + + glass_icon_state = "shake_purplered" + glass_name = "glass of raspberry milkshake" + glass_desc = "Oh Raspberries, is there any dessert you can't improve?" + glass_center_of_mass = list("x"=16, "y"=7) + +/singleton/reagent/drink/shake_berry + name = "Berry Milkshake" + description = "A milkshake with a heaping of berry syrup mixed in." + color = "#f1315b" + taste_description = "smooth berries" + + glass_icon_state = "shake_berry" + glass_name = "glass of berry milkshake" + glass_desc = "Why settle for just one Milkshake flavor when you can have the wide, delicious vagueness of 'berries'?" + glass_center_of_mass = list("x"=16, "y"=7) + +/singleton/reagent/drink/shake_ylpha + name = "Ylpha berry milkshake" + description = "A milkshake with a heaping of Ylpha Berry syrup mixed in." + color = "#a03257" + taste_description = "tangy sweetness" + + glass_icon_state = "shake_purplered" + glass_name = "glass of ylpha berry milkshake" + glass_desc = "That trademark magenta mixture of tangy and sweet - now in a tall, creamy glass of Milkshake!" + glass_center_of_mass = list("x"=16, "y"=7) + +/singleton/reagent/drink/shake_choco_mint + name = "Choco-Mint Milkshake" + description = "A milkshake with a heaping of mint syrup mixed in and some little chocolate chips as well!" + color = "#6ecf73" + taste_description = "chocolatey mint" + + glass_icon_state = "shake_choco_mint" + glass_name = "glass of choco-mint milkshake" + glass_desc = "For everyone who liked to eat their toothpaste as a kid and never grew out of it." + 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." @@ -5767,7 +5843,7 @@ name = "Berry Syrup" description = "Thick berry syrup used to flavor drinks." taste_description = "berry" - color = "#f3e5ab" + color = "#c00726" glass_name = "berry syrup" glass_desc = "Thick berry syrup used to flavor drinks." //strawberry @@ -5839,7 +5915,7 @@ name = "Ylpha Berry Syrup" description = "Thick ylpha berry syrup used to flavor drinks." taste_description = "ylpha berry" - color = "#f3d1ab" + color = "#790042" glass_name = "ylpha berry syrup" glass_desc = "Thick ylpha berry syrup used to flavor drinks." //dirt diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index f71bd534878..60452bfddc5 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3069,6 +3069,55 @@ required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_dirtberry = 1) result_amount = 6 +/datum/chemical_reaction/drink/blueberry_shake + name = "Blueberry Milkshake" + id = "shake_blueberry" + result = /singleton/reagent/drink/shake_blueberry + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_blueberry = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/chocolate_shake + name = "Chocolate Milkshake" + id = "shake_chocolate" + result = /singleton/reagent/drink/shake_chocolate + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_chocolate = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/blue_raspberry_shake + name = "Blue Raspberry Milkshake" + id = "shake_blue_raspberry" + result = /singleton/reagent/drink/shake_blue_raspberry + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_blueraspberry = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/raspberry_shake + name = "Raspberry Milkshake" + id = "shake_raspberry" + result = /singleton/reagent/drink/shake_raspberry + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_raspberry = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/ylpha_shake + name = "Ylpha Berry Milkshake" + id = "shake_ylpha" + result = /singleton/reagent/drink/shake_ylpha + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_ylphaberry = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/berry_shake + name = "Berry Milkshake" + id = "shake_berry" + result = /singleton/reagent/drink/shake_berry + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/syrup_berry = 1) + result_amount = 6 + +/datum/chemical_reaction/drink/choco_mint_shake + name = "Choco-Mint Milkshake" + id = "shake_choco_mint" + result = /singleton/reagent/drink/shake_choco_mint + required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/mintsyrup = 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/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm index 892d1235667..e2ec666957f 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm @@ -88,7 +88,6 @@ desc = "A slice of home." icon = 'icons/obj/item/reagent_containers/food/bread.dmi' icon_state = "breadslice" - trash = /obj/item/trash/plate filling_color = "#D27332" bitesize = 2 center_of_mass = list("x"=16, "y"=4) 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 45bfa521af4..f46ba79abe2 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -132,6 +132,27 @@ reagent_data = list(/singleton/reagent/nutriment = list("turkey" = 3)) bitesize = 3 +/obj/item/reagent_containers/food/snacks/sliceable/roast_chicken + name = "roast chicken" + desc = "Roasted and stuffed chicken surrounded by potatoes, all ready for the carving! Dibs on the drumsticks!" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "roast_chicken" + slice_path = /obj/item/reagent_containers/food/snacks/roast_chicken_slice + slices_num = 6 + trash = /obj/item/tray/plate //Yes, this isn't the "trash" kind of plate. It's a big dish, so it's served on a large serving plate. + filling_color = "#9b5e2c" + reagents_to_add = list(/singleton/reagent/nutriment/protein = 24, /singleton/reagent/nutriment = 12, /singleton/reagent/soporific = 3) + reagent_data = list(/singleton/reagent/nutriment/protein = list("chicken" = 6), /singleton/reagent/nutriment = list("potatoes" = 5, "stuffing" = 5)) + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/roast_chicken_slice + name = "roast chicken slice" + desc = "A slice of juicy roasted chicken with potatoes. Get ready to loosen your belt!" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "roast_chicken_slice" + trash = /obj/item/trash/plate + filling_color = "#9b5e2c" + /obj/item/reagent_containers/food/snacks/meatbun name = "meat bun" desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a spiced meat filling." @@ -212,6 +233,17 @@ trash = /obj/item/trash/plate filling_color = "#FFA8E5" +/obj/item/reagent_containers/food/snacks/hash_browns + name = "hash browns" + desc = "diner-style, thinly-sliced, fried potatoes. so greasy they might as well be singing about cars." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "hashbrowns" + + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/triglyceride/oil/corn = 3) + reagent_data = list(/singleton/reagent/nutriment = list("crunchy potatoes" = 10)) + bitesize = 2 + filling_color = "#bb8432" + // Konyang /obj/item/reagent_containers/food/snacks/mossbowl @@ -506,6 +538,13 @@ user.put_in_hands(waste) qdel(src) +/obj/item/reagent_containers/food/snacks/bowl/MouseDrop(mob/user) //Dropping the bowl of food onto the user + if(istype(user) && !use_check_and_message(user)) + user.put_in_active_hand(src) + src.pickup(user) + return + . = ..() + /obj/item/reagent_containers/food/snacks/bowl/puffpuffs/update_icon() switch(reagents.total_volume) if(1 to 8) diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm index 0d095f32d3d..3e28d2a4388 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm @@ -211,3 +211,12 @@ icon_state = "vkrexiwrap_veggie" reagents_to_add = list(/singleton/reagent/nutriment = 9, /singleton/reagent/capsaicin = 4, /singleton/reagent/mental/vkrexi = 2) reagent_data = list(/singleton/reagent/nutriment = list("assorted vegetables" = 8, "peppers" = 5, "bittersweet sauce" = 8)) + +/obj/item/reagent_containers/food/snacks/phoron_river_loaf + name = "phoron river loaf" + desc = "A new creation. It is a small baked loaf made of reshaped fried K'ois molded into two mounds, with one river of phoron rock candy running between them, and another one through the center of the loaf. It is carefully baked to give it a mixture of both fluffiness and crunch." + icon = 'icons/obj/item/reagent_containers/food/cultural/vaurca.dmi' + icon_state = "phoron_river_loaf" + filling_color = "#E6E600" + reagents_to_add = list(/singleton/reagent/kois = 15, /singleton/reagent/toxin/phoron = 35) + bitesize = 10 diff --git a/code/modules/reagents/reagent_containers/food/snacks/noodles.dm b/code/modules/reagents/reagent_containers/food/snacks/noodles.dm index 89da50e8a35..1a01a087c83 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/noodles.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/noodles.dm @@ -129,28 +129,32 @@ bitesize = 3 /obj/item/reagent_containers/food/snacks/ravioli + abstract_type = /obj/item/reagent_containers/food/snacks/ravioli icon = 'icons/obj/item/reagent_containers/food/noodles.dmi' icon_state = "ravioli" trash = /obj/item/trash/plate filling_color = "#e9c880" center_of_mass = list("x"=16, "y"=10) reagents_to_add = list(/singleton/reagent/nutriment = 6) + bitesize = 2 /obj/item/reagent_containers/food/snacks/ravioli/cheese name = "cheese ravioli" desc = "Ravioli with ricotta filling and creamy tomato sauce." - reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 5, "ricotta cheese" = 5, "tomato sauce" = 5)) + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein/cheese = 5) + reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 5, "tomato sauce" = 5), /singleton/reagent/nutriment/protein/cheese = list("ricotta cheese" = 10)) /obj/item/reagent_containers/food/snacks/ravioli/meat name = "meat ravioli" icon_state = "raviolimeat" desc = "Ravioli with ground meat filling and creamy tomato sauce." - reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 3) + reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 6) reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 5, "tomato sauce" = 5), /singleton/reagent/nutriment/protein = list ("ground meat" = 5)) /obj/item/reagent_containers/food/snacks/ravioli/earthenroot name = "earthenroot ravioli" icon_state = "veganravioli" desc = "This bizzarely colored dish is not actually Tajaran in origin, but the Earthenroot pasta, together with the creamy tomato sauce makes for a pink-and blue dish that's vegan, delicious, and truly bizzare to look at." + reagents_to_add = list(/singleton/reagent/nutriment = 8) reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 5, "pumpkin squash" = 5, "creamy sauce" = 5)) filling_color = "#80d1e9" diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index f9162273bb5..e03650674a5 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -9,8 +9,7 @@ icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' icon_state = "muffin" filling_color = "#E0CF9B" - center_of_mass = list("x"=17, "y"=4) - reagents_to_add = list(/singleton/reagent/nutriment = 6) + reagents_to_add = list(/singleton/reagent/nutriment = 5) reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 3, "muffin" = 3)) bitesize = 2 @@ -20,7 +19,6 @@ icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' icon_state = "berrymuffin" filling_color = "#E0CF9B" - center_of_mass = list("x"=17, "y"=4) reagents_to_add = list(/singleton/reagent/nutriment = 5) reagent_data = list(/singleton/reagent/nutriment = list("sweetness" = 1, "muffin" = 2, "berries" = 2)) diff --git a/html/changelogs/Tomixcomics-Foodtweaksandmilksahkes.yml b/html/changelogs/Tomixcomics-Foodtweaksandmilksahkes.yml new file mode 100644 index 00000000000..92ede9c4559 --- /dev/null +++ b/html/changelogs/Tomixcomics-Foodtweaksandmilksahkes.yml @@ -0,0 +1,48 @@ +################################ +# 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 7 new kinds of milkshakes" + - rscadd: "Added multiple new food dishes" + - bugfix: "Added missing sprite for wooden platter" + - bugfix: "Made slices of bread, who have no plate under them, no longer spawn a plate when you're done eating them." + - bugfix: "Fixed error where certain food bowls couldn't be picked up." + - tweak: "Changed recipe for Doner Kebab to include Pitas instead of flat dough" + - tweak: "Made the recipe for muffins create several muffins at once, increased amount of ingredients needed." + - tweak: "Made Ravioli be more filling." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index af1a6d9106d..df709659264 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.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 90698d4485a..a032ac9d889 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 diff --git a/icons/obj/item/reagent_containers/food/cultural/vaurca.dmi b/icons/obj/item/reagent_containers/food/cultural/vaurca.dmi index 5f000ca0698..9419a01da4d 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/vaurca.dmi and b/icons/obj/item/reagent_containers/food/cultural/vaurca.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index df6b062b19f..195ff78861a 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ