diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 5d04b8b9c77..e6d2c0dc642 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -310,8 +310,8 @@ src.bitesize = 6 /obj/item/weapon/reagent_containers/food/snacks/faggot - name = "Faggot" - desc = "A great meal all round. Not a cord of wood." + name = "meatball" + desc = "A great meal all round." icon_state = "faggot" New() ..() @@ -1735,14 +1735,12 @@ del(W) del(src) - - /obj/item/weapon/reagent_containers/food/snacks/dough name = "dough" desc = "A dough." icon = 'food_ingredients.dmi' icon_state = "dough" - bitesize = 3 + bitesize = 2 New() ..() reagents.add_reagent("nutriment", 5) @@ -1763,7 +1761,6 @@ icon_state = "flat dough" slice_path = /obj/item/weapon/reagent_containers/food/snacks/doughslice slices_num = 3 - bitesize = 3 New() ..() reagents.add_reagent("nutriment", 3) @@ -1775,7 +1772,7 @@ icon_state = "doughslice" New() ..() - bitesize = 1 + bitesize = 2 reagents.add_reagent("nutriment", 2) /obj/item/weapon/reagent_containers/food/snacks/bun @@ -1849,12 +1846,12 @@ else ..() -// Big bite burger + Big bite burger = super bite burger +// Big bite burger + Big bite burger = unfinished super bite burger /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger/attackby(obj/item/weapon/reagent_containers/food/snacks/bigbiteburger/W as obj, mob/user as mob) if(istype(W)) var/turf/spawnloc = foodloc(user, src) - new /obj/item/weapon/reagent_containers/food/snacks/superbiteburger(spawnloc) - user << "You make a super bite burger." + new /obj/item/weapon/reagent_containers/food/snacks/unfinished_superbiteburger(spawnloc) + user << "You start to make a super bite burger. It could use more ingredients." del(W) del(src) return @@ -1875,6 +1872,7 @@ desc = "A thin piece of meat." icon = 'food_ingredients.dmi' icon_state = "rawcutlet" + bitesize = 1 New() ..() reagents.add_reagent("nutriment", 1) @@ -1884,13 +1882,14 @@ desc = "A tasty meat slice - 'Bacon'." icon = 'food_ingredients.dmi' icon_state = "cutlet" + bitesize = 2 New() ..() reagents.add_reagent("nutriment", 2) /obj/item/weapon/reagent_containers/food/snacks/rawfaggot - name = "raw faggot" - desc = "A raw faggot." + name = "raw meatball" + desc = "A raw meatball." icon = 'food_ingredients.dmi' icon_state = "rawmeatball" bitesize = 2 @@ -1902,7 +1901,7 @@ name = "hotdog" desc = "Unrelated to dogs." icon_state = "hotdog" - bitesize = 3 + bitesize = 2 New() ..() reagents.add_reagent("nutriment", 6) @@ -1930,6 +1929,27 @@ desc = "Maybe you should cook it first?" icon = 'food_ingredients.dmi' icon_state = "rawsticks" + bitesize = 2 New() ..() - reagents.add_reagent("nutriment", 3) \ No newline at end of file + reagents.add_reagent("nutriment", 3) + +/obj/item/weapon/reagent_containers/food/snacks/mint + name = "mint" + desc = "Minty fresh!" + icon_state = "mint" + trash = "plate" + bitesize = 3 + New() + ..() + reagents.add_reagent("sugar", 2) + reagents.add_reagent("frostoil", 1) + +/obj/item/weapon/reagent_containers/food/snacks/unfinished_superbiteburger + name = "Unfinished Super Bite Burger" + desc = "This is a mountain of a burger. Could be bigger." + icon_state = "superbiteburger" + New() + ..() + reagents.add_reagent("nutriment", 30) + bitesize = 10 diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 0151c090c90..d5922514f52 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -126,7 +126,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/burger/mime /datum/recipe/waffles - reagents = list("sugar" = 10) + reagents = list("sugar" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/dough @@ -238,7 +238,7 @@ result = /obj/item/weapon/reagent_containers/food/snacks/omelette /datum/recipe/muffin - reagents = list("milk" = 5, "sugar" = 5) + reagents = list("milk" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/dough, ) @@ -625,7 +625,7 @@ /datum/recipe/enchiladas items = list( - /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat, + /obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/corn, @@ -654,9 +654,8 @@ /datum/recipe/baguette reagents = list("sodiumchloride" = 1, "blackpepper" = 1) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, ) result = /obj/item/weapon/reagent_containers/food/snacks/baguette @@ -668,23 +667,19 @@ result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips /datum/recipe/birthdaycake - reagents = list("milk" = 5) + reagents = list("milk" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/clothing/head/cakehat ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake /datum/recipe/bread items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/egg, ) result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread @@ -720,12 +715,10 @@ result = /obj/item/weapon/reagent_containers/food/snacks/tomatosoup /datum/recipe/rofflewaffles - reagents = list("psilocybin" = 5) + reagents = list("psilocybin" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, ) result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles @@ -786,9 +779,8 @@ /datum/recipe/poppypretzel items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/seeds/poppyseed, - /obj/item/weapon/reagent_containers/food/snacks/egg, ) result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel @@ -821,21 +813,17 @@ /datum/recipe/applepie items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, ) result = /obj/item/weapon/reagent_containers/food/snacks/applepie /datum/recipe/applecake - reagents = list("milk" = 5) + reagents = list("milk" = 5, "sugar" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/flour, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, - /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, + /obj/item/weapon/reagent_containers/food/snacks/dough, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, /obj/item/weapon/reagent_containers/food/snacks/grown/apple, ) @@ -1037,3 +1025,16 @@ /obj/item/weapon/reagent_containers/food/snacks/rawsticks ) result = /obj/item/weapon/reagent_containers/food/snacks/fries + +/datum/recipe/mint + reagents = list("sugar" = 5, "frostoil" = 5) + result = /obj/item/weapon/reagent_containers/food/snacks/mint + +/datum/recipe/superbiteburger + reagents = list("salt" = 5, "pepper" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/unfinished_superbiteburger, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/egg, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi index 2dab14f095a..eea8240f6d8 100644 Binary files a/icons/obj/food_ingredients.dmi and b/icons/obj/food_ingredients.dmi differ