diff --git a/_maps/RandomRuins/JungleRuins/jungle_witch.dmm b/_maps/RandomRuins/JungleRuins/jungle_witch.dmm index 70080ddae51b..e84d83563522 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_witch.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_witch.dmm @@ -165,7 +165,7 @@ "vf" = ( /obj/structure/table/wood/fancy/cyan, /obj/item/reagent_containers/food/snacks/burger/spell, -/obj/item/reagent_containers/food/snacks/dankpocket{ +/obj/item/reagent_containers/food/snacks/donkpocket/dankpocket{ pixel_x = 8; pixel_y = 10 }, diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 465b7939c0b7..8c179022b6ef 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -196,7 +196,7 @@ desc = "Noodles. With stuff. Delicious." ingredients_placement = INGREDIENTS_SCATTER ingMax = 6 - icon = 'icons/obj/food/pizzaspaghetti.dmi' + icon = 'icons/obj/food/spaghetti.dmi' icon_state = "spaghettiboiled" foodtype = GRAIN @@ -216,7 +216,7 @@ ingMax = 8 slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/custom slices_num = 6 - icon = 'icons/obj/food/pizzaspaghetti.dmi' + icon = 'icons/obj/food/pizza.dmi' icon_state = "pizzamargherita" foodtype = GRAIN | DAIRY diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index f0b98f1554db..4ecd555559de 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -687,6 +687,7 @@ name = "Canned Air" desc = "If you ever wondered where air came from..." list_reagents = list(/datum/reagent/oxygen = 6, /datum/reagent/nitrogen = 24) + icon = 'icons/obj/food/canned.dmi' icon_state = "peachcan" in_container = TRUE reagent_flags = NONE @@ -899,6 +900,7 @@ /obj/item/reagent_containers/food/snacks/ready_donk/warm name = "warm Ready-Donk: Bachelor Chow" desc = "A quick Donk-dinner, now with flavour! And it's even hot!" + icon = 'icons/obj/food/donk.dmi' icon_state = "ready_donk_warm" list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/omnizine = 3) cooked_type = null diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index d060dc1c2969..f57421e15aa8 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -414,6 +414,7 @@ /obj/item/reagent_containers/food/snacks/donkpocket name = "\improper Donk-pocket" desc = "The food of choice for the seasoned traitor." + icon = 'icons/obj/food/donk.dmi' icon_state = "donkpocket" list_reagents = list(/datum/reagent/consumable/nutriment = 4) cooked_type = /obj/item/reagent_containers/food/snacks/donkpocket/warm @@ -430,10 +431,11 @@ tastes = list("meat" = 2, "dough" = 2, "laziness" = 1) foodtype = GRAIN -/obj/item/reagent_containers/food/snacks/dankpocket +/obj/item/reagent_containers/food/snacks/donkpocket/dankpocket name = "\improper Dank-pocket" desc = "The food of choice for the seasoned botanist." icon_state = "dankpocket" + bonus_reagents = list(/datum/reagent/drug/space_drugs = 3) list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4) filling_color = "#00FF00" tastes = list("meat" = 2, "dough" = 2) diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index 9b8e949b06e6..085583efffc0 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -2,7 +2,7 @@ /////////////////////////////////////////////////PIZZA//////////////////////////////////////// /obj/item/reagent_containers/food/snacks/pizza - icon = 'icons/obj/food/pizzaspaghetti.dmi' + icon = 'icons/obj/food/pizza.dmi' w_class = WEIGHT_CLASS_NORMAL slices_num = 6 volume = 80 @@ -11,7 +11,7 @@ foodtype = GRAIN | DAIRY | VEGETABLES /obj/item/reagent_containers/food/snacks/pizzaslice - icon = 'icons/obj/food/pizzaspaghetti.dmi' + icon = 'icons/obj/food/pizza.dmi' list_reagents = list(/datum/reagent/consumable/nutriment = 5) foodtype = GRAIN | DAIRY | VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm index 342d61b222f7..dba6b2e9d59f 100644 --- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm +++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm @@ -2,7 +2,7 @@ /obj/item/reagent_containers/food/snacks/spaghetti name = "spaghetti" desc = "Now that's a nic'e pasta!" - icon = 'icons/obj/food/pizzaspaghetti.dmi' + icon = 'icons/obj/food/spaghetti.dmi' icon_state = "spaghetti" list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) cooked_type = /obj/item/reagent_containers/food/snacks/spaghetti/boiledspaghetti 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 ec04dcaa4ec9..6df27c22eebe 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -334,7 +334,7 @@ /obj/item/reagent_containers/food/snacks/pastrybase = 1, /obj/item/reagent_containers/food/snacks/grown/cannabis = 1 ) - result = /obj/item/reagent_containers/food/snacks/dankpocket + result = /obj/item/reagent_containers/food/snacks/donkpocket/dankpocket subcategory = CAT_PASTRY /datum/crafting_recipe/food/donkpocket/spicy diff --git a/icons/obj/food/canned.dmi b/icons/obj/food/canned.dmi new file mode 100644 index 000000000000..ed6e464c0f2a Binary files /dev/null and b/icons/obj/food/canned.dmi differ diff --git a/icons/obj/food/donk.dmi b/icons/obj/food/donk.dmi new file mode 100644 index 000000000000..1d65bad61ed5 Binary files /dev/null and b/icons/obj/food/donk.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index b1ed971658eb..3b5b1911afda 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/food_ingredients.dmi b/icons/obj/food/food_ingredients.dmi index b761943de00a..cc086702d8d8 100644 Binary files a/icons/obj/food/food_ingredients.dmi and b/icons/obj/food/food_ingredients.dmi differ diff --git a/icons/obj/food/pizza.dmi b/icons/obj/food/pizza.dmi new file mode 100644 index 000000000000..aad566695d43 Binary files /dev/null and b/icons/obj/food/pizza.dmi differ diff --git a/icons/obj/food/spaghetti.dmi b/icons/obj/food/spaghetti.dmi new file mode 100644 index 000000000000..7386f3ba3d48 Binary files /dev/null and b/icons/obj/food/spaghetti.dmi differ