diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 03524b5f76e..e1ca9260569 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -234,7 +234,9 @@ /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp, /obj/item/reagent_containers/food/snacks/sliceable/sushi_roll, /obj/item/reagent_containers/food/snacks/stuffed_meatball, - /obj/item/reagent_containers/food/snacks/chilied_eggs) + /obj/item/reagent_containers/food/snacks/chilied_eggs, + /obj/item/reagent_containers/food/snacks/sliceable/eyebowl, + /obj/item/reagent_containers/food/snacks/hatchbowl) /datum/bounty/item/chef/tajara name = "Adhomai Delicacies" diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index 6bede37d2c2..c958f420e5a 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -337,3 +337,12 @@ 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 + +/singleton/recipe/pazillo + appliance = OVEN + fruit = list ("tomato" = 1 , "chickpeas" = 1, "onion" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough + ) + result = /obj/item/reagent_containers/food/snacks/pazillo + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify and replace so it's not full of juice diff --git a/code/modules/cooking/recipes/cultural/recipes_unathi.dm b/code/modules/cooking/recipes/cultural/recipes_unathi.dm index 3f8b93c5cc8..0753a09113d 100644 --- a/code/modules/cooking/recipes/cultural/recipes_unathi.dm +++ b/code/modules/cooking/recipes/cultural/recipes_unathi.dm @@ -177,3 +177,13 @@ /obj/item/reagent_containers/food/snacks/egg ) result = /obj/item/reagent_containers/food/snacks/aghrasshcake + +/singleton/recipe/eyebowl + appliance = SAUCEPAN | POT + fruit = list("aghrassh nut" = 1, "tomato" = 1) + reagents = list(/singleton/reagent/blackpepper = 2, /singleton/reagent/nutriment/protein/egg = 6) + items = list( + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/eyebowl + reagent_mix = RECIPE_REAGENT_REPLACE diff --git a/code/modules/cooking/recipes/recipes_baked.dm b/code/modules/cooking/recipes/recipes_baked.dm index f3525f4b168..ea6edb8a276 100644 --- a/code/modules/cooking/recipes/recipes_baked.dm +++ b/code/modules/cooking/recipes/recipes_baked.dm @@ -66,3 +66,33 @@ appliance = OVEN items = list(/obj/item/reagent_containers/food/snacks/donkpocket/takoyaki) result = /obj/item/reagent_containers/food/snacks/donkpocket/takoyaki/warm + +/singleton/recipe/meat_lasagna_tray + appliance = OVEN + fruit = list("tomato" = 3) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/meat, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/meat_lasagna_tray + reagent_mix = RECIPE_REAGENT_REPLACE //Replacing the ingredients and filling in a bit extra for simplicity's sake + +/singleton/recipe/veggie_lasagna_tray + appliance = OVEN + fruit = list("tomato" = 3, "eggplant" = 1, "onion" = 1, "mushroom" = 2) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/sliceable/flatdough, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/sliceable/veggie_lasagna_tray + reagent_mix = RECIPE_REAGENT_REPLACE //Replacing the ingredients and filling in a bit extra for simplicity's sake diff --git a/code/modules/cooking/recipes/recipes_meat.dm b/code/modules/cooking/recipes/recipes_meat.dm index 44cabb4530c..46ae244a29a 100644 --- a/code/modules/cooking/recipes/recipes_meat.dm +++ b/code/modules/cooking/recipes/recipes_meat.dm @@ -102,18 +102,6 @@ result = /obj/item/reagent_containers/food/snacks/nugget result_quantity = 4 -/singleton/recipe/lasagna - appliance = OVEN - fruit = list("tomato" = 2, "eggplant" = 1) - items = list( - /obj/item/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/reagent_containers/food/snacks/sliceable/flatdough, - /obj/item/reagent_containers/food/snacks/meat, - /obj/item/reagent_containers/food/snacks/meat - ) - result = /obj/item/reagent_containers/food/snacks/lasagna - reagent_mix = RECIPE_REAGENT_REPLACE - /singleton/recipe/donerkebab fruit = list("tomato" = 1, "cabbage" = 1) reagents = list(/singleton/reagent/sodiumchloride = 1, /singleton/reagent/spacespice = 1) diff --git a/code/modules/cooking/recipes/recipes_pastries.dm b/code/modules/cooking/recipes/recipes_pastries.dm index 049d6ca657a..0e613ba0a7a 100644 --- a/code/modules/cooking/recipes/recipes_pastries.dm +++ b/code/modules/cooking/recipes/recipes_pastries.dm @@ -29,14 +29,18 @@ /singleton/recipe/pancakes appliance = SKILLET + reagents = list(/singleton/reagent/sugar = 5) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough - ) + ) result = /obj/item/reagent_containers/food/snacks/pancakes - result_quantity = 1 -/singleton/recipe/pancakes/berry +/singleton/recipe/pancakes/berry //alternate way to get berry pancakes if you want to use actual berries and not syrup. fruit = list("berries" = 1) + reagents = list(/singleton/reagent/sugar = 5) + items = list( + /obj/item/reagent_containers/food/snacks/sliceable/flatdough + ) result = /obj/item/reagent_containers/food/snacks/pancakes/berry ////////////////////////////////////////////WAFFLES//////////////////////////////////////////// @@ -211,6 +215,11 @@ ) result = /obj/item/reagent_containers/food/snacks/sliceable/cake/NTellacheesecake +/singleton/recipe/cake/starcake + fruit = list("orange" = 1) + reagents = list(/singleton/reagent/nutriment/flour = 10, /singleton/reagent/sugar = 15, /singleton/reagent/nutriment/coco = 10, /singleton/reagent/drink/milk/cream = 5, /singleton/reagent/nutriment/protein/egg = 6) + result = /obj/item/reagent_containers/food/snacks/sliceable/cake/starcake + //Predesigned pies //======================= /singleton/recipe/berryclafoutis 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 8e2535f3b02..a46e88da533 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2191,7 +2191,7 @@ description = "A simple syrup that tastes strongly of mint." color = "#539830" taste_description = "mint" - + taste_mult = 5 glass_icon_state = "mint_syrupglass" glass_name = "glass of mint syrup" glass_desc = "Pure mint syrup. Prepare your tastebuds." @@ -5814,6 +5814,7 @@ color = "#542a0c" glass_name = "chocolate syrup" glass_desc = "Thick chocolate syrup used to flavor drinks." + taste_mult = 5 /singleton/reagent/drink/syrup_caramel name = "Caramel Syrup" @@ -5822,6 +5823,7 @@ color = "#85461e" glass_name = "caramel syrup" glass_desc = "Thick caramel syrup used to flavor drinks." + taste_mult = 5 /singleton/reagent/drink/syrup_vanilla name = "Vanilla Syrup" @@ -5830,6 +5832,7 @@ color = "#f3e5ab" glass_name = "vanilla syrup" glass_desc = "Thick vanilla syrup used to flavor drinks." + taste_mult = 5 /singleton/reagent/drink/syrup_pumpkin name = "Pumpkin Spice Syrup" @@ -5838,6 +5841,8 @@ color = "#d88b4c" glass_name = "pumpkin spice syrup" glass_desc = "Thick spiced pumpkin syrup used to flavor drinks." + taste_mult = 5 + //berry /singleton/reagent/drink/syrup_berry name = "Berry Syrup" @@ -5846,6 +5851,8 @@ color = "#c00726" glass_name = "berry syrup" glass_desc = "Thick berry syrup used to flavor drinks." + taste_mult = 5 + //strawberry /singleton/reagent/drink/syrup_strawberry name = "Strawberry Syrup" @@ -5854,6 +5861,8 @@ color = "#b40000" glass_name = "strawberry syrup" glass_desc = "Thick strawberry syrup used to flavor drinks." + taste_mult = 5 + //blueberry /singleton/reagent/drink/syrup_blueberry name = "Blueberry Syrup" @@ -5862,6 +5871,8 @@ color = "#0a0094" glass_name = "blueberry syrup" glass_desc = "Thick blueberry syrup used to flavor drinks." + taste_mult = 5 + //rasp /singleton/reagent/drink/syrup_raspberry name = "Raspberry Syrup" @@ -5870,6 +5881,8 @@ color = "#ad0042" glass_name = "raspberry syrup" glass_desc = "Thick raspberry syrup used to flavor drinks." + taste_mult = 5 + //black rasp /singleton/reagent/drink/syrup_blackraspberry name = "Black Raspberry Syrup" @@ -5878,6 +5891,8 @@ color = "#1b1618" glass_name = "black raspberry syrup" glass_desc = "Thick black raspberry syrup used to flavor drinks." + taste_mult = 5 + //blue rasp /singleton/reagent/drink/syrup_blueraspberry name = "Blue Raspberry Syrup" @@ -5886,6 +5901,8 @@ color = "#21154d" glass_name = "blue raspberry syrup" glass_desc = "Thick blue raspberry syrup used to flavor drinks." + taste_mult = 5 + //glow /singleton/reagent/drink/syrup_glowberry name = "Glowberry Syrup" @@ -5894,6 +5911,8 @@ color = "#f3e5ab" glass_name = "glowberry syrup" glass_desc = "Thick glowberry syrup used to flavor drinks." + taste_mult = 5 + //poison /singleton/reagent/drink/syrup_poisonberry name = "Poison Berry Syrup" @@ -5902,6 +5921,8 @@ color = "#f3e5ab" glass_name = "poison berry syrup" glass_desc = "Thick poison berry syrup used to flavor drinks." + taste_mult = 5 + //death /singleton/reagent/drink/syrup_deathberry name = "Death Berry Syrup" @@ -5910,6 +5931,8 @@ color = "#f3e5ab" glass_name = "death berry syrup" glass_desc = "Thick death berry syrup used to flavor drinks." + taste_mult = 5 + //ylpha /singleton/reagent/drink/syrup_ylphaberry name = "Ylpha Berry Syrup" @@ -5918,6 +5941,8 @@ color = "#790042" glass_name = "ylpha berry syrup" glass_desc = "Thick ylpha berry syrup used to flavor drinks." + taste_mult = 5 + //dirt /singleton/reagent/drink/syrup_dirtberry name = "Dirt Berry Syrup" @@ -5926,7 +5951,7 @@ color = "#85572c" glass_name = "dirt berry syrup" glass_desc = "Thick dirt berry syrup used to flavor drinks." - + taste_mult = 5 /singleton/reagent/drink/syrup_simple name = "Simple Syrup" @@ -5947,6 +5972,7 @@ reagent_state = LIQUID description = "A caramel-based sauce. Now you're caramel dancin'." taste_description = "toasty sweet cream" + taste_mult = 2 /singleton/reagent/diona_powder name = "Dionae Powder" diff --git a/code/modules/reagents/reagent_containers/food/snacks/baked.dm b/code/modules/reagents/reagent_containers/food/snacks/baked.dm index af0846a6023..6b0c5c8dc64 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/baked.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/baked.dm @@ -131,3 +131,69 @@ reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/drugs/psilocybin = 6) reagent_data = list(/singleton/reagent/nutriment = list("mushroom" = 6)) bitesize = 3 + +/obj/item/reagent_containers/food/snacks/sliceable/meat_lasagna_tray + name = "meat lasagna tray" + desc = "Who doesn't love a hot, meaty, cheesy lasagna? Don't worry, there's enough in this tray for everyone! Assuming 'everyone' is 6 people and nobody wants seconds." + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "lasagnatray_meat" + slice_path = /obj/item/reagent_containers/food/snacks/lasagna_meat_slice + slices_num = 6 + trash = /obj/item/trash/grease + drop_sound = /singleton/sound_category/tray_hit_sound + center_of_mass = list("x"=16, "y"=17) + filling_color = "#e08b2a" + reagents_to_add = list(/singleton/reagent/nutriment = 24, /singleton/reagent/nutriment/protein = 24, /singleton/reagent/nutriment/protein/cheese = 12) + reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 4, "tomato" = 2)) + bitesize = 6 + +/obj/item/reagent_containers/food/snacks/lasagna_meat_slice + name = "meat lasagna" + desc = "Not Adhomian food, yet... Very popular among Tajarans on Mondays for some reason." + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "lasagna_meat" + trash = /obj/item/trash/plate + filling_color = "#e08b2a" + bitesize = 2 + center_of_mass = list("x"=16, "y"=12) + +/obj/item/reagent_containers/food/snacks/lasagna_meat_slice/update_icon() + var/percent_lasagna_meat_slice = round((reagents.total_volume / 10) * 100) + switch(percent_lasagna_meat_slice) + if(0 to 50) + icon_state = "lasagna_meat_half" + if(51 to INFINITY) + icon_state = "lasagna_meat" + +/obj/item/reagent_containers/food/snacks/sliceable/veggie_lasagna_tray + name = "veggie lasagna tray" + desc = "Cheesy, delicious, and vegetarian! Don't worry, there's enough in this tray for everyone! Assuming 'everyone' is 6 people and nobody wants seconds." + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "lasagnatray_veg" + slice_path = /obj/item/reagent_containers/food/snacks/lasagna_veggie_slice + slices_num = 6 + trash = /obj/item/trash/grease + drop_sound = /singleton/sound_category/tray_hit_sound + center_of_mass = list("x"=16, "y"=17) + filling_color = "#e08b2a" + reagents_to_add = list(/singleton/reagent/nutriment = 48, /singleton/reagent/nutriment/protein/cheese = 12) + reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 4, "tomato" = 2, "mushrooms" = 2)) + bitesize = 6 + +/obj/item/reagent_containers/food/snacks/lasagna_veggie_slice + name = "veggie lasagna" + desc = "Layers of pasta, sauce, veggies and mushrooms carefully stacked on each other into an apartment block of deliciousness." + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "lasagna_veg" + trash = /obj/item/trash/plate + filling_color = "#e08b2a" + bitesize = 3 + center_of_mass = list("x"=16, "y"=12) + +/obj/item/reagent_containers/food/snacks/lasagna_veggie_slice/update_icon() + var/percent_lasagna_veggie_slice = round((reagents.total_volume / 10) * 100) + switch(percent_lasagna_veggie_slice) + if(0 to 50) + icon_state = "lasagna_veg_half" + if(51 to INFINITY) + icon_state = "lasagna_veg" 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 f46ba79abe2..6f22b0de2f3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -618,3 +618,23 @@ icon_state = "ladylulaine_slice" filling_color = "#dbddff" trash = /obj/item/trash/plate + +/obj/item/reagent_containers/food/snacks/pazillo + name = "pazillo" + desc = "A simple handheld pastry that originates from Assunzione, this is a calzone filled with a mixture of ground chickpeas, onions and tomatoes mixed together. It is sometimes served with olive oil, artichoke spread, or garlic sauce, but can also be eaten on it's own. It's tradtionally considered street food, but can occasionally be found in proper restaurants." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "pazillo" + filling_color = "#5c802e" + reagents_to_add = list(/singleton/reagent/nutriment/ = 8) + bitesize = 2 + reagent_data = list(/singleton/reagent/nutriment = list("dough" = 5, "chickpeas" = 3, "onion" = 3, "tomato" = 3)) + +/obj/item/reagent_containers/food/snacks/pazillo/update_icon() + var/percent_pazillo = round((reagents.total_volume / 8) * 100) + switch(percent_pazillo) + if(0 to 50) + icon_state = "pazillo_small" + if(51 to 95) + icon_state = "pazillo_bitten" + if(96 to INFINITY) + icon_state = "pazillo" diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm index 5d65136b493..e01349eff66 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm @@ -190,3 +190,29 @@ reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 8, /singleton/reagent/nutriment/coco = 3, /singleton/reagent/blackpepper = 3) reagent_data = list(/singleton/reagent/nutriment = list("aghrassh nuts" = 3, "mealy paste" = 3)) bitesize = 5 + +/obj/item/reagent_containers/food/snacks/sliceable/eyebowl + name = "eyebowl" + desc = "A zesty stew of ground meat, Moghesian tomato pulp, and ground agghrash nut mixed together and topped with two egg yolks staring back at you like eyes. It can be made with different kinds of meat, and seasoned with either hot sauce or blood. This is a large serving, typically reserved for hungry Unathi, miners, or other folks who have to get by on one big meal to last them a whole day." + icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' + icon_state = "eyebowl" + trash = /obj/item/trash/custard_bowl + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 12, /singleton/reagent/blackpepper = 2) + reagent_data = list(/singleton/reagent/nutriment = list("aghrassh nuts" = 3, "zesty tomatoes" = 5)) + bitesize = 5 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + slice_path = /obj/item/reagent_containers/food/snacks/hatchbowl + slices_num = 2 + filling_color = "#771504" + +/obj/item/reagent_containers/food/snacks/hatchbowl + name = "hatchbowl" + desc = "Short for 'hatchling eyebowl', this zesty stew of ground meat, Moghesian tomato pulp, and ground agghrash nut topped with an egg yolk is a smaller serving of the eyebowl. It is usually eaten by smaller Unathi, non-Unathi species, or by grown Unathi who just aren't all that hungry. The dish spread throughout the spur and is often enjoyed by other species as well. It can be made with different kinds of meat, and seasoned with either hot sauce or blood." + icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' + icon_state = "eyebowl_small" + trash = /obj/item/trash/custard_bowl + bitesize = 3 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 32805676d63..d5b6c2f4212 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -367,20 +367,6 @@ reagents.trans_to(sashimi, transfer_amt) qdel(src) -/obj/item/reagent_containers/food/snacks/lasagna - name = "lasagna" - desc = "Favorite of cats." - icon = 'icons/obj/item/reagent_containers/food/meat.dmi' - icon_state = "lasagna" - trash = /obj/item/trash/grease - drop_sound = /singleton/sound_category/tray_hit_sound - center_of_mass = list("x"=16, "y"=17) - filling_color = "#EDF291" - - reagents_to_add = list(/singleton/reagent/nutriment = 12, /singleton/reagent/nutriment/protein = 12) - reagent_data = list(/singleton/reagent/nutriment = list("pasta" = 4, "tomato" = 2)) - bitesize = 6 - /obj/item/reagent_containers/food/snacks/donerkebab name = "doner kebab" desc = "A delicious sandwich-like food from ancient Earth. The meat is typically cooked on a vertical rotisserie." diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index e03650674a5..4cab138ac2e 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -28,20 +28,63 @@ /obj/item/reagent_containers/food/snacks/pancakes name = "pancakes" + gender = PLURAL desc = "Pancakes, delicious." icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' icon_state = "pancakes" trash = /obj/item/trash/plate reagents_to_add = list(/singleton/reagent/nutriment = 8) reagent_data = list(/singleton/reagent/nutriment = list("pancake" = 8)) - bitesize = 2 - filling_color = "#EDF291" + bitesize = 3 + filling_color = "#facf7e" + +///makes pancakes change their look and name, flavor and description when you add syrup to them instead of having to have them each be an entirely separate food item that has to be made by the cook. This also means ingredient contents carry over if you turn one type of pancake into another. +/obj/item/reagent_containers/food/snacks/pancakes/on_reagent_change() + if(reagents.has_reagent(/singleton/reagent/drink/syrup_chocolate)) + name = "chocolate pancakes" + desc = "Delicious pancakes covered in chocolate syrup." + icon_state = "pancakes_chocolate" + + if(reagents.has_reagent(/singleton/reagent/drink/syrup_berry)) + name = "berry pancakes" + desc = "Delicious pancakes covered in berry syrup." + icon_state = "pancakes_berry" + + if(reagents.has_reagent(/singleton/reagent/drink/syrup_strawberry)) + name = "strawberry pancakes" + desc = "Delicious pancakes covered in strawberry syrup." + icon_state = "pancakes_strawberry" + + if(reagents.has_reagent(/singleton/reagent/drink/syrup_caramel)) + name = "caramel pancakes" + desc = "Delicious pancakes covered in caramel syrup." + icon_state = "pancakes_caramel" + + if(reagents.has_reagent(/singleton/reagent/drink/syrup_vanilla)) + name = "vanilla pancakes" + desc = "Delicious pancakes covered in vanilla syrup." + icon_state = "pancakes_vanilla" + + if(reagents.has_reagent(/singleton/reagent/drink/syrup_pumpkin)) + name = "pumpkin spice pancakes" + desc = "A delicious autumn breakfast." + icon_state = "pancakes_pumpkin" + + if(reagents.has_reagent(/singleton/reagent/drink/syrup_ylphaberry)) + name = "ylpha berry pancakes" + desc = "Overwhelmingly sweet with a side of tangy, a delicious way to wake up!" + icon_state = "pancakes_ylpha" + + if(reagents.has_any_reagent(list(/singleton/reagent/nutriment/ketchup, /singleton/reagent/nutriment/mayonnaise, /singleton/reagent/antidexafen, /singleton/reagent/carbon))) //Because scrubbers and quirky people exist. + name = "ruined pancakes" + desc = "Why? Who hurt you?" + icon_state = "pancakes_ruined" /obj/item/reagent_containers/food/snacks/pancakes/berry name = "berry pancakes" desc = "Pancakes with berries, delicious." icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' - icon_state = "berry_pancakes" + icon_state = "pancakes_berry" ////////////////////////////////////////////WAFFLES//////////////////////////////////////////// @@ -435,6 +478,28 @@ bitesize = 2 center_of_mass = list("x"=16, "y"=14) +/obj/item/reagent_containers/food/snacks/sliceable/cake/starcake // + name = "starcake" + desc = "This pound cake mixes citrus fruits with cocoa, and has a layer of creamy glaze on top. It's dense and relatively simple to make. You can find it in various coffee shops and bakeries around the spur, but for some uknown reason, in the weeping stars system it has become somewhat associated with funerals over the years." + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "starcake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/starcake + slices_num = 6 + filling_color = "#f0b97b" + center_of_mass = list("x"=16, "y"=10) + reagents_to_add = list(/singleton/reagent/nutriment = 15, /singleton/reagent/nutriment/glucose = 3) + reagent_data = list(/singleton/reagent/nutriment = list("cake" = 10, "cocoa" = 10, "orange" = 15)) + +/obj/item/reagent_containers/food/snacks/cakeslice/starcake + name = "orange cake slice" + desc = "A thin slice of pound cake that mixes citrus fruits with cocoa, and has a layer of creamy glaze on top. Enjoyed with a side of coffee or tea all over the spur, in the weeping stars system it is also frequently served in funerals for some reason." + icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' + icon_state = "starcake_slice" + trash = /obj/item/trash/plate + filling_color = "#f0b97b" + bitesize = 2 + center_of_mass = list("x"=16, "y"=14) + //Predesigned pies //======================= /obj/item/reagent_containers/food/snacks/berryclafoutis diff --git a/html/changelogs/TOMIXCOMICS-PR.yml b/html/changelogs/TOMIXCOMICS-PR.yml new file mode 100644 index 00000000000..e464c531cdc --- /dev/null +++ b/html/changelogs/TOMIXCOMICS-PR.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." + - rscdel: "Deleted the old Lasagnas" + - rscadd: "Created new Lasagnas. Bigger, better than ever before! BWA HA HA HA" + - tweak: "Replaces the old, ancient pancakes with newer ones that have a modern sprite, recipe, and multiple sub-types of pancakes based on what syrup you put on them." + - tweak: "Gave flavored syrups a flavor enahncement so they show up more easily when you put them on something." + - tweak: "Added the new Unathi dishes to the Unathi food bounty" diff --git a/icons/obj/item/reagent_containers/food/baked.dmi b/icons/obj/item/reagent_containers/food/baked.dmi index e9e1d5ae71b..bd6965e4152 100644 Binary files a/icons/obj/item/reagent_containers/food/baked.dmi and b/icons/obj/item/reagent_containers/food/baked.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 a032ac9d889..1ddb68ebb97 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/unathi.dmi b/icons/obj/item/reagent_containers/food/cultural/unathi.dmi index c836dbbbda1..3332b247485 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/unathi.dmi and b/icons/obj/item/reagent_containers/food/cultural/unathi.dmi differ diff --git a/icons/obj/item/reagent_containers/food/meat.dmi b/icons/obj/item/reagent_containers/food/meat.dmi index e2b9810860c..8eb8859d9da 100644 Binary files a/icons/obj/item/reagent_containers/food/meat.dmi and b/icons/obj/item/reagent_containers/food/meat.dmi differ diff --git a/icons/obj/item/reagent_containers/food/pastries.dmi b/icons/obj/item/reagent_containers/food/pastries.dmi index 7c6028f1a75..b37ba0e0665 100644 Binary files a/icons/obj/item/reagent_containers/food/pastries.dmi and b/icons/obj/item/reagent_containers/food/pastries.dmi differ