diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 5557c0d0a4c..ce4f94b9d19 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -331,3 +331,10 @@ icon_state = "wooden_platter" drop_sound = 'sound/items/drop/bottle.ogg' pickup_sound = 'sound/items/pickup/bottle.ogg' + +/obj/item/trash/custard_bowl + name = "custard bowl" + desc = "It smells tasty... Wait, why are you smelling it? It's trash!" + icon_state = "custard_bowl" + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm index bfb9a2f3f8d..e16d32ae250 100644 --- a/code/game/objects/random/loot.dm +++ b/code/game/objects/random/loot.dm @@ -161,7 +161,7 @@ /obj/item/device/synthesized_instrument/violin = 0.1, /obj/item/device/synthesized_instrument/guitar = 1, /obj/item/device/synthesized_instrument/trumpet = 0.25, - /obj/item/storage/box/fancy/food/pralinebox = 0.2 + /obj/item/storage/box/fancy/food/pralinebox = 0.1 ) /obj/random/highvalue diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index 9defd4725b4..07bf88fb1dd 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -171,6 +171,24 @@ ) result = /obj/item/reagent_containers/food/snacks/stuffing +/singleton/recipe/angry_bread + appliance = OVEN + fruit = list("carrot" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/flatbread, + /obj/item/reagent_containers/food/snacks/xenomeat, + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + result = /obj/item/reagent_containers/food/snacks/angry_bread + +/singleton/recipe/angry_bread/make_food(obj/container) // removing some reagents instead of using RECIPE_REAGENT_REPLACE so anything that's in the original meat you use is still in the final dish (namely whether or not the meat you use has polytrinic acid). + . = ..() + var/list/results = . + for(var/thing in results) + var/obj/item/xmg = thing + xmg.reagents.del_reagent(/singleton/reagent/drink/carrotjuice) + xmg.reagents.del_reagent(/singleton/reagent/nutriment/protein/cheese) + //================================ // Toasts and Toasted Sandwiches //================================ diff --git a/code/modules/cooking/recipes/recipes_confections.dm b/code/modules/cooking/recipes/recipes_confections.dm index 0a587bceeaf..643c69e06eb 100644 --- a/code/modules/cooking/recipes/recipes_confections.dm +++ b/code/modules/cooking/recipes/recipes_confections.dm @@ -111,3 +111,9 @@ /obj/item/reagent_containers/food/snacks/cutlet ) result = /obj/item/reagent_containers/food/snacks/crepe/hamcheese + +/singleton/recipe/custard + appliance = SAUCEPAN | POT + reagents = list(/singleton/reagent/drink/milk = 5, /singleton/reagent/sugar = 5, /singleton/reagent/nutriment/protein/egg = 3) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/custard diff --git a/code/modules/cooking/recipes/recipes_eggs.dm b/code/modules/cooking/recipes/recipes_eggs.dm index 57b22855aab..5616dbb3642 100644 --- a/code/modules/cooking/recipes/recipes_eggs.dm +++ b/code/modules/cooking/recipes/recipes_eggs.dm @@ -71,3 +71,14 @@ reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here reagents = list(/singleton/reagent/spacespice = 2, /singleton/reagent/blackpepper = 1, /singleton/reagent/nutriment/protein/egg = 6) result = /obj/item/reagent_containers/food/snacks/shakshouka + +/singleton/recipe/eggs_benedict + appliance = MIX + reagents = list(/singleton/reagent/nutriment/protein/egg = 3, /singleton/reagent/blackpepper = 1) + items = list( + /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit, + /obj/item/reagent_containers/food/snacks/poachedegg, + /obj/item/reagent_containers/food/snacks/cutlet + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/eggs_benedict diff --git a/code/modules/cooking/recipes/recipes_fryer.dm b/code/modules/cooking/recipes/recipes_fryer.dm index d5c92e5e35e..b0313aacce7 100644 --- a/code/modules/cooking/recipes/recipes_fryer.dm +++ b/code/modules/cooking/recipes/recipes_fryer.dm @@ -85,6 +85,23 @@ ) result = /obj/item/reagent_containers/food/snacks/roefritters +/singleton/recipe/fries_olympia_cheesy + appliance = FRYER + reagents = list(/singleton/reagent/spacespice = 3) + fruit = list("potato" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + reagent_mix = RECIPE_REAGENT_REPLACE //So we don't end up with a ton of potato juice + result = /obj/item/reagent_containers/food/snacks/fries_olympia_with_cheese + +/singleton/recipe/fries_olympia_no_cheese + appliance = FRYER + reagents = list(/singleton/reagent/spacespice = 3) + fruit = list("potato" = 1) + reagent_mix = RECIPE_REAGENT_REPLACE //So we don't end up with a ton of potato juice + result = /obj/item/reagent_containers/food/snacks/fries_olympia + //Fishy Recipes //================== /singleton/recipe/fishandchips diff --git a/code/modules/reagents/reagent_containers/food/snacks/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm index e2ec666957f..7d5c1d092da 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm @@ -322,6 +322,17 @@ reagent_data = list(/singleton/reagent/nutriment = list("dryness" = 2, "bread" = 2)) bitesize = 1 +/obj/item/reagent_containers/food/snacks/angry_bread + name = "angry bread" + desc = "Slices of flatbread with strips of grilled or ground xenomeat lying on top of thinly sliced grilled carrots, topped with walnuts, spices and/or grated cheddar. This recipe was created by a miner from New Gibson who runs a food blog." + icon = 'icons/obj/item/reagent_containers/food/bread.dmi' + icon_state = "angrybread" + bitesize = 5 + trash = /obj/item/trash/plate + filling_color = "#1d5a25" + reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/nutriment/protein = 9) + reagent_data = list(/singleton/reagent/nutriment = list("toasted bread" = 10, "carrot" = 6), /singleton/reagent/nutriment/protein = list("nutty umami meat" = 10, "cheese" = 5)) + //================================ // Toasts and Toasted Sandwiches //================================ diff --git a/code/modules/reagents/reagent_containers/food/snacks/confections.dm b/code/modules/reagents/reagent_containers/food/snacks/confections.dm index cced7194605..8901e567993 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/confections.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/confections.dm @@ -199,3 +199,41 @@ reagents_to_add = list(/singleton/reagent/nutriment = 5) reagent_data = list(/singleton/reagent/nutriment = list("chives" = 2)) bitesize = 3 + +/obj/item/reagent_containers/food/snacks/custard + name = "custard" + desc = "A lovely dessert that can also be used to make other, much less lazy desserts." + icon = 'icons/obj/item/reagent_containers/food/confections.dmi' + icon_state = "custard" + trash = /obj/item/trash/custard_bowl + filling_color = "#ebedc2" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/egg = 2, /singleton/reagent/nutriment/glucose = 5) + reagent_data = list(/singleton/reagent/nutriment = list("custard" = 5)) + bitesize = 2 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' + is_liquid = TRUE + +//Custard + blowtorch = creme brulee +/obj/item/reagent_containers/food/snacks/custard/attackby(obj/item/W, mob/living/user) + . = ..() + if(W.iswelder()) + var/obj/item/weldingtool/welder = W + if(welder.isOn()) + new /obj/item/reagent_containers/food/snacks/creme_brulee(src) + to_chat(user, "You apply the flame to the sugary custard, caramelizing it.") + playsound(get_turf(src), 'sound/items/flare.ogg', 100, 1) + qdel(src) + +/obj/item/reagent_containers/food/snacks/creme_brulee + name = "creme brulee" + desc = "You know what would makes a nice, sweet dessert better? A BLOWTORCH!" + icon = 'icons/obj/item/reagent_containers/food/confections.dmi' + icon_state = "brulee" + trash = /obj/item/trash/custard_bowl + filling_color = "#e9c35b" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/egg = 1, /singleton/reagent/nutriment/glucose = 2, /singleton/reagent/nutriment/caramel = 4) + reagent_data = list(/singleton/reagent/nutriment = list("custard" = 5)) + bitesize = 2 + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' 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 37bb3d35b53..5d65136b493 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/unathi.dm @@ -101,7 +101,7 @@ /obj/item/reagent_containers/food/snacks/bacon_stick name = "eggpop" desc = "A bacon wrapped boiled egg, conviently skewered on a wooden stick." - icon = 'icons/obj/item/reagent_containers/food/egg.dmi' + icon = 'icons/obj/item/reagent_containers/food/cultural/unathi.dmi' icon_state = "bacon_stick" reagents_to_add = list(/singleton/reagent/nutriment/protein = 3, /singleton/reagent/nutriment/protein/egg = 1) filling_color = "#FFFEE8" diff --git a/code/modules/reagents/reagent_containers/food/snacks/eggs.dm b/code/modules/reagents/reagent_containers/food/snacks/eggs.dm index 3f2a77d2d43..fc79e35e5ed 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/eggs.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/eggs.dm @@ -202,3 +202,14 @@ reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 3, /singleton/reagent/nutriment = 4) reagent_data = list(/singleton/reagent/nutriment = list("zesty tomatoes" = 4)) filling_color = "#BB2912" + +/obj/item/reagent_containers/food/snacks/eggs_benedict + name = "eggs benedict" + gender = PLURAL + desc = "A dish consisting of poached eggs and sliced ham on half a toasted english muffin, then covered with hollandaise sauce. Usually served in pairs." + icon = 'icons/obj/item/reagent_containers/food/egg.dmi' + icon_state = "benedict" + reagents_to_add = list(/singleton/reagent/nutriment/protein/egg = 6, /singleton/reagent/nutriment/protein = 2, /singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment/protein/egg = list("rich, creamy eggs" = 10), /singleton/reagent/nutriment = list("toasted bread" = 5, "ham" = 3)) + filling_color = "#ebcd49" + bitesize = 3 diff --git a/code/modules/reagents/reagent_containers/food/snacks/fryer.dm b/code/modules/reagents/reagent_containers/food/snacks/fryer.dm index b7af1326b92..470d8e73c9e 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/fryer.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/fryer.dm @@ -385,3 +385,25 @@ filling_color = "#74812c" reagents_to_add = list(/singleton/reagent/nutriment = 3) reagent_data = list(/singleton/reagent/nutriment = list("fried chickpeas" = 3)) + +/obj/item/reagent_containers/food/snacks/fries_olympia_with_cheese + name = "fries olympia with cheese" + gender = PLURAL + desc = "A simple Martian street food dish of crispy spiral-cut potatoes that are cut in two, deep fried, coated in paprika, and optionally covered in molten cheese. This is the cheesy version! It is sometimes called 'Chips Olympia', especially after 'Fries Olympia' became the punch line to a bunch of dark jokes about Violet Dawn." + icon = 'icons/obj/item/reagent_containers/food/fryer.dmi' + icon_state = "fries_olympia_cheesy" + filling_color = "#c0871d" + bitesize = 3 + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/triglyceride/oil = 1.2, /singleton/reagent/capsaicin = 2, /singleton/reagent/nutriment/protein/cheese = 3) + reagent_data = list(/singleton/reagent/nutriment = list("crispy potato" = 5), /singleton/reagent/capsaicin = list("paprika" = 5)) + +/obj/item/reagent_containers/food/snacks/fries_olympia + name = "fries olympia" + gender = PLURAL + desc = "A simple Martian street food dish of crispy spiral-cut potatoes that are cut in two, deep fried, coated in paprika, and optionally covered in molten cheese. This is the non-cheesy version! It is sometimes called 'Chips Olympia', especially after 'Fries Olympia' became the punch line to a bunch of dark jokes about Violet Dawn." + icon = 'icons/obj/item/reagent_containers/food/fryer.dmi' + icon_state = "fries_olympia_no_cheese" + filling_color = "#c0871d" + bitesize = 3 + reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/triglyceride/oil = 1.2, /singleton/reagent/capsaicin = 2) + reagent_data = list(/singleton/reagent/nutriment = list("crispy potato" = 5), /singleton/reagent/capsaicin = list("paprika" = 5)) diff --git a/html/changelogs/TOMIXCOMICS-PR.yml b/html/changelogs/TOMIXCOMICS-PR.yml new file mode 100644 index 00000000000..a3d0ae90625 --- /dev/null +++ b/html/changelogs/TOMIXCOMICS-PR.yml @@ -0,0 +1,43 @@ +################################ +# 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 multiple new foods." + - bugfix: "Corrected missing eggpop icon" + - tweak: "Nerfed how often praline boxes show up in maintenance because it was way too often." diff --git a/icons/obj/item/reagent_containers/food/bread.dmi b/icons/obj/item/reagent_containers/food/bread.dmi index 557f6c3dab9..7694169526a 100644 Binary files a/icons/obj/item/reagent_containers/food/bread.dmi and b/icons/obj/item/reagent_containers/food/bread.dmi differ diff --git a/icons/obj/item/reagent_containers/food/confections.dmi b/icons/obj/item/reagent_containers/food/confections.dmi index 8b2bd73ba65..ec2e6173315 100644 Binary files a/icons/obj/item/reagent_containers/food/confections.dmi and b/icons/obj/item/reagent_containers/food/confections.dmi differ diff --git a/icons/obj/item/reagent_containers/food/egg.dmi b/icons/obj/item/reagent_containers/food/egg.dmi index 1b3866ff57f..af3f183307f 100644 Binary files a/icons/obj/item/reagent_containers/food/egg.dmi and b/icons/obj/item/reagent_containers/food/egg.dmi differ diff --git a/icons/obj/item/reagent_containers/food/fryer.dmi b/icons/obj/item/reagent_containers/food/fryer.dmi index b92e9a93c09..80470fcc416 100644 Binary files a/icons/obj/item/reagent_containers/food/fryer.dmi and b/icons/obj/item/reagent_containers/food/fryer.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 195ff78861a..af949943519 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ