Newfood Atomization: Pies (#10193)

* pies * fixer
BeeStation · Nov 28, 2023 · bb091bd · bb091bd
1 parent 0ab86d4
commit bb091bd
Show file tree

Hide file tree

Showing 27 changed files with 445 additions and 376 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
diff --git a/_maps/RuinGeneration/13x13_cafe.dmm b/_maps/RuinGeneration/13x13_cafe.dmm
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
diff --git a/_maps/shuttles/emergency/emergency_luxury.dmm b/_maps/shuttles/emergency/emergency_luxury.dmm
diff --git a/beestation.dme b/beestation.dme
@@ -1414,6 +1414,7 @@
 #include "code\game\objects\items\food\mexican.dm"
 #include "code\game\objects\items\food\pancakes.dm"
 #include "code\game\objects\items\food\pastries.dm"
+#include "code\game\objects\items\food\pie.dm"
 #include "code\game\objects\items\food\pizza.dm"
 #include "code\game\objects\items\food\salad.dm"
 #include "code\game\objects\items\food\spaghetti.dm"
@@ -2564,7 +2565,6 @@
 #include "code\modules\food_and_drinks\food\snacks_frozen.dm"
 #include "code\modules\food_and_drinks\food\snacks_meat.dm"
 #include "code\modules\food_and_drinks\food\snacks_other.dm"
-#include "code\modules\food_and_drinks\food\snacks_pie.dm"
 #include "code\modules\food_and_drinks\food\snacks_sandwichtoast.dm"
 #include "code\modules\food_and_drinks\food\snacks_vend.dm"
 #include "code\modules\food_and_drinks\food\snacks\meat.dm"

diff --git a/code/__HELPERS/randoms.dm b/code/__HELPERS/randoms.dm
@@ -10,7 +10,7 @@
 		/obj/item/food/cake,
 		/obj/item/food/cakeslice,
 		/obj/item/reagent_containers/food/snacks/store,
-		/obj/item/reagent_containers/food/snacks/pie,
+		/obj/item/food/pie,
 		/obj/item/reagent_containers/food/snacks/kebab,
 		/obj/item/food/pizza,
 		/obj/item/food/pizzaslice,

diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
@@ -282,7 +282,7 @@
 		/obj/item/clothing/mask/gas/clown_hat = 4,
 		/obj/item/clothing/shoes/clown_shoes = 3,
 		/obj/item/bikehorn = 5,
-		/obj/item/reagent_containers/food/snacks/pie/cream = 3)
+		/obj/item/food/pie/cream = 3)
 
 /obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner
 	name = "2% chance xeno egg spawner"

diff --git a/code/game/objects/items/food/dough.dm b/code/game/objects/items/food/dough.dm
@@ -111,7 +111,7 @@
 	desc = "Cook it to get a pie."
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "piedough"
-	microwaved_type = /obj/item/reagent_containers/food/snacks/pie/plain
+	microwaved_type = /obj/item/food/pie/plain
 	food_reagents = list(/datum/reagent/consumable/nutriment = 9)
 	tastes = list("dough" = 1)
 	foodtypes = GRAIN | DAIRY