diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index 725ff27bb7c..69b8335e2b2 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -169,6 +169,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, +/obj/item/reagent_containers/cooking/bowl, /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aB" = ( diff --git a/code/modules/cooking/recipes/grill_recipes.dm b/code/modules/cooking/recipes/grill_recipes.dm index e9d7a8b6bc3..f511e080f98 100644 --- a/code/modules/cooking/recipes/grill_recipes.dm +++ b/code/modules/cooking/recipes/grill_recipes.dm @@ -1,3 +1,47 @@ +/datum/cooking/recipe/ash_kebab + container_type = /obj/item/reagent_containers/cooking/grill_grate + product_type = /obj/item/food/meat/ash_kebab + catalog_category = COOKBOOK_CATEGORY_MEAT + steps = list( + PCWJ_ADD_ITEM(/obj/item/stack/rods), + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/mushroom_leaf), + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/cactus_fruit), + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/cactus_fruit), + PCWJ_ADD_ITEM(/obj/item/food/monstermeat/goliath), + PCWJ_USE_GRILL(J_MED, 10 SECONDS), + ) + +/datum/cooking/recipe/ash_kebab_crafted + container_type = /obj/item/reagent_containers/cooking/grill_grate + product_type = /obj/item/food/meat/ash_kebab + catalog_category = COOKBOOK_CATEGORY_MEAT + steps = list( + PCWJ_ADD_ITEM(/obj/item/food/meat/raw_ash_kebab), + PCWJ_USE_GRILL(J_MED, 10 SECONDS), + ) + +/datum/cooking/recipe/ash_kebab_bone + container_type = /obj/item/reagent_containers/cooking/grill_grate + product_type = /obj/item/food/meat/ash_kebab/bone + catalog_category = COOKBOOK_CATEGORY_MEAT + steps = list( + PCWJ_ADD_ITEM(/obj/item/stack/bone_rods), + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/mushroom_leaf), + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/cactus_fruit), + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/cactus_fruit), + PCWJ_ADD_ITEM(/obj/item/food/monstermeat/goliath), + PCWJ_USE_GRILL(J_MED, 10 SECONDS), + ) + +/datum/cooking/recipe/ash_kebab_bone_crafted + container_type = /obj/item/reagent_containers/cooking/grill_grate + product_type = /obj/item/food/meat/ash_kebab/bone + catalog_category = COOKBOOK_CATEGORY_MEAT + steps = list( + PCWJ_ADD_ITEM(/obj/item/food/meat/raw_ash_kebab/bone), + PCWJ_USE_GRILL(J_MED, 10 SECONDS), + ) + /datum/cooking/recipe/bacon container_type = /obj/item/reagent_containers/cooking/grill_grate product_type = /obj/item/food/bacon diff --git a/code/modules/cooking/recipes/prep_bowl_recipes.dm b/code/modules/cooking/recipes/prep_bowl_recipes.dm index 26422b2c957..3f4db44e965 100644 --- a/code/modules/cooking/recipes/prep_bowl_recipes.dm +++ b/code/modules/cooking/recipes/prep_bowl_recipes.dm @@ -22,6 +22,17 @@ PCWJ_ADD_PRODUCE(/obj/item/food/grown/tomato), ) +/datum/cooking/recipe/ash_salad + container_type = /obj/item/reagent_containers/cooking/bowl + product_type = /obj/item/food/salad/ash_salad + catalog_category = COOKBOOK_CATEGORY_SALADS + steps = list( + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/mushroom_leaf), + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/mushroom_leaf), + PCWJ_ADD_ITEM(/obj/item/food/grown/ash_flora/cactus_fruit), + PCWJ_ADD_ITEM(/obj/item/food/goliath_steak), + ) + /datum/cooking/recipe/caesar_salad container_type = /obj/item/reagent_containers/cooking/bowl product_type = /obj/item/food/salad/caesar diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index 16e7520817f..21f6b149e27 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -23,7 +23,8 @@ list( CAT_CAKE, CAT_SUSHI, - CAT_SANDWICH + CAT_SANDWICH, + CAT_MEAT ), // Decoration subcategories list( diff --git a/code/modules/food_and_drinks/food/foods/ethnic.dm b/code/modules/food_and_drinks/food/foods/ethnic.dm index d4dd9f2f3c3..603f95a461b 100644 --- a/code/modules/food_and_drinks/food/foods/ethnic.dm +++ b/code/modules/food_and_drinks/food/foods/ethnic.dm @@ -145,6 +145,50 @@ // Middle Eastern // ////////////////////// +/obj/item/food/meat/raw_ash_kebab + name = "Uncooked Ash Kebab" + desc = "A kebab of edible fauna and flora from an ashy wasteland, the meat is still raw." + icon_state = "ash_kebab_raw" + trash = /obj/item/stack/rods + list_reagents = list("vitamin" = 1, "plantmatter" = 1, "vitfro" = 1) + +/obj/item/food/meat/raw_ash_kebab/burn() + visible_message(SPAN_NOTICE("[src] finishes cooking!")) + new /obj/item/food/meat/ash_kebab(loc) + qdel(src) + +/obj/item/food/meat/raw_ash_kebab/bone + icon_state = "ash_kebab_raw_bone" + trash = /obj/item/stack/bone_rods + +/obj/item/food/meat/raw_ash_kebab/bone/burn() + visible_message(SPAN_NOTICE("[src] finishes cooking!")) + new /obj/item/food/meat/ash_kebab/bone(loc) + qdel(src) + +/obj/item/food/meat/ash_kebab + name = "Ash Kebab" + desc = "A kebab of edible fauna and flora from an ashy wasteland." + resistance_flags = FIRE_PROOF + icon_state = "ash_kebab" + trash = /obj/item/stack/rods + list_reagents = list("protein" = 2, "vitamin" = 2, "plantmatter" = 2, "vitfro" = 2) // Nutritious, and addictive from the leaf shroom ingredient + tastes = list("meat" = 1, "cactus fruit" = 2, "mushroomy cabbage" = 1, "ash" = 1) + +/obj/item/food/meat/ash_kebab/burn() + visible_message(SPAN_NOTICE("[src] burns, leaving only the Goliath Steak!")) // The steak is lavaproof, the rest is only fireproof + new /obj/item/food/goliath_steak(loc) + qdel(src) + +/obj/item/food/meat/ash_kebab/bone + icon_state = "ash_kebab_bone" + trash = /obj/item/stack/bone_rods + +/obj/item/food/meat/ash_kebab/bone/burn() + visible_message(SPAN_NOTICE("[src] burns, leaving only the Goliath Steak!")) + new /obj/item/food/goliath_steak(loc) + qdel(src) + /obj/item/food/meatkebab name = "meat-kebab" desc = "Delicious meat, on a stick." diff --git a/code/modules/food_and_drinks/food/foods/misc_food.dm b/code/modules/food_and_drinks/food/foods/misc_food.dm index 3e228086384..2aff7b48c09 100644 --- a/code/modules/food_and_drinks/food/foods/misc_food.dm +++ b/code/modules/food_and_drinks/food/foods/misc_food.dm @@ -94,6 +94,19 @@ list_reagents = list("nutriment" = 12, "protein" = 6, "vitamin" = 6) tastes = list("lettuce" = 2, "salami" = 2, "mozzarella cheese" = 2, "tomatoes" = 2, "dressing" = 1) +/obj/item/food/salad/ash_salad + name = "Ashlander Salad" + desc = "A salad of edible fauna and flora from an ashy wasteland." + resistance_flags = FIRE_PROOF + icon_state = "ash_salad" + list_reagents = list("protein" = 2, "vitamin" = 2, "plantmatter" = 2, "vitfro" = 1, "nicotine" = 2) // Nutritious and addictive + tastes = list("meat" = 1, "cactus fruit" = 2, "mushroomy cabbage" = 1, "ash" = 1) + +/obj/item/food/salad/ash_salad/burn() + visible_message(SPAN_NOTICE("[src] burns, leaving only the Goliath Steak!")) // The steak is lavaproof, the rest is only fireproof + new /obj/item/food/goliath_steak(loc) + qdel(src) + /obj/item/food/salad/caesar name = "Caesar salad" desc = "A simple yet flavorful salad of onions, lettuce, croutons, and shreds of cheese dressed in oil. Comes with a slice of pita bread!" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm index 6fa058fd9fc..303c03870ae 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm @@ -1,3 +1,27 @@ +/datum/crafting_recipe/raw_ash_kebab + name = "Uncooked Ash Kebab" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/food/grown/ash_flora/mushroom_leaf = 1, + /obj/item/food/grown/ash_flora/cactus_fruit = 2, + /obj/item/food/monstermeat/goliath = 1 + ) + result = list(/obj/item/food/meat/raw_ash_kebab) + category = CAT_FOOD + subcategory = CAT_MEAT + +/datum/crafting_recipe/raw_ash_kebab_bone + name = "Uncooked Ash Kebab" + reqs = list( + /obj/item/stack/bone_rods = 1, + /obj/item/food/grown/ash_flora/mushroom_leaf = 1, + /obj/item/food/grown/ash_flora/cactus_fruit = 2, + /obj/item/food/monstermeat/goliath = 1 + ) + result = list(/obj/item/food/meat/raw_ash_kebab/bone) + category = CAT_FOOD + subcategory = CAT_MEAT + /datum/crafting_recipe/sandwich name = "Sandwich" reqs = list( diff --git a/icons/obj/cooking/containers.dmi b/icons/obj/cooking/containers.dmi index fd644ef3d9f..00d8b831440 100644 Binary files a/icons/obj/cooking/containers.dmi and b/icons/obj/cooking/containers.dmi differ diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi index 6c7f894a9eb..ac4cd08d0ad 100644 Binary files a/icons/obj/food/meat.dmi and b/icons/obj/food/meat.dmi differ diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi index d70536a7f6f..4479c082dcb 100644 Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ