diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index 0b5404a6022..7d52a78c714 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -326,6 +326,16 @@ w_class = WEIGHT_CLASS_SMALL burns_on_grill = TRUE +/obj/item/food/meatbun + name = "meat bun" + desc = "Has the potential to not be Dog." + icon_state = "meatbun" + food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 4) + tastes = list("bun" = 3, "meat" = 2) + foodtypes = GRAIN | MEAT | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + venue_value = FOOD_PRICE_CHEAP + /obj/item/food/monkeycube name = "monkey cube" desc = "Just add water!" @@ -404,16 +414,6 @@ tastes = list("buzzing" = 1, "honey" = 1, "regret" = 1) spawned_mob = /mob/living/simple_animal/hostile/poison/bees -/obj/item/food/enchiladas - name = "enchiladas" - desc = "Viva La Mexico!" - icon_state = "enchiladas" - bite_consumption = 4 - food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/capsaicin = 6, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1) - foodtypes = MEAT - w_class = WEIGHT_CLASS_SMALL - /obj/item/food/stewedsoymeat name = "stewed soy meat" desc = "Even non-vegetarians will LOVE this!" diff --git a/code/game/objects/items/food/mexican.dm b/code/game/objects/items/food/mexican.dm index d2cbe4b1251..30902cacaaf 100644 --- a/code/game/objects/items/food/mexican.dm +++ b/code/game/objects/items/food/mexican.dm @@ -96,6 +96,16 @@ foodtypes = MEAT | DAIRY | GRAIN venue_value = FOOD_PRICE_CHEAP +/obj/item/food/enchiladas + name = "enchiladas" + desc = "Viva La Mexico!" + icon_state = "enchiladas" + bite_consumption = 4 + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 7, /datum/reagent/consumable/capsaicin = 6, /datum/reagent/consumable/nutriment/vitamin = 2) + tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1) + foodtypes = MEAT | GRAIN + w_class = WEIGHT_CLASS_SMALL + /obj/item/food/stuffedlegion name = "stuffed legion" desc = "The former skull of a damned human, filled with goliath meat. It has a decorative lava pool made of ketchup and hotsauce." diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm index bb948c1435c..2a98566d296 100644 --- a/code/game/objects/items/food/pastries.dm +++ b/code/game/objects/items/food/pastries.dm @@ -617,30 +617,6 @@ foodtypes = GRAIN w_class = WEIGHT_CLASS_TINY -/obj/item/food/hotdog - name = "hotdog" - desc = "Fresh footlong ready to go down on." - icon_state = "hotdog" - bite_consumption = 3 - food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/ketchup = 3, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("bun" = 3, "meat" = 2) - foodtypes = GRAIN | MEAT | VEGETABLES - w_class = WEIGHT_CLASS_SMALL - venue_value = FOOD_PRICE_CHEAP - -/obj/item/food/hotdog/debug - eat_time = 0 - -/obj/item/food/meatbun - name = "meat bun" - desc = "Has the potential to not be Dog." - icon_state = "meatbun" - food_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 4) - tastes = list("bun" = 3, "meat" = 2) - foodtypes = GRAIN | MEAT | VEGETABLES - w_class = WEIGHT_CLASS_SMALL - venue_value = FOOD_PRICE_CHEAP - /obj/item/food/khachapuri name = "khachapuri" desc = "Bread with egg and cheese?" diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm index 987335eac38..4e133f75db8 100644 --- a/code/game/objects/items/food/salad.dm +++ b/code/game/objects/items/food/salad.dm @@ -35,14 +35,6 @@ tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1) foodtypes = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT -/obj/item/food/salad/oatmeal - name = "oatmeal" - desc = "A nice bowl of oatmeal." - icon_state = "oatmeal" - food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/nutriment/vitamin = 6) - tastes = list("oats" = 1, "milk" = 1) - foodtypes = DAIRY | GRAIN | BREAKFAST - /obj/item/food/salad/fruit name = "fruit salad" desc = "Your standard fruit salad." diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm index 258224bb97c..2a0885299d9 100644 --- a/code/game/objects/items/food/sandwichtoast.dm +++ b/code/game/objects/items/food/sandwichtoast.dm @@ -104,3 +104,17 @@ tastes = list("bread" = 2) foodtypes = GRAIN w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/hotdog + name = "hotdog" + desc = "Fresh footlong ready to go down on." + icon_state = "hotdog" + bite_consumption = 3 + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/protein = 1, /datum/reagent/consumable/ketchup = 3, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("bun" = 3, "meat" = 2) + foodtypes = GRAIN | MEAT | VEGETABLES + w_class = WEIGHT_CLASS_SMALL + venue_value = FOOD_PRICE_CHEAP + +/obj/item/food/hotdog/debug + eat_time = 0 diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm index ac1bc58f3cb..fe9ecf56295 100644 --- a/code/game/objects/items/food/soup.dm +++ b/code/game/objects/items/food/soup.dm @@ -216,6 +216,7 @@ tastes = list("sweet potato" = 1) foodtypes = VEGETABLES | SUGAR venue_value = FOOD_PRICE_NORMAL + /obj/item/food/soup/beet/red name = "red beet soup" desc = "Quite a delicacy." @@ -279,3 +280,11 @@ tastes = list("chicken" = 2, "creamy curry" = 4, "earthy heat" = 1) foodtypes = VEGETABLES | MEAT | DAIRY venue_value = FOOD_PRICE_NORMAL + +/obj/item/food/soup/oatmeal + name = "oatmeal" + desc = "A nice bowl of oatmeal." + icon_state = "oatmeal" + food_reagents = list(/datum/reagent/consumable/nutriment = 11, /datum/reagent/consumable/milk = 10, /datum/reagent/consumable/nutriment/vitamin = 6) + tastes = list("oats" = 1, "milk" = 1) + foodtypes = DAIRY | GRAIN | BREAKFAST diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index e2a11dfb20b..23d5f7b7c37 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -135,16 +135,6 @@ result = /obj/item/food/bearsteak subcategory = CAT_MEAT -/datum/crafting_recipe/food/enchiladas - name = "Enchiladas" - reqs = list( - /obj/item/food/meat/cutlet = 2, - /obj/item/food/grown/chili = 2, - /obj/item/food/tortilla = 2 - ) - result = /obj/item/food/enchiladas - subcategory = CAT_MEAT - /datum/crafting_recipe/food/stewedsoymeat name = "Stewed soymeat" reqs = list( @@ -182,6 +172,17 @@ result = /obj/item/food/rawkhinkali subcategory = CAT_MEAT +/datum/crafting_recipe/food/meatbun + name = "Meat bun" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /obj/item/food/bun = 1, + /obj/item/food/meatball = 1, + /obj/item/food/grown/cabbage = 1 + ) + result = /obj/item/food/meatbun + subcategory = CAT_MEAT + /datum/crafting_recipe/food/pigblanket name = "Pig in a Blanket" reqs = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm index ef10c934d5e..589873348f8 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm @@ -92,6 +92,16 @@ result = /obj/item/food/taco/plain subcategory = CAT_MEXICAN +/datum/crafting_recipe/food/enchiladas + name = "Enchiladas" + reqs = list( + /obj/item/food/meat/cutlet = 2, + /obj/item/food/grown/chili = 2, + /obj/item/food/tortilla = 2 + ) + result = /obj/item/food/enchiladas + subcategory = CAT_MEXICAN + /datum/crafting_recipe/food/stuffedlegion name = "Stuffed legion" time = 40 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 bed2f554387..76c313f3232 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -86,19 +86,6 @@ result = /obj/item/food/eggplantparm subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/melonfruitbowl - name ="Melon fruit bowl" - reqs = list( - /obj/item/food/grown/watermelon = 1, - /obj/item/food/grown/apple = 1, - /obj/item/food/grown/citrus/orange = 1, - /obj/item/food/grown/citrus/lemon = 1, - /obj/item/food/grown/banana = 1, - /obj/item/food/grown/ambrosia = 1 - ) - result = /obj/item/food/melonfruitbowl - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/melonkeg name ="Melon keg" reqs = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 98f2d8db563..c5ba336bac6 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -445,26 +445,6 @@ ////////////////////////////////////////////OTHER//////////////////////////////////////////// -/datum/crafting_recipe/food/hotdog - name = "Hot dog" - reqs = list( - /datum/reagent/consumable/ketchup = 5, - /obj/item/food/bun = 1, - /obj/item/food/sausage = 1 - ) - result = /obj/item/food/hotdog - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/meatbun - name = "Meat bun" - reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/food/bun = 1, - /obj/item/food/meatball = 1, - /obj/item/food/grown/cabbage = 1 - ) - result = /obj/item/food/meatbun - subcategory = CAT_PASTRY /datum/crafting_recipe/food/khachapuri name = "Khachapuri" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 4848d55c461..005abd9d1da 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -47,14 +47,17 @@ result = /obj/item/food/soup/monkeysdelight subcategory = CAT_SALAD -/datum/crafting_recipe/food/oatmeal - name = "Oatmeal" +/datum/crafting_recipe/food/melonfruitbowl + name ="Melon fruit bowl" reqs = list( - /datum/reagent/consumable/milk = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/food/grown/oat = 1 + /obj/item/food/grown/watermelon = 1, + /obj/item/food/grown/apple = 1, + /obj/item/food/grown/citrus/orange = 1, + /obj/item/food/grown/citrus/lemon = 1, + /obj/item/food/grown/banana = 1, + /obj/item/food/grown/ambrosia = 1 ) - result = /obj/item/food/salad/oatmeal + result = /obj/item/food/melonfruitbowl subcategory = CAT_SALAD /datum/crafting_recipe/food/fruitsalad 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 c60fbd3e8eb..a3c4b193d0b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -52,5 +52,13 @@ result = /obj/item/food/notasandwich subcategory = CAT_SANDWICH - +/datum/crafting_recipe/food/hotdog + name = "Hot dog" + reqs = list( + /datum/reagent/consumable/ketchup = 5, + /obj/item/food/bun = 1, + /obj/item/food/sausage = 1 + ) + result = /obj/item/food/hotdog + subcategory = CAT_SANDWICH diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 7eed503f993..65a7a30201f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -319,3 +319,13 @@ ) result = /obj/item/food/soup/indian_curry subcategory = CAT_SOUP + +/datum/crafting_recipe/food/oatmeal + name = "Oatmeal" + reqs = list( + /datum/reagent/consumable/milk = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/food/grown/oat = 1 + ) + result = /obj/item/food/soup/oatmeal + subcategory = CAT_SOUP