ports tg sprites for some foods, reorginizes

food icon folder a bit
shiptest-ss13 · Nov 8, 2023 · b54d860 · b54d860
1 parent 175acfc
commit b54d860
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/icons/obj/food/donk.dmi b/icons/obj/food/donk.dmi
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
diff --git a/icons/obj/food/food_ingredients.dmi b/icons/obj/food/food_ingredients.dmi
diff --git a/icons/obj/food/pizza.dmi b/icons/obj/food/pizza.dmi
diff --git a/icons/obj/food/spaghetti.dmi b/icons/obj/food/spaghetti.dmi