diff --git a/code/modules/cooking/recipes/recipes_burger.dm b/code/modules/cooking/recipes/recipes_burger.dm index f39d57d1ea8..4fa6ee6c45f 100644 --- a/code/modules/cooking/recipes/recipes_burger.dm +++ b/code/modules/cooking/recipes/recipes_burger.dm @@ -178,3 +178,12 @@ reagents = list(/singleton/reagent/nutriment/protein/egg = 3) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/burger/bigbite/moss + +/singleton/recipe/psirenburger + appliance = SKILLET | GRILL + items = list( + /obj/item/reagent_containers/food/snacks/bun, + /obj/item/reagent_containers/food/snacks/bowl/psiren_chips, + /obj/item/reagent_containers/food/snacks/raw_psiren_cutlet + ) + result = /obj/item/reagent_containers/food/snacks/burger/psiren diff --git a/code/modules/cooking/recipes/recipes_fryer.dm b/code/modules/cooking/recipes/recipes_fryer.dm index de32765d9b7..ab2947316c9 100644 --- a/code/modules/cooking/recipes/recipes_fryer.dm +++ b/code/modules/cooking/recipes/recipes_fryer.dm @@ -153,6 +153,14 @@ coating = /singleton/reagent/nutriment/coating/batter result = /obj/item/reagent_containers/food/snacks/fishfingers +/singleton/recipe/psiren_chips + appliance = FRYER + reagents = list(/singleton/reagent/sodiumchloride = 1) + items = list( + /obj/item/reagent_containers/food/snacks/psiren_leather + ) + result = /obj/item/reagent_containers/food/snacks/bowl/psiren_chips + //Sweet Recipes. //================== /singleton/recipe/jellydonut diff --git a/code/modules/cooking/recipes/recipes_meat.dm b/code/modules/cooking/recipes/recipes_meat.dm index a42b5e9d23e..bad452be54a 100644 --- a/code/modules/cooking/recipes/recipes_meat.dm +++ b/code/modules/cooking/recipes/recipes_meat.dm @@ -158,3 +158,57 @@ ) result = /obj/item/reagent_containers/food/snacks/sliceable/meatloaf reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/psitenders + appliance = FRYER | SKILLET + reagents = list(/singleton/reagent/nutriment/flour = 5, /singleton/reagent/spacespice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/raw_psiren_cutlet, + /obj/item/reagent_containers/food/snacks/raw_psiren_cutlet, + /obj/item/reagent_containers/food/snacks/raw_psiren_cutlet, + /obj/item/reagent_containers/food/snacks/sauerkraut + ) + result = /obj/item/reagent_containers/food/snacks/psitenders + +/singleton/recipe/psitenders/make_food(obj/container) // so people don't end up eating raw flour + . = ..() + var/list/results = . + for(var/thing in results) + var/obj/item/XMG = thing + XMG.reagents.del_reagent(/singleton/reagent/nutriment/flour) + +/singleton/recipe/psychoyaki + appliance = SKILLET | GRILL + reagents = list(/singleton/reagent/nutriment/coating/batter = 5, /singleton/reagent/nutriment/mayonnaise = 5) + items = list( + /obj/item/reagent_containers/food/snacks/raw_psiren_cutlet, + /obj/item/reagent_containers/food/snacks/raw_psiren_cutlet, + /obj/item/reagent_containers/food/snacks/raw_psiren_cutlet, + /obj/item/reagent_containers/food/snacks/psiren_leather + ) + result = /obj/item/reagent_containers/food/snacks/psychoyaki + reagent_mix = RECIPE_REAGENT_REPLACE + +/singleton/recipe/psirensteak + appliance = SKILLET | MICROWAVE + reagents = list(/singleton/reagent/sodiumchloride = 1, /singleton/reagent/blackpepper = 1) + items = list(/obj/item/reagent_containers/food/snacks/psiren_body_meat) + result = /obj/item/reagent_containers/food/snacks/psirensteak + +/singleton/recipe/cornucopia + appliance = OVEN + reagents = list(/singleton/reagent/spacespice/pumpkinspice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/psiren_tentacle_meat, + /obj/item/reagent_containers/food/snacks/risotto + ) + result = /obj/item/reagent_containers/food/snacks/cornucopia + result_quantity = 2 + +/singleton/recipe/grilled_tentacle + appliance = OVEN | GRILL + reagents = list(/singleton/reagent/sodiumchloride = 1, /singleton/reagent/blackpepper = 1) + items = list( + /obj/item/reagent_containers/food/snacks/psiren_tentacle_meat + ) + result = /obj/item/reagent_containers/food/snacks/grilled_tentacle diff --git a/code/modules/cooking/recipes/recipes_mix.dm b/code/modules/cooking/recipes/recipes_mix.dm index d33335d8080..19e2f1e2942 100644 --- a/code/modules/cooking/recipes/recipes_mix.dm +++ b/code/modules/cooking/recipes/recipes_mix.dm @@ -115,6 +115,7 @@ /singleton/recipe/citrus_delight //ported from tg fruit = list("orange" = 1, "lemon" = 1, "lime" = 1) result = /obj/item/reagent_containers/food/snacks/salad/citrus_delight + reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product /singleton/recipe/spring_salad //ported from tg fruit = list("peas" = 1, "carrot" = 1, "cabbage" = 2) diff --git a/code/modules/cooking/recipes/recipes_soup.dm b/code/modules/cooking/recipes/recipes_soup.dm index c0195df9b02..cf60b9cb115 100644 --- a/code/modules/cooking/recipes/recipes_soup.dm +++ b/code/modules/cooking/recipes/recipes_soup.dm @@ -145,6 +145,16 @@ items = list(/obj/item/reagent_containers/food/snacks/fish) result = /obj/item/reagent_containers/food/snacks/black_eyed_gumbo +/singleton/recipe/psiren_surprise + appliance = POT + fruit = list("onion" = 1, "tomato" = 1, "garlic" = 1) + reagents = list(/singleton/reagent/water = 10, /singleton/reagent/spacespice = 2) + items = list( + /obj/item/reagent_containers/food/snacks/psiren_body_meat, + /obj/item/reagent_containers/food/snacks/psiren_tentacle_meat + ) + result = /obj/item/reagent_containers/food/snacks/stew/psiren_surprise + // Chili /singleton/recipe/bearchili appliance = SAUCEPAN | POT diff --git a/code/modules/mob/living/simple_animal/hostile/psirens/psiren.dm b/code/modules/mob/living/simple_animal/hostile/psirens/psiren.dm index 2a89dcf13e6..3d03da709e6 100644 --- a/code/modules/mob/living/simple_animal/hostile/psirens/psiren.dm +++ b/code/modules/mob/living/simple_animal/hostile/psirens/psiren.dm @@ -42,8 +42,8 @@ attack_emote = "menaces" psi_pingable = TRUE meat_amount = 1 - meat_type = /obj/item/reagent_containers/food/snacks/squidmeat/psiren_tentacle_meat - butchering_products = list(/obj/item/reagent_containers/food/snacks/squidmeat/psiren_body_meat = 1) + meat_type = /obj/item/reagent_containers/food/snacks/psiren_body_meat + butchering_products = list(/obj/item/reagent_containers/food/snacks/psiren_tentacle_meat = 1) attack_vis_effect = ATTACK_EFFECT_DISARM smart_ranged = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/psirens/psiren_matriarch.dm b/code/modules/mob/living/simple_animal/hostile/psirens/psiren_matriarch.dm index 901791934c5..3df5f9b6740 100644 --- a/code/modules/mob/living/simple_animal/hostile/psirens/psiren_matriarch.dm +++ b/code/modules/mob/living/simple_animal/hostile/psirens/psiren_matriarch.dm @@ -16,8 +16,8 @@ melee_reach = 2 armor_penetration = 30 meat_amount = 5 - meat_type = /obj/item/reagent_containers/food/snacks/squidmeat/psiren_tentacle_meat - butchering_products = list(/obj/item/reagent_containers/food/snacks/squidmeat/psiren_body_meat = 5) + meat_type = /obj/item/reagent_containers/food/snacks/psiren_tentacle_meat + butchering_products = list(/obj/item/reagent_containers/food/snacks/psiren_body_meat = 5) /mob/living/simple_animal/hostile/psiren/matriarch/Initialize() . = ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_food.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_food.dm index e821dc5004e..992ac263e2e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_food.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drink/generic_food.dm @@ -26,6 +26,8 @@ //add the new taste data var/list/data = ..() + if(!data) + data = list() for(var/taste in newdata) if(taste in data) data[taste] += newdata[taste] diff --git a/code/modules/reagents/reagent_containers/food/snacks/burger.dm b/code/modules/reagents/reagent_containers/food/snacks/burger.dm index dfa60b7ab64..c21375b09b7 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/burger.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/burger.dm @@ -278,3 +278,12 @@ reagents_to_add = list(/singleton/reagent/nutriment = 4, /singleton/reagent/nutriment/protein = 10) reagent_data = list(/singleton/reagent/nutriment = list("mossy crunch" = 5, "buns" = 3), /singleton/reagent/nutriment/protein = list("meat" = 5, "egg" = 3, "cheese" = 3)) bitesize = 3 + +/obj/item/reagent_containers/food/snacks/burger/psiren + name = "psiburger" + desc = "A yellowish Psiren meat patty topped with crunchy Psiren chips on an optional bed of sauerkraut. Delicious revenge served piping hot off the grill." + icon = 'icons/obj/item/reagent_containers/food/burger.dmi' + icon_state = "psiburger" + item_state = "burger" // Don't touch this unless you know what you're doing + center_of_mass = list("x"=16, "y"=11) + reagents_to_add = list(/singleton/reagent/nutriment = 2) diff --git a/code/modules/reagents/reagent_containers/food/snacks/fish.dm b/code/modules/reagents/reagent_containers/food/snacks/fish.dm index cdd83843359..c8a34f456b3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/fish.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/fish.dm @@ -136,16 +136,56 @@ bitesize = 6 reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 6, /singleton/reagent/hyperzine = 15, /singleton/reagent/acid/polyacid = 6) -/obj/item/reagent_containers/food/snacks/squidmeat/psiren_tentacle_meat - name = "raw psiren tentacle" - desc = "A long smooth tentacle. It's an off putting blue colour." +/obj/item/reagent_containers/food/snacks/psiren_tentacle_meat + name = "Psiren tentacle" + desc = "A long, smooth tentacle. It's an off putting blue colour. WAIT, DID IT JUST MOVE??? No... That was a trick of the light... Probably." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' icon_state = "psiren_tentacle_meat" reagents_to_add = list(/singleton/reagent/drugs/mindbreaker = 2, /singleton/reagent/nutriment/protein/seafood = 3) - filling_color = "#1S7399" + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("fizzy chicken" = 5)) + filling_color = "#206a88" -/obj/item/reagent_containers/food/snacks/squidmeat/psiren_body_meat - name = "raw psiren ring" - desc = "A ring of blue flesh." +/obj/item/reagent_containers/food/snacks/psiren_tentacle_meat/attackby(obj/item/attacking_item, mob/user) + if(has_edge(attacking_item)) //this checks if the item you click the meat with is a knife/has an edge + user.visible_message(SPAN_NOTICE("[user] slices [src]!")) + var/psiren_cutlet = new /obj/item/reagent_containers/food/snacks/raw_psiren_cutlet(loc) + reagents.trans_to_obj(psiren_cutlet, reagents.total_volume / 2) + var/psiren_leather = new /obj/item/reagent_containers/food/snacks/psiren_leather(loc) + reagents.trans_to_obj(psiren_leather, reagents.total_volume / 2) + qdel_self() + +/obj/item/reagent_containers/food/snacks/psiren_body_meat + name = "psiren meat" + desc = "A slab of amber-colored meat with a bit of blueish skin attached. The slightest motion makes it look like something is shifting inside." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' icon_state = "psiren_body_meat" - reagents_to_add = list(/singleton/reagent/drugs/mindbreaker = 2, /singleton/reagent/nutriment/protein/seafood = 3) - filling_color = "#1S7399" + reagents_to_add = list(/singleton/reagent/drugs/mindbreaker = 2, /singleton/reagent/nutriment/protein/seafood = 4) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("fizzy chicken" = 5)) + filling_color = "#f5c235" + +/obj/item/reagent_containers/food/snacks/psiren_body_meat/attackby(obj/item/attacking_item, mob/user) + if(has_edge(attacking_item)) //this checks if the item you click the meat with is a knife/has an edge + user.visible_message(SPAN_NOTICE("[user] slices [src]!")) + for(var/i = 1 to 3) + var/obj/item/reagent_containers/food/snacks/raw_psiren_cutlet/psiren_cutlet = new (loc) + reagents.trans_to_obj(psiren_cutlet, reagents.total_volume / 4) + var/psiren_leather = new /obj/item/reagent_containers/food/snacks/psiren_leather(loc) + reagents.trans_to_obj(psiren_leather, reagents.total_volume / 4) + qdel_self() + +/obj/item/reagent_containers/food/snacks/raw_psiren_cutlet + name = "raw psiren cutlet" + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + desc = "Small slices of Psiren meat. Not so tough now, are you, squid?" + icon_state = "psiren_cutlet" + filling_color = "#f5c235" + +/obj/item/reagent_containers/food/snacks/psiren_leather + name = "psiren leather" + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + desc = "The blueish skin of a Psiren. It's very glossy and kind of pretty when it's not attached to a vicious monster trying to kill you." + icon_state = "psiren_leather" + filling_color = "#247892" + bitesize = 0.2 //it's rubbery + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 1) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("chewy, bitter fish leather" = 8)) diff --git a/code/modules/reagents/reagent_containers/food/snacks/fryer.dm b/code/modules/reagents/reagent_containers/food/snacks/fryer.dm index 9efddc8fd22..b5b58411c06 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/fryer.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/fryer.dm @@ -212,6 +212,27 @@ bitesize = 3 reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 7) +/obj/item/reagent_containers/food/snacks/bowl/psiren_chips + name = "psiren chips" + gender = PLURAL + desc = "Small, thin slices of Psiren skin deep fried and salted. Psiren skin responds very well to being fried, absorbing oil easily and becoming very crunchy in the process." + icon = 'icons/obj/item/reagent_containers/food/fryer.dmi' + icon_state = "psiren_chips" + filling_color = "#1a778f" + bitesize = 0.5 + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 2) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("salted fish chips" = 5, "extreme crunchiness" = 5)) + unitname = "chip" + trash = /obj/item/trash/bowl_small + vendingobject = /obj/item/reagent_containers/food/snacks/psiren_chip + +/obj/item/reagent_containers/food/snacks/psiren_chip + name = "psiren chip" + desc = "A crunchy square of deep fried Psiren skin. Crunches in your mouth, not in your hand." + icon = 'icons/obj/item/reagent_containers/food/fryer.dmi' + icon_state = "psiren_chip" + bitesize = 1 + filling_color = "#1a778f" /obj/item/reagent_containers/food/snacks/donut name = "donut" diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 60d4da1cc9b..586ec26ce00 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -497,3 +497,99 @@ trash = /obj/item/trash/plate filling_color = "#68451c" bitesize = 2 + +/obj/item/reagent_containers/food/snacks/psitenders + name = "psitenders" + desc = "Cuts of psiren meat coated in a mix of spices, breaded, fried, and served on a bed of sauerkraut with a dipping sauce such as spicy mayo or soy sauce. Sauerkraut and Psiren meat make for a popular combination, for whatever reason." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "psitenders" + trash = /obj/item/trash/plate + filling_color = "#b18a37" + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 5, /singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment = list("crunchy coating" = 5, "sauerkraut" = 5), /singleton/reagent/nutriment/protein/seafood = list("carbonated chicken" = 5, "spices" = 4)) + bitesize = 2 + +/obj/item/reagent_containers/food/snacks/psitenders/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_psitenders = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_psitenders) + if(-INFINITY to 40) + icon_state = "psitenders_half" + if(41 to INFINITY) + icon_state = "psitenders" + +/obj/item/reagent_containers/food/snacks/psychoyaki + name = "psychoyaki" + desc = "D E F I N I T E L Y N O R M A L F O O D ." //U N B L O C K S Y O U R T H I R D E Y E A N D Y O U R C O L O N. + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "psychoyaki" + trash = /obj/item/trash/chipbasket + filling_color = "#ee9471" + center_of_mass = list("x"=17, "y"=9) + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment = 3, /singleton/reagent/nutriment/protein/seafood = 4, /singleton/reagent/drugs/mindbreaker = 2) + reagent_data = list(/singleton/reagent/nutriment = list("fried batter" = 4), /singleton/reagent/nutriment/protein/seafood = list("the great and ever-yawning cosmos" = 5, "fizzy chicken" = 2)) + +/obj/item/reagent_containers/food/snacks/psirensteak + name = "psiren steak" + desc = "A yellowish steak made of psiren meat. It makes a noise like pop rocks candy as it sizzles, slowly dying down as it cools." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "psirensteak" + trash = /obj/item/trash/plate/steak + filling_color = "#c79f1a" + center_of_mass = list("x"=16, "y"=13) + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 2, /singleton/reagent/nutriment/triglyceride = 2) + +/obj/item/reagent_containers/food/snacks/psirensteak/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_psirensteak = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_psirensteak) + if(-INFINITY to 50) + icon_state = "psirensteak_half" + if(51 to INFINITY) + icon_state = "psirensteak" + +/obj/item/reagent_containers/food/snacks/cornucopia + name = "cornucopia roast" + desc = "'Cornucopia Roast' sure sounds better than 'Stuffed tentacle', doesn't it? Well, that's still what it is." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "cornucopia" + filling_color = "#d8cdaa" + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment = 1) + reagent_data = list(/singleton/reagent/nutriment = list("risotto" = 5, "nutmeg" = 5, "crunchy seafood" = 3)) + +/obj/item/reagent_containers/food/snacks/cornucopia/update_icon() + var/expected_initial_reagent_volume + for(var/k in src.reagents_to_add) + expected_initial_reagent_volume += reagents_to_add[k] + var/percent_cornucopia = round((reagents.total_volume / expected_initial_reagent_volume) * 100) + switch(percent_cornucopia) + if(-INFINITY to 50) + icon_state = "cornucopia_half" + if(51 to INFINITY) + icon_state = "cornucopia" + +/obj/item/reagent_containers/food/snacks/grilled_tentacle + name = "grilled tentacle" + desc = "A real deal grilled tendril." + icon = 'icons/obj/item/reagent_containers/food/meat.dmi' + icon_state = "grilled_tentacle" + trash = /obj/item/trash/plate/steak + filling_color = "#503413" + bitesize = 2 + reagents_to_add = list(/singleton/reagent/nutriment/protein/seafood = 2, /singleton/reagent/nutriment/triglyceride = 2) + reagent_data = list(/singleton/reagent/nutriment/protein/seafood = list("salted, crunchy seafood" = 5, "fizzy chicken" = 5)) + +/obj/item/reagent_containers/food/snacks/grilled_tentacle/update_icon() + var/percent_grilled_tentacle = round((reagents.total_volume / 6) * 100) + switch(percent_grilled_tentacle) + if(0 to 50) + icon_state = "grilled_tentacle_half" + if(51 to INFINITY) + icon_state = "grilled_tentacle" diff --git a/code/modules/reagents/reagent_containers/food/snacks/soup.dm b/code/modules/reagents/reagent_containers/food/snacks/soup.dm index 34f4490d5c5..80637f78d29 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/soup.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/soup.dm @@ -282,6 +282,18 @@ filling_color = "#921f10" bitesize = 4 +/obj/item/reagent_containers/food/snacks/stew/psiren_surprise + name = "psiren surprise" + desc = "What's in this thing? Oh, haha, don't worry about it. What? Moving? Don't be silly! That's because it's still bubbling! This is just a nice, hearty stew, and what's important is that there's enough here for multiple people! Or, uh, one person from mining, I guess. (Psst! Hey, quit moving in there! Don't make me use the ladle again!)" + icon = 'icons/obj/item/reagent_containers/food/soup.dmi' + icon_state = "psiren_surprise" + trash = /obj/item/trash/stew + filling_color = "#68391a" + bitesize = 4 + is_liquid = TRUE + reagents_to_add = list(/singleton/reagent/nutriment = 4) + reagent_data = list(/singleton/reagent/nutriment = list("vegetables" = 5, "fishy undertones" = 3)) + // Chilli /obj/item/reagent_containers/food/snacks/hotchili diff --git a/html/changelogs/Tomixcomics-psirencuisine.yml b/html/changelogs/Tomixcomics-psirencuisine.yml new file mode 100644 index 00000000000..908b42a0c94 --- /dev/null +++ b/html/changelogs/Tomixcomics-psirencuisine.yml @@ -0,0 +1,60 @@ +################################ +# 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 a multitude of Psiren meat based dishes." + - qol: "Added line of code to keep the game from crashing when flavors don't get listed properly in the code." + - qol: "Adjusted Citrus Delight dish so that it doesn't take forever to finish" diff --git a/icons/obj/item/reagent_containers/food/burger.dmi b/icons/obj/item/reagent_containers/food/burger.dmi index 7dbffb7ce25..a10ed4de50b 100644 Binary files a/icons/obj/item/reagent_containers/food/burger.dmi and b/icons/obj/item/reagent_containers/food/burger.dmi differ diff --git a/icons/obj/item/reagent_containers/food/fryer.dmi b/icons/obj/item/reagent_containers/food/fryer.dmi index dcd071a6d49..25e07933429 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/item/reagent_containers/food/meat.dmi b/icons/obj/item/reagent_containers/food/meat.dmi index c7fd2c34e06..454d98f2198 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/soup.dmi b/icons/obj/item/reagent_containers/food/soup.dmi index f22420a1242..48fefc6e65d 100644 Binary files a/icons/obj/item/reagent_containers/food/soup.dmi and b/icons/obj/item/reagent_containers/food/soup.dmi differ