diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm index a35dcc1dc4..fe70739ab5 100644 --- a/code/modules/food_and_drinks/food/snacks/meat.dm +++ b/code/modules/food_and_drinks/food/snacks/meat.dm @@ -83,6 +83,7 @@ /obj/item/reagent_containers/food/snacks/meat/slab/chicken name = "chicken meat" desc = "A slab of raw chicken. Remember to wash your hands!" + icon_state = "chickenbreast" cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/chicken slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/chicken tastes = list("chicken" = 1) @@ -341,8 +342,14 @@ /obj/item/reagent_containers/food/snacks/meat/steak/chicken name = "chicken steak" //Can you have chicken steaks? Maybe this should be renamed once it gets new sprites. + icon_state = "chickenbreast_cooked" tastes = list("chicken" = 1) +/obj/item/reagent_containers/food/snacks/meat/steak/fish + name = "fish fillet" + icon_state = "grilled_carp_slice" + tastes = list("charred sushi" = 1) + /obj/item/reagent_containers/food/snacks/meat/steak/plain foodtype = MEAT @@ -361,6 +368,7 @@ /obj/item/reagent_containers/food/snacks/meat/steak/bear name = "bear steak" + icon_state = "bearcook" tastes = list("meat" = 1, "salmon" = 1) /obj/item/reagent_containers/food/snacks/meat/steak/xeno diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index c2a58b0821..e25f99c69e 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -22,6 +22,7 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/carpotoxin = 2, /datum/reagent/consumable/nutriment/vitamin = 2) bitesize = 6 filling_color = "#FA8072" + cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/fish tastes = list("fish" = 1) foodtype = MEAT diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index bc80ffe621..7b0ffe2a19 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -136,6 +136,17 @@ tastes = list("fries" = 3, "cheese" = 1) foodtype = VEGETABLES | GRAIN +/obj/item/reagent_containers/food/snacks/chilicheesefries + name = "chili cheese fries" + desc = "Fries smothered in cheese -and- chilli." + icon_state = "chilicheesefries" + trash = /obj/item/trash/plate + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) + list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 1) + filling_color = "#FFD700" + tastes = list("fries" = 3, "cheese" = 1) + foodtype = VEGETABLES | GRAIN + /obj/item/reagent_containers/food/snacks/badrecipe name = "burned mess" desc = "Someone should be demoted from cook for this." @@ -537,6 +548,15 @@ tastes = list("butter" = 1) foodtype = DAIRY +/obj/item/reagent_containers/food/snacks/butter/margarine + name = "stick of margarine" + desc = "A stick of lightly salted vegetable oil." + icon_state = "marge" + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/cornoil = 2, /datum/reagent/consumable/sodiumchloride = 1) + filling_color = "#FFD700" + tastes = list("butter" = 1) + foodtype = JUNKFOOD + /obj/item/reagent_containers/food/snacks/onionrings name = "onion rings" desc = "Onion slices coated in batter." diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm index 9096429228..d812655b91 100644 --- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm +++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm @@ -21,6 +21,17 @@ tastes = list("toast" = 1) foodtype = GRAIN +/obj/item/reagent_containers/food/snacks/baconlettucetomato + name = "blt sandwich" + desc = "The classic bacon, lettuce tomato sandwich." + icon = 'icons/obj/food/burgerbread.dmi' + icon_state = "blt" + trash = /obj/item/trash/plate + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("bacon" = 1, "lettuce" = 1, "tomato" = 1, "mayo" = 1) + foodtype = GRAIN | MEAT | VEGETABLES + /obj/item/reagent_containers/food/snacks/grilledcheese name = "grilled cheese sandwich" desc = "Goes great with Tomato soup!" @@ -136,8 +147,9 @@ /obj/item/reagent_containers/food/snacks/tuna_sandwich name = "tuna sandwich" desc = "Both a salad and a sandwich in one." + icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tunasandwich" - trash = /obj/item/trash/plate + list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/nutriment/vitamin = 4) bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3) tastes = list("tuna" = 4, "mayonnaise" = 2, "bread" = 2) foodtype = GRAIN | MEAT diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index ec96a4537c..541c972490 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -179,3 +179,14 @@ id = /datum/reagent/consumable/bbqsauce results = list(/datum/reagent/consumable/bbqsauce = 5) required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/medicine/salglu_solution = 3, /datum/reagent/consumable/blackpepper = 1) + +/datum/chemical_reaction/margarine + name = "Margarine" + id = "margarine" + required_reagents = list(/datum/reagent/consumable/cornoil = 5, /datum/reagent/consumable/soymilk = 5, /datum/reagent/consumable/sodiumchloride = 1) + mix_message = "The ingredients solidify into a stick of margarine." + +/datum/chemical_reaction/margarine/on_reaction(datum/reagents/holder, multiplier) + var/location = get_turf(holder.my_atom) + for(var/i = 1, i <= multiplier, i++) + new /obj/item/reagent_containers/food/snacks/butter/margarine(location) \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm index e8640886c2..53c3682e2c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm @@ -22,6 +22,15 @@ result = /obj/item/reagent_containers/food/snacks/baconegg subcategory = CAT_EGG +/datum/crafting_recipe/food/wrap + name = "Egg Wrap" + reqs = list(/datum/reagent/consumable/soysauce = 10, + /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + ) + result = /obj/item/reagent_containers/food/snacks/eggwrap + subcategory = CAT_EGG + /datum/crafting_recipe/food/omelette name = "Omelette" reqs = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 359fadfb70..bbaa49a1eb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -14,15 +14,6 @@ result = /obj/item/reagent_containers/food/snacks/chawanmushi subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/wrap - name = "Egg Wrap" - reqs = list(/datum/reagent/consumable/soysauce = 10, - /obj/item/reagent_containers/food/snacks/friedegg = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, - ) - result = /obj/item/reagent_containers/food/snacks/eggwrap - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/khachapuri name = "Khachapuri" reqs = list( @@ -93,6 +84,16 @@ result = /obj/item/reagent_containers/food/snacks/cheesyfries subcategory = CAT_MISCFOOD +/datum/crafting_recipe/food/chilicheesefries + name = "Chilli cheese fries" + reqs = list( + /obj/item/reagent_containers/food/snacks/fries = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chilicheesefries + subcategory = CAT_MISCFOOD + /datum/crafting_recipe/food/eggplantparm name ="Eggplant parmigiana" reqs = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index d2ea1da50a..60bcd65a80 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -25,6 +25,17 @@ result = /obj/item/reagent_containers/food/snacks/grilledcheese subcategory = CAT_SANDWICH +/datum/crafting_recipe/food/baconlettucetomato + name = "BLT sandwich" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/bacon = 2, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1, + /datum/reagent/consumable/mayonnaise = 5 + ) + result = /obj/item/reagent_containers/food/snacks/baconlettucetomato + subcategory = CAT_SANDWICH + /datum/crafting_recipe/food/slimesandwich name = "Jelly sandwich" reqs = list( @@ -99,7 +110,7 @@ /obj/item/reagent_containers/food/snacks/breadslice/plain = 2, /obj/item/reagent_containers/food/snacks/tuna = 1, /obj/item/reagent_containers/food/snacks/grown/onion = 1, - /obj/item/reagent_containers/food/condiment/mayonnaise = 5 + /datum/reagent/consumable/mayonnaise = 5 ) result = /obj/item/reagent_containers/food/snacks/tuna_sandwich subcategory = CAT_SANDWICH diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi index 414930ac25..7ef3a7d418 100644 Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index e7196190cf..e87a37d069 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ