diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index ec0138a6d67..2b44da8bac7 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -113,6 +113,7 @@ /obj/item/reagent_containers/food/drinks/bottle/twentytwoseventyfive = 3, /obj/item/reagent_containers/food/drinks/bottle/saintjacques = 1, /obj/item/reagent_containers/food/drinks/bottle/hooch = 1, + /obj/item/reagent_containers/food/drinks/bottle/nemiik = 2, /obj/item/reagent_containers/food/drinks/cans/grape_juice = 6, /obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2, /obj/item/reagent_containers/food/drinks/cans/sodawater = 15, diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 3d1f30dc669..16da3ca8fc3 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -400,3 +400,9 @@ /obj/item/trash/papad/apple icon_state = "papadapple_trash" +/obj/item/trash/bowl_small + name = "small bowl" + desc = "A side dish used to live here, but then it moved out." + icon_state = "small_bowl" + drop_sound = 'sound/items/drop/glass.ogg' + pickup_sound = 'sound/items/pickup/glass.ogg' diff --git a/code/modules/cooking/recipes/cultural/recipes_human.dm b/code/modules/cooking/recipes/cultural/recipes_human.dm index e5eca483dc8..decf2234e90 100644 --- a/code/modules/cooking/recipes/cultural/recipes_human.dm +++ b/code/modules/cooking/recipes/cultural/recipes_human.dm @@ -171,11 +171,20 @@ ) result = /obj/item/reagent_containers/food/snacks/hash_browns +/singleton/recipe/alfajores + appliance = OVEN + reagents = list(/singleton/reagent/sugar = 15, /singleton/reagent/nutriment/flour = 10, /singleton/reagent/drink/milk = 10) + items = list( + /obj/item/reagent_containers/food/snacks/spreads/butter + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/reagent_containers/food/snacks/bowl/alfajores + // Konyang /singleton/recipe/mossbowl appliance = SAUCEPAN | POT - reagents = list(/singleton/reagent/water = 5, /singleton/reagent/nutriment/protein/egg = 3) + reagents = list(/singleton/reagent/water = 5, /singleton/reagent/nutriment/flour = 10) fruit = list("moss" = 2) result = /obj/item/reagent_containers/food/snacks/mossbowl @@ -460,3 +469,15 @@ ) result = /obj/item/reagent_containers/food/snacks/steelworkersandwich reagent_mix = RECIPE_REAGENT_REPLACE + +//Gadpathur +/singleton/recipe/paneer_gadpathur + appliance = SAUCEPAN | POT + result = /obj/item/reagent_containers/food/snacks/paneer_gadpathur + fruit = list ("tomato" = 1, "chili" = 1) + reagents = list(/singleton/reagent/drink/milk/cream = 5, /singleton/reagent/nutriment/rice = 5) + items = list( + /obj/item/reagent_containers/food/snacks/cheesewedge + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/paneer_gadpathur diff --git a/code/modules/cooking/recipes/cultural/recipes_skrell.dm b/code/modules/cooking/recipes/cultural/recipes_skrell.dm index c35afd67d88..4c101881017 100644 --- a/code/modules/cooking/recipes/cultural/recipes_skrell.dm +++ b/code/modules/cooking/recipes/cultural/recipes_skrell.dm @@ -100,3 +100,14 @@ result = /obj/item/reagent_containers/food/snacks/qlguabi reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/qlguabi + +/singleton/recipe/konaqu + appliance = FRYER + fruit = list("q'lort" = 1, "ylpha" = 1) + reagents = list(/singleton/reagent/sugar = 10) + items = list( + /obj/item/reagent_containers/food/snacks/dough + ) + reagent_mix = RECIPE_REAGENT_REPLACE + result = /obj/item/reagent_containers/food/snacks/konaqu + result_quantity = 2 diff --git a/code/modules/cooking/recipes/cultural/recipes_vaurca.dm b/code/modules/cooking/recipes/cultural/recipes_vaurca.dm index bdc6f188d97..861b312b061 100644 --- a/code/modules/cooking/recipes/cultural/recipes_vaurca.dm +++ b/code/modules/cooking/recipes/cultural/recipes_vaurca.dm @@ -74,3 +74,21 @@ /obj/item/reagent_containers/food/snacks/phoroncandy ) result = /obj/item/reagent_containers/food/snacks/phoron_river_loaf + +/singleton/recipe/koicomb + appliance = OVEN + items = list( + /obj/item/reagent_containers/food/snacks/friedkois, + /obj/item/reagent_containers/food/snacks/friedkois + ) + reagents = list(/singleton/reagent/drink/milk/nemiik = 5) + result = /obj/item/reagent_containers/food/snacks/koicomb + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/nakarka_burger + appliance = MIX + items = list( + /obj/item/reagent_containers/food/snacks/koisburger, + /obj/item/reagent_containers/food/snacks/nakarka_wedge + ) + result = /obj/item/reagent_containers/food/snacks/nakarka_burger diff --git a/code/modules/cooking/recipes/recipes_baked.dm b/code/modules/cooking/recipes/recipes_baked.dm index ea6edb8a276..665d24421c4 100644 --- a/code/modules/cooking/recipes/recipes_baked.dm +++ b/code/modules/cooking/recipes/recipes_baked.dm @@ -96,3 +96,32 @@ ) 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 + +/singleton/recipe/pigs_in_a_blanket + appliance = OVEN + items = list( + /obj/item/reagent_containers/food/snacks/sausage, + /obj/item/reagent_containers/food/snacks/doughslice, + /obj/item/reagent_containers/food/snacks/doughslice + ) + result = /obj/item/reagent_containers/food/snacks/pig_in_a_blanket + result_quantity = 3 + +/singleton/recipe/stuffed_peppers_meat + appliance = OVEN + fruit = list("bellpepper" = 1, "tomato" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/cheesewedge, + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/stuffed_pepper_meat + result_quantity = 2 + +/singleton/recipe/stuffed_peppers_rice + appliance = OVEN + fruit = list("bellpepper" = 1, "corn" = 1) + items = list( + /obj/item/reagent_containers/food/snacks/boiledrice + ) + result = /obj/item/reagent_containers/food/snacks/stuffed_pepper_rice + result_quantity = 2 diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index bab9cbbfe6a..d843086ead8 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -446,3 +446,26 @@ fruit = list("tomato" = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/pita/falafel + +/singleton/recipe/peanut_butter_pita + items = list( + /obj/item/reagent_containers/food/snacks/pita, + ) + reagents = list(/singleton/reagent/nutriment/peanutbutter = 5) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/reagent_containers/food/snacks/pita/peanut_butter + +/singleton/recipe/omelette_pita //this recipe might get changed in the future + items = list( + /obj/item/reagent_containers/food/snacks/pita, + /obj/item/reagent_containers/food/snacks/omelette + ) + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product + result = /obj/item/reagent_containers/food/snacks/pita/omelette + +/singleton/recipe/schnitzel_pita + items = list( + /obj/item/reagent_containers/food/snacks/pita, + /obj/item/reagent_containers/food/snacks/schnitzel + ) + result = /obj/item/reagent_containers/food/snacks/pita/schnitzel diff --git a/code/modules/cooking/recipes/recipes_grill.dm b/code/modules/cooking/recipes/recipes_grill.dm index c6c36730c2c..7f0151b71da 100644 --- a/code/modules/cooking/recipes/recipes_grill.dm +++ b/code/modules/cooking/recipes/recipes_grill.dm @@ -27,3 +27,8 @@ for(var/thing in results) var/obj/item/XMG = thing XMG.reagents.del_reagent(/singleton/reagent/acid/polyacid) + +/singleton/recipe/grilled_peppers + appliance = GRILL | OVEN + fruit = list("bellpepper" = 1) + result = /obj/item/reagent_containers/food/snacks/grilled_peppers diff --git a/code/modules/cooking/recipes/recipes_meat.dm b/code/modules/cooking/recipes/recipes_meat.dm index 972f1cd8cea..e436a37b820 100644 --- a/code/modules/cooking/recipes/recipes_meat.dm +++ b/code/modules/cooking/recipes/recipes_meat.dm @@ -120,3 +120,22 @@ ) result = /obj/item/reagent_containers/food/snacks/meatballs_and_peas reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/schnitzel + appliance = SKILLET + reagents = list(/singleton/reagent/nutriment/flour = 5) + items = list( + /obj/item/reagent_containers/food/snacks/meat + ) + result = /obj/item/reagent_containers/food/snacks/schnitzel + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/cozmo_cubes + appliance = SKILLET + reagents = list(/singleton/reagent/nutriment/protein/egg = 3) + items = list( + /obj/item/reagent_containers/food/snacks/fish/cosmozoan, + /obj/item/reagent_containers/food/snacks/breadslice + ) + result = /obj/item/reagent_containers/food/snacks/cozmo_cubes + reagent_mix = RECIPE_REAGENT_REPLACE 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 5b24e5c720b..4cb1e2b3491 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -277,6 +277,27 @@ color = "#EDB91F" taste_description = "cheese" +/singleton/reagent/nakarka + name = "Nakarka Cheese" + color = "#5bbd22" + taste_description = "sharp tangy cheese" + reagent_state = SOLID + taste_mult = 3 + +/singleton/reagent/nakarka/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) + ..() + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(prob(10) && !(alien in list(IS_VAURCA, IS_SKRELL, IS_DIONA, IS_UNATHI))) + var/list/nemiik_messages = list( + "Your stomache feels a bit unsettled...", + "Your throat tingles slightly...", + "You feel like you may need the restroom soon...", + "Your stomach hurts a little bit...", + "You feel the need to burp." + ) + to_chat(H, SPAN_WARNING(pick(nemiik_messages))) + //Fats //========================= /singleton/reagent/nutriment/triglyceride @@ -1461,6 +1482,29 @@ H.custom_pain("You feel a stinging pain in your abdomen!") H.Stun(3) +/singleton/reagent/drink/milk/nemiik + name = "Ne'miik" + description = "A thick, pus-like substance extracted from the Sky'au creatures native to Sedantis. It is largely believed the louder and more horrifying the Sky'au's screams are as it is being milked, the tastier the ne'miik is. It is full of minerals! It's safe for Vaurcae and Skrell to drink, but generally causes some discomfort in other species." + taste_description = "tangy sweet ooze" + color = "#71fa21" + glass_name = "glass of ne'miik" + glass_desc = "A thick, pus-like substance extracted from the Sky'au creatures native to Sedantis. It is largely believed the louder and more horrifying the Sky'au's screams are as it is being milked, the tastier the ne'miik is. It is full of minerals! It's safe for Vaurcae and Skrell to drink, but generally causes some discomfort in other species." + glass_icon_state = "nemiik" + +/singleton/reagent/drink/milk/nemiik/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) + ..() + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(prob(10) && !(alien in list(IS_VAURCA, IS_SKRELL, IS_DIONA, IS_UNATHI))) + var/list/nemiik_messages = list( + "Your stomache feels a bit unsettled...", + "Your throat tingles slightly...", + "Your stomach hurts a little bit...", + "You feel like you may need the restroom soon...", + "You feel the need to burp." + ) + to_chat(H, SPAN_WARNING(pick(nemiik_messages))) + /singleton/reagent/drink/tea name = "Tea" description = "Tasty black tea, it has antioxidants, it's good for you!" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 02764f15293..518a64a9784 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1879,6 +1879,20 @@ new /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel(location) return +/datum/chemical_reaction/nakarka + name = "Nakarka Cheese" + id = "nakarka" + result = null + required_reagents = list(/singleton/reagent/drink/milk/nemiik = 40) + catalysts = list(/singleton/reagent/enzyme = 5) + result_amount = 1 + +/datum/chemical_reaction/nakarka/on_reaction(var/datum/reagents/holder, var/created_volume) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= created_volume, i++) + new /obj/item/reagent_containers/food/snacks/sliceable/nakarka(location) + return + /datum/chemical_reaction/meatball name = "Meatball" id = "meatball" diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 7035d9b6a86..3f73a76d206 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -1053,3 +1053,11 @@ center_of_mass = list("x"=16, "y"=8) reagents_to_add = list(/singleton/reagent/alcohol/bottle/skrellwineylpha = 100) + +/obj/item/reagent_containers/food/drinks/bottle/nemiik + name = "vrozka farms ne'miik" + desc = "A bottle of Ne'miik under the label 'Vrozka Farms' from Caprice. It has labels in Basic boasting 'rich in minerals!' and warning that 'consumption by Humans or Tajara may cause negative effects', whatever that means." + icon_state = "vrozka_nemiik" + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/drink/milk/nemiik = 80) + empty_icon_state = "vrozka_empty" diff --git a/code/modules/reagents/reagent_containers/food/snacks/baked.dm b/code/modules/reagents/reagent_containers/food/snacks/baked.dm index 6b0c5c8dc64..13b8ad72457 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/baked.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/baked.dm @@ -197,3 +197,47 @@ icon_state = "lasagna_veg_half" if(51 to INFINITY) icon_state = "lasagna_veg" + +/obj/item/reagent_containers/food/snacks/pig_in_a_blanket + name = "pig in a blanket" + desc = "A mini sausage wrapped in dough. Like a tiny hot dog but cuter. Oink oink zzz..." + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "pig_blanket" + reagents_to_add = list(/singleton/reagent/nutriment = 1, /singleton/reagent/nutriment/protein = 2) + reagent_data = list(/singleton/reagent/nutriment = list("baked dough" = 5), /singleton/reagent/nutriment/protein = list("sausage" = 5)) + filling_color = "#a02d1e" + bitesize = 3 + +/obj/item/reagent_containers/food/snacks/stuffed_pepper_meat + name = "stuffed pepper with meat" + desc = "Half a bell pepper stuffed with meat, cheese, tomato sauce and chives. Who even needs bowls?" + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "pepper_rice1" + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 3, /singleton/reagent/nutriment/protein/cheese = 2) + reagent_data = list(/singleton/reagent/nutriment = list("bell pepper" = 5), /singleton/reagent/nutriment/protein = list("meat" = 5)) + filling_color = "#b84e1e" + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/stuffed_pepper_meat/Initialize() + . = ..() + var/variant = pick("pepper_meat1", "pepper_meat2") + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "[variant]" + update_icon() + +/obj/item/reagent_containers/food/snacks/stuffed_pepper_rice + name = "stuffed pepper with rice" + desc = "Half a bell pepper stuffed with rice, beans and corn. Who even needs bowls when you're THIS vegan?" + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "pepper_rice1" + reagents_to_add = list(/singleton/reagent/nutriment = 8) + reagent_data = list(/singleton/reagent/nutriment = list("bell pepper" = 5, "beans" = 3, "corn" = 3)) + filling_color = "#c5ddb6" + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/stuffed_pepper_rice/Initialize() + . = ..() + var/variant = pick("pepper_rice1", "pepper_rice2") + icon = 'icons/obj/item/reagent_containers/food/baked.dmi' + icon_state = "[variant]" + update_icon() diff --git a/code/modules/reagents/reagent_containers/food/snacks/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm index 6d4e3a3fcc3..479934b5d51 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm @@ -613,3 +613,28 @@ reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/choconutspread = 4) reagent_data = list(/singleton/reagent/nutriment = list("chocolate" = 8, "pita bread" = 5, "childhood" = 3)) bitesize = 2 + +/obj/item/reagent_containers/food/snacks/pita/peanut_butter + name = "peanut butter pita" + desc = "It's basically a simple peanut butter sandwich, but in the form of a fluffy dough pocket." + icon_state = "pbpita" + filling_color = "#a06935" + reagents_to_add = list(/singleton/reagent/nutriment = 8) + reagent_data = list(/singleton/reagent/nutriment = list("peanut butter" = 5, "pita bread" = 4)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/pita/omelette + name = "omelette pita" + desc = "An omelette sitting comfortably in a fluffy pocket of pita bread." + icon_state = "omelettepita" + filling_color = "#dbb302" + reagents_to_add = list(/singleton/reagent/nutriment = 5, /singleton/reagent/nutriment/protein = 3) + reagent_data = list(/singleton/reagent/nutriment = list("pita bread" = 5), /singleton/reagent/nutriment/protein = list("omelette" = 5)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/pita/schnitzel + name = "schnitzel pita" + desc = "Elyran style schnitzels in a pita bread pocket, served with some Hummus or Tahini. Optionally with some fries, salad, or sauces." + icon_state = "schnitzelpita" + filling_color = "#cf7105" + bitesize = 2 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 297ecc170e3..84de367abf9 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm @@ -565,6 +565,7 @@ 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" + unitname = "fufu dumpling" filling_color = "#eee0b1" vendingobject = /obj/item/reagent_containers/food/snacks/fufu bitesize = 3 @@ -586,6 +587,35 @@ bitesize = 2 filling_color = "#eee0b1" +/obj/item/reagent_containers/food/snacks/bowl/alfajores + name = "alfajores" + desc = "A plate of delicious vanilla sandwich cookies filled with dulche de leche and covered in coconut shavings. A sweet South American treat!" + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "alfajores_full" + filling_color = "#c48c4c" + unitname = "alfajor" + vendingobject = /obj/item/reagent_containers/food/snacks/alfajor + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment = 12) + bitesize = 2 + reagent_data = list(/singleton/reagent/nutriment = list("dulce de leche" = 5, "vanilla cookie" = 5, "coconut" = 2)) + +/obj/item/reagent_containers/food/snacks/bowl/alfajores/update_icon() + switch(reagents.total_volume) + if(1 to 3) + icon_state = "alfajores_one" + if(4 to 6) + icon_state = "alfajores_half" + if(7 to INFINITY) + icon_state = "alfajores_full" + +/obj/item/reagent_containers/food/snacks/alfajor + name = "alfajor" + desc = "A plump south american sandwich cookie made out of two crumbly vanilla cookies, dulche de leche filling, and a coating of coconut shavings." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "alfajor" + filling_color = "#dab166" + //Silversun /obj/item/reagent_containers/food/snacks/clams_casino @@ -752,3 +782,24 @@ reagents_to_add = list(/singleton/reagent/nutriment = 6, /singleton/reagent/nutriment/protein = 4) bitesize = 3 reagent_data = list(/singleton/reagent/nutriment = list("mustard" = 2, "french fries" = 2, "coleslaw" = 2)) + +//Gadpathur + +/obj/item/reagent_containers/food/snacks/paneer_gadpathur //Made to commemorate the most amazing dish from a place that closed down, RIP Captain Curry! + name = "paneer gadpathur" + desc = "A moderately spicy Gadpathurian curry made with large cubes of Paneer cheese, rice, sour cream, lentil daal and spicy sauces. Unlike Indian Paneer cheese, Gadpathurian Paneer is chewy, having an almost chicken-like texture. Traditionally the dish was made with a local plant called agnadi gola, but as it was rendered nearly extinct in the devestation from the interstellar war, the dish is now more commonly made with a mixture of hot peppers, tomato sauce and turmeric." + icon = 'icons/obj/item/reagent_containers/food/cultural/human.dmi' + icon_state = "paneer" + trash = /obj/item/trash/snack_bowl + filling_color = "#d47d2b" + reagents_to_add = list(/singleton/reagent/nutriment = 10) + bitesize = 2 + reagent_data = list(/singleton/reagent/nutriment = list("paneer cheese" = 5, "rice" = 5, "spices" = 5, "sour cream" = 3)) + +/obj/item/reagent_containers/food/snacks/paneer_gadpathur/update_icon() + var/percent_lasagna_meat_slice = round((reagents.total_volume / 10) * 100) + switch(percent_lasagna_meat_slice) + if(0 to 69) + icon_state = "paneer_half" + if(70 to INFINITY) + icon_state = "paneer" diff --git a/code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm b/code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm index f1b3fd50c67..0b8614ea424 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/skrell.dm @@ -169,3 +169,18 @@ filling_color = "#97eaff7a" reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/gelatin = 5) reagent_data = list(/singleton/reagent/nutriment = list("sweetened mint" = 5)) + +/obj/item/reagent_containers/food/snacks/konaqu + name = "konaqu" + desc = "Literally translating to 'whirpool orb', konaqu are popular pastry-like confections beloved among Nralakk youth. They tend to be soft and gooey underwater, or soft and brittle when dry. When served on dry land, they are often served with a small bowl or glass of water or milk to give people the option of dunking them." + icon = 'icons/obj/item/reagent_containers/food/cultural/skrell.dmi' + icon_state = "qilvo" + filling_color = "#64e3faff" + reagents_to_add = list(/singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment = list("fruity dough" = 5, "sweetness" = 5)) + +/obj/item/reagent_containers/food/snacks/konaqu/Initialize() + . = ..() + var/shape = pick("konaqu1", "konaqu2") + icon = 'icons/obj/item/reagent_containers/food/cultural/skrell.dmi' + src.icon_state = "[shape]" 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 2eadfa3818c..5681c426af1 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm @@ -99,7 +99,7 @@ desc = "Some well-done k'ois, grilled to perfection." icon = 'icons/obj/item/reagent_containers/food/cultural/vaurca.dmi' icon_state = "kois_steak" - filling_color = "#dcd9cd" + filling_color = "#E6E600" reagents_to_add = list(/singleton/reagent/kois = 20, /singleton/reagent/toxin/phoron = 15) bitesize = 7 @@ -109,7 +109,7 @@ icon = 'icons/obj/item/reagent_containers/food/cultural/vaurca.dmi' icon_state = "kois_donut" item_state = "kois_donut" - filling_color = "#dcd9cd" + filling_color = "#E6E600" overlay_state = "box-kois_donut" reagents_to_add = list(/singleton/reagent/kois = 15, /singleton/reagent/toxin/phoron = 10) bitesize = 5 @@ -119,7 +119,7 @@ desc = "Baked k'ois goop, molded into a little cake." icon = 'icons/obj/item/reagent_containers/food/cultural/vaurca.dmi' icon_state = "kois_muffin" - filling_color = "#dcd9cd" + filling_color = "#E6E600" reagents_to_add = list(/singleton/reagent/kois = 10, /singleton/reagent/toxin/phoron = 15) bitesize = 5 @@ -128,10 +128,18 @@ desc = "K'ois inside k'ois. Peak Vaurcesian cuisine." icon = 'icons/obj/item/reagent_containers/food/cultural/vaurca.dmi' icon_state = "kois_burger" - filling_color = "#dcd9cd" + filling_color = "#E6E600" reagents_to_add = list(/singleton/reagent/kois = 20, /singleton/reagent/toxin/phoron = 20) bitesize = 8 +/obj/item/reagent_containers/food/snacks/nakarka_burger + name = "nakarka burger" + desc = "A k'ois burger with a slice of soft, tangy nakarka cheese." + icon = 'icons/obj/item/reagent_containers/food/cultural/vaurca.dmi' + icon_state = "nakarka_burger" + filling_color = "#92cc34" + bitesize = 8 + /obj/item/storage/box/fancy/vkrexitaffy name = "V'krexi Snax" desc = "A packet of V'krexi taffy. Made from free-range V'krexi!" @@ -220,3 +228,20 @@ filling_color = "#E6E600" reagents_to_add = list(/singleton/reagent/kois = 15, /singleton/reagent/toxin/phoron = 35) bitesize = 10 + +/obj/item/reagent_containers/food/snacks/koicomb + name = "koicomb" + desc = "vvvell aren't vvve vvvancy? this uncommon confection is often served in large gatherings and events, where it's served as a very large sheet, with guests tearing or slicing off as much as they'd like to have." + icon = 'icons/obj/item/reagent_containers/food/cultural/vaurca.dmi' + icon_state = "koicomb" + filling_color = "#E6E600" + reagents_to_add = list(/singleton/reagent/kois = 20, /singleton/reagent/toxin/phoron = 20, /singleton/reagent/drink/milk/nemiik = 5) + bitesize = 8 + +/obj/item/reagent_containers/food/snacks/koicomb/update_icon() + var/percent_koicomb = round((reagents.total_volume / 45) * 100) + switch(percent_koicomb) + if(0 to 50) + icon_state = "koicomb_bitten" + if(51 to INFINITY) + icon_state = "koicomb" diff --git a/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm b/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm index c04cd7f053a..d6618f21f6c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/ingredients.dm @@ -31,6 +31,31 @@ /obj/item/reagent_containers/food/snacks/cheesewedge/filled/reagents_to_add = list(/singleton/reagent/nutriment/protein/cheese = 4) +/obj/item/reagent_containers/food/snacks/sliceable/nakarka + name = "nakarka cheese wheel" + desc = "Nakarka is Vaurcan cheese made of Ne'miik with a sharp, tangy flavor. Nakarka directly translates to mean 'cheese'. It can cause gastric discomfort to some other species in it's raw form. There are ways to prepare it to decrease those effects, however." //basically an in-world reason to feel free to use it in recipes that are meant for humans as well. + icon = 'icons/obj/item/reagent_containers/food/ingredients.dmi' + icon_state = "nakarka" + slice_path = /obj/item/reagent_containers/food/snacks/nakarka_wedge + slices_num = 8 + filling_color = "#7be717" + center_of_mass = list("x"=16, "y"=10) + bitesize = 2 + + reagents_to_add = list(/singleton/reagent/nakarka = 20) + +/obj/item/reagent_containers/food/snacks/nakarka_wedge + name = "nakarka cheese wedge" + desc = "Zzztop calling it Nakarka cheeeze. Nakarka meanzzz cheeeze. You are literally calling it cheezzze cheezzze." + icon = 'icons/obj/item/reagent_containers/food/ingredients.dmi' + icon_state = "nakarka_wedge" + ingredient_name = "nakarka" + filling_color = "#7be717" + bitesize = 2 + center_of_mass = list("x"=16, "y"=10) + +/obj/item/reagent_containers/food/snacks/nakarka_wedge/filled/reagents_to_add = list(/singleton/reagent/nakarka = 4) + /obj/item/reagent_containers/food/snacks/spreads name = "nutri-spread" diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 0d697848abf..7e8daf8baa4 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -402,3 +402,43 @@ icon_state = "meatballpeas_half" if(50 to INFINITY) icon_state = "meatballpeas" + +/obj/item/reagent_containers/food/snacks/schnitzel + name = "schnitzel" + desc = "Be it Viennese, Elyran or Visegardi, be it beef, pork or poultry, almost every known culture in the spur seems to love having a version of pan fried breaded meat with a funny name. What it's made of or served with, however, may vary drastically from culture to culture." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "schnitzel" + filling_color = "#ca652a" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein = 5) + reagent_data = list(/singleton/reagent/nutriment/protein = list("meat" = 5), /singleton/reagent/nutriment = list("crunchy breadcrumb coating" = 4)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/schnitzel/update_icon() + var/percent = round((reagents.total_volume / 8) * 100) + switch(percent) + if(0 to 59) + icon_state = "schnitzel_half" + if(60 to INFINITY) + icon_state = "schnitzel" + +/obj/item/reagent_containers/food/snacks/cozmo_cubes + name = "cozmo cubes" + desc = "A dish of Tau Ceti origin, most commonly found in Biesel, it is typically made of Cosmozoan meat coated in a breadcrumbs and egg yolk mixture, pan fried and sliced into cubes. It is usually served with a side of mayonnaise, spicy mayo, soy sauce, or garlic sauce for dipping. The fact Cosmozoans can't be farmed planetside makes this dish have a slightly upper-class reputation, although in cities with large spaceports it is a bit more common. In cheap restaurants or places where Cosmozoans aren't common, their meat is sometimes swapped for jellyfish or other similar fauna as a cheap substitute." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "cozmo_cubes" + filling_color = "#0fda85" + trash = /obj/item/trash/plate + reagents_to_add = list(/singleton/reagent/nutriment = 2, /singleton/reagent/nutriment/protein/seafood = 5, /singleton/reagent/nutriment/protein = 3) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("gelatinous meat" = 5), /singleton/reagent/nutriment = list("crunchy coating" = 4)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/cozmo_cubes/update_icon() + var/percent = round((reagents.total_volume / 10) * 100) + switch(percent) + if(0 to 29) + icon_state = "cozmo_cubes_one" + if(30 to 69) + icon_state = "cozmo_cubes_half" + if(70 to INFINITY) + icon_state = "cozmo_cubes" diff --git a/code/modules/reagents/reagent_containers/food/snacks/mexican.dm b/code/modules/reagents/reagent_containers/food/snacks/mexican.dm index b1d2e83c70d..fcffc14d482 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/mexican.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/mexican.dm @@ -21,6 +21,18 @@ reagent_data = list(/singleton/reagent/nutriment = list("tortilla" = 3, "corn" = 3)) bitesize = 4 +/obj/item/reagent_containers/food/snacks/grilled_peppers + name = "grilled peppers" + desc = "A bowl full of strips of grilled peppers makes for a colorful side dish!" + icon = 'icons/obj/item/reagent_containers/food/mexican.dmi' + icon_state = "grilled_peppers" + trash = /obj/item/trash/bowl_small + filling_color = "#df850f" + center_of_mass = list("x"=16, "y"=8) + reagents_to_add = list(/singleton/reagent/nutriment = 3) + reagent_data = list(/singleton/reagent/nutriment = list("bell peppers" = 4)) + bitesize = 2 + // Tacos //========================= /obj/item/reagent_containers/food/snacks/taco diff --git a/html/changelogs/tomixcomics - foodsplosion.yml b/html/changelogs/tomixcomics - foodsplosion.yml new file mode 100644 index 00000000000..f2754620fd1 --- /dev/null +++ b/html/changelogs/tomixcomics - foodsplosion.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added 14 new food dishes and food combinations" + - rscadd: "Added Ne'miik (Vaurcan milk) drink" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index a400ddd66e2..33a8df070ef 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/item/reagent_containers/food/baked.dmi b/icons/obj/item/reagent_containers/food/baked.dmi index bd6965e4152..1c5b1ffb32c 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/bread.dmi b/icons/obj/item/reagent_containers/food/bread.dmi index 7694169526a..e58fa5d91ef 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/cultural/human.dmi b/icons/obj/item/reagent_containers/food/cultural/human.dmi index f61b4b1b0a6..2de0702a0b5 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/skrell.dmi b/icons/obj/item/reagent_containers/food/cultural/skrell.dmi index ae38f275810..fd9492128b0 100644 Binary files a/icons/obj/item/reagent_containers/food/cultural/skrell.dmi and b/icons/obj/item/reagent_containers/food/cultural/skrell.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 9419a01da4d..886dc74658e 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/item/reagent_containers/food/drinks/bottle.dmi b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi index 258790303c7..34ed1e52ecb 100644 Binary files a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi and b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi differ diff --git a/icons/obj/item/reagent_containers/food/ingredients.dmi b/icons/obj/item/reagent_containers/food/ingredients.dmi index 418d502847f..6a6f787ef3a 100644 Binary files a/icons/obj/item/reagent_containers/food/ingredients.dmi and b/icons/obj/item/reagent_containers/food/ingredients.dmi differ diff --git a/icons/obj/item/reagent_containers/food/meat.dmi b/icons/obj/item/reagent_containers/food/meat.dmi index 6e55d018344..2f6a14daaf5 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/mexican.dmi b/icons/obj/item/reagent_containers/food/mexican.dmi index 76edc17baf7..331f161d399 100644 Binary files a/icons/obj/item/reagent_containers/food/mexican.dmi and b/icons/obj/item/reagent_containers/food/mexican.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 96fb29414c8..42c5e1ea1a5 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ