From 564939d751e7417efa4e53b1738227f97191bde2 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Tue, 16 Jun 2026 04:43:26 +0200 Subject: [PATCH] moves the material container files inside the datum/materials folder and the food folder inside module/food_and_drinks. (#96526) ## About The Pull Request Title. ## Why It's Good For The Game In the case of materials. the two folders had roughly the same names, and material_containers rely on materials to work anyway so they belong inside the materials folder, instead of a separate directory with the same name (minus an s). As for food, the food items have filepaths that differ too much from the corresponding recipe files, despite the two being closely connected as far as features and game mechanics go, and that makes moving back and forth between these files a pain in the ass with a standard file manager, workspace viewer etc. ## Changelog N/A --- .../material_container}/material_container.dm | 0 .../material_container}/remote_materials.dm | 0 .../food_and_drinks}/food/_food.dm | 0 .../food_and_drinks}/food/bait.dm | 0 .../food_and_drinks}/food/bread.dm | 0 .../food_and_drinks}/food/burgers.dm | 0 .../food_and_drinks}/food/cake.dm | 0 .../food_and_drinks}/food/cheese.dm | 0 .../food_and_drinks}/food/donkpocket.dm | 0 .../food_and_drinks}/food/donuts.dm | 0 .../food_and_drinks}/food/dough.dm | 0 .../food_and_drinks}/food/egg.dm | 0 .../food_and_drinks}/food/frozen.dm | 0 .../food_and_drinks}/food/lizard.dm | 0 .../food_and_drinks}/food/martian.dm | 0 .../food_and_drinks}/food/meatdish.dm | 0 .../food_and_drinks}/food/meatslab.dm | 0 .../food_and_drinks}/food/mexican.dm | 0 .../food_and_drinks}/food/misc.dm | 0 .../food_and_drinks}/food/monkeycube.dm | 0 .../food_and_drinks}/food/moth.dm | 0 .../food_and_drinks}/food/packaged.dm | 0 .../food_and_drinks}/food/pancakes.dm | 0 .../food_and_drinks}/food/pastries.dm | 0 .../food_and_drinks}/food/pie.dm | 0 .../food_and_drinks}/food/pizza.dm | 0 .../food_and_drinks}/food/salad.dm | 0 .../food_and_drinks}/food/sandwichtoast.dm | 0 .../food_and_drinks}/food/snacks.dm | 0 .../food_and_drinks}/food/soup.dm | 0 .../food_and_drinks}/food/spaghetti.dm | 0 .../food_and_drinks}/food/sweets.dm | 0 .../food_and_drinks}/food/vegetables.dm | 0 tgstation.dme | 66 +++++++++---------- 34 files changed, 33 insertions(+), 33 deletions(-) rename code/datums/{material => materials/material_container}/material_container.dm (100%) rename code/datums/{material => materials/material_container}/remote_materials.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/_food.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/bait.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/bread.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/burgers.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/cake.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/cheese.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/donkpocket.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/donuts.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/dough.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/egg.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/frozen.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/lizard.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/martian.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/meatdish.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/meatslab.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/mexican.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/misc.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/monkeycube.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/moth.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/packaged.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/pancakes.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/pastries.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/pie.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/pizza.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/salad.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/sandwichtoast.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/snacks.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/soup.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/spaghetti.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/sweets.dm (100%) rename code/{game/objects/items => modules/food_and_drinks}/food/vegetables.dm (100%) diff --git a/code/datums/material/material_container.dm b/code/datums/materials/material_container/material_container.dm similarity index 100% rename from code/datums/material/material_container.dm rename to code/datums/materials/material_container/material_container.dm diff --git a/code/datums/material/remote_materials.dm b/code/datums/materials/material_container/remote_materials.dm similarity index 100% rename from code/datums/material/remote_materials.dm rename to code/datums/materials/material_container/remote_materials.dm diff --git a/code/game/objects/items/food/_food.dm b/code/modules/food_and_drinks/food/_food.dm similarity index 100% rename from code/game/objects/items/food/_food.dm rename to code/modules/food_and_drinks/food/_food.dm diff --git a/code/game/objects/items/food/bait.dm b/code/modules/food_and_drinks/food/bait.dm similarity index 100% rename from code/game/objects/items/food/bait.dm rename to code/modules/food_and_drinks/food/bait.dm diff --git a/code/game/objects/items/food/bread.dm b/code/modules/food_and_drinks/food/bread.dm similarity index 100% rename from code/game/objects/items/food/bread.dm rename to code/modules/food_and_drinks/food/bread.dm diff --git a/code/game/objects/items/food/burgers.dm b/code/modules/food_and_drinks/food/burgers.dm similarity index 100% rename from code/game/objects/items/food/burgers.dm rename to code/modules/food_and_drinks/food/burgers.dm diff --git a/code/game/objects/items/food/cake.dm b/code/modules/food_and_drinks/food/cake.dm similarity index 100% rename from code/game/objects/items/food/cake.dm rename to code/modules/food_and_drinks/food/cake.dm diff --git a/code/game/objects/items/food/cheese.dm b/code/modules/food_and_drinks/food/cheese.dm similarity index 100% rename from code/game/objects/items/food/cheese.dm rename to code/modules/food_and_drinks/food/cheese.dm diff --git a/code/game/objects/items/food/donkpocket.dm b/code/modules/food_and_drinks/food/donkpocket.dm similarity index 100% rename from code/game/objects/items/food/donkpocket.dm rename to code/modules/food_and_drinks/food/donkpocket.dm diff --git a/code/game/objects/items/food/donuts.dm b/code/modules/food_and_drinks/food/donuts.dm similarity index 100% rename from code/game/objects/items/food/donuts.dm rename to code/modules/food_and_drinks/food/donuts.dm diff --git a/code/game/objects/items/food/dough.dm b/code/modules/food_and_drinks/food/dough.dm similarity index 100% rename from code/game/objects/items/food/dough.dm rename to code/modules/food_and_drinks/food/dough.dm diff --git a/code/game/objects/items/food/egg.dm b/code/modules/food_and_drinks/food/egg.dm similarity index 100% rename from code/game/objects/items/food/egg.dm rename to code/modules/food_and_drinks/food/egg.dm diff --git a/code/game/objects/items/food/frozen.dm b/code/modules/food_and_drinks/food/frozen.dm similarity index 100% rename from code/game/objects/items/food/frozen.dm rename to code/modules/food_and_drinks/food/frozen.dm diff --git a/code/game/objects/items/food/lizard.dm b/code/modules/food_and_drinks/food/lizard.dm similarity index 100% rename from code/game/objects/items/food/lizard.dm rename to code/modules/food_and_drinks/food/lizard.dm diff --git a/code/game/objects/items/food/martian.dm b/code/modules/food_and_drinks/food/martian.dm similarity index 100% rename from code/game/objects/items/food/martian.dm rename to code/modules/food_and_drinks/food/martian.dm diff --git a/code/game/objects/items/food/meatdish.dm b/code/modules/food_and_drinks/food/meatdish.dm similarity index 100% rename from code/game/objects/items/food/meatdish.dm rename to code/modules/food_and_drinks/food/meatdish.dm diff --git a/code/game/objects/items/food/meatslab.dm b/code/modules/food_and_drinks/food/meatslab.dm similarity index 100% rename from code/game/objects/items/food/meatslab.dm rename to code/modules/food_and_drinks/food/meatslab.dm diff --git a/code/game/objects/items/food/mexican.dm b/code/modules/food_and_drinks/food/mexican.dm similarity index 100% rename from code/game/objects/items/food/mexican.dm rename to code/modules/food_and_drinks/food/mexican.dm diff --git a/code/game/objects/items/food/misc.dm b/code/modules/food_and_drinks/food/misc.dm similarity index 100% rename from code/game/objects/items/food/misc.dm rename to code/modules/food_and_drinks/food/misc.dm diff --git a/code/game/objects/items/food/monkeycube.dm b/code/modules/food_and_drinks/food/monkeycube.dm similarity index 100% rename from code/game/objects/items/food/monkeycube.dm rename to code/modules/food_and_drinks/food/monkeycube.dm diff --git a/code/game/objects/items/food/moth.dm b/code/modules/food_and_drinks/food/moth.dm similarity index 100% rename from code/game/objects/items/food/moth.dm rename to code/modules/food_and_drinks/food/moth.dm diff --git a/code/game/objects/items/food/packaged.dm b/code/modules/food_and_drinks/food/packaged.dm similarity index 100% rename from code/game/objects/items/food/packaged.dm rename to code/modules/food_and_drinks/food/packaged.dm diff --git a/code/game/objects/items/food/pancakes.dm b/code/modules/food_and_drinks/food/pancakes.dm similarity index 100% rename from code/game/objects/items/food/pancakes.dm rename to code/modules/food_and_drinks/food/pancakes.dm diff --git a/code/game/objects/items/food/pastries.dm b/code/modules/food_and_drinks/food/pastries.dm similarity index 100% rename from code/game/objects/items/food/pastries.dm rename to code/modules/food_and_drinks/food/pastries.dm diff --git a/code/game/objects/items/food/pie.dm b/code/modules/food_and_drinks/food/pie.dm similarity index 100% rename from code/game/objects/items/food/pie.dm rename to code/modules/food_and_drinks/food/pie.dm diff --git a/code/game/objects/items/food/pizza.dm b/code/modules/food_and_drinks/food/pizza.dm similarity index 100% rename from code/game/objects/items/food/pizza.dm rename to code/modules/food_and_drinks/food/pizza.dm diff --git a/code/game/objects/items/food/salad.dm b/code/modules/food_and_drinks/food/salad.dm similarity index 100% rename from code/game/objects/items/food/salad.dm rename to code/modules/food_and_drinks/food/salad.dm diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/modules/food_and_drinks/food/sandwichtoast.dm similarity index 100% rename from code/game/objects/items/food/sandwichtoast.dm rename to code/modules/food_and_drinks/food/sandwichtoast.dm diff --git a/code/game/objects/items/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm similarity index 100% rename from code/game/objects/items/food/snacks.dm rename to code/modules/food_and_drinks/food/snacks.dm diff --git a/code/game/objects/items/food/soup.dm b/code/modules/food_and_drinks/food/soup.dm similarity index 100% rename from code/game/objects/items/food/soup.dm rename to code/modules/food_and_drinks/food/soup.dm diff --git a/code/game/objects/items/food/spaghetti.dm b/code/modules/food_and_drinks/food/spaghetti.dm similarity index 100% rename from code/game/objects/items/food/spaghetti.dm rename to code/modules/food_and_drinks/food/spaghetti.dm diff --git a/code/game/objects/items/food/sweets.dm b/code/modules/food_and_drinks/food/sweets.dm similarity index 100% rename from code/game/objects/items/food/sweets.dm rename to code/modules/food_and_drinks/food/sweets.dm diff --git a/code/game/objects/items/food/vegetables.dm b/code/modules/food_and_drinks/food/vegetables.dm similarity index 100% rename from code/game/objects/items/food/vegetables.dm rename to code/modules/food_and_drinks/food/vegetables.dm diff --git a/tgstation.dme b/tgstation.dme index f8ee0496b6e..081a10eae4c 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1837,14 +1837,14 @@ #include "code\datums\martial\sleeping_carp.dm" #include "code\datums\martial\spiders_bite.dm" #include "code\datums\martial\wrestling.dm" -#include "code\datums\material\material_container.dm" -#include "code\datums\material\remote_materials.dm" #include "code\datums\materials\_material.dm" #include "code\datums\materials\alloys.dm" #include "code\datums\materials\basemats.dm" #include "code\datums\materials\hauntium.dm" #include "code\datums\materials\meat.dm" #include "code\datums\materials\pizza.dm" +#include "code\datums\materials\material_container\material_container.dm" +#include "code\datums\materials\material_container\remote_materials.dm" #include "code\datums\materials\material_slots\_slot.dm" #include "code\datums\materials\material_slots\generic.dm" #include "code\datums\materials\properties\_properties.dm" @@ -2742,37 +2742,6 @@ #include "code\game\objects\items\devices\scanners\sequence_scanner.dm" #include "code\game\objects\items\devices\scanners\slime_scanner.dm" #include "code\game\objects\items\devices\scanners\t_scanner.dm" -#include "code\game\objects\items\food\_food.dm" -#include "code\game\objects\items\food\bait.dm" -#include "code\game\objects\items\food\bread.dm" -#include "code\game\objects\items\food\burgers.dm" -#include "code\game\objects\items\food\cake.dm" -#include "code\game\objects\items\food\cheese.dm" -#include "code\game\objects\items\food\donkpocket.dm" -#include "code\game\objects\items\food\donuts.dm" -#include "code\game\objects\items\food\dough.dm" -#include "code\game\objects\items\food\egg.dm" -#include "code\game\objects\items\food\frozen.dm" -#include "code\game\objects\items\food\lizard.dm" -#include "code\game\objects\items\food\martian.dm" -#include "code\game\objects\items\food\meatdish.dm" -#include "code\game\objects\items\food\meatslab.dm" -#include "code\game\objects\items\food\mexican.dm" -#include "code\game\objects\items\food\misc.dm" -#include "code\game\objects\items\food\monkeycube.dm" -#include "code\game\objects\items\food\moth.dm" -#include "code\game\objects\items\food\packaged.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\sandwichtoast.dm" -#include "code\game\objects\items\food\snacks.dm" -#include "code\game\objects\items\food\soup.dm" -#include "code\game\objects\items\food\spaghetti.dm" -#include "code\game\objects\items\food\sweets.dm" -#include "code\game\objects\items\food\vegetables.dm" #include "code\game\objects\items\granters\_granters.dm" #include "code\game\objects\items\granters\chuuni_granter.dm" #include "code\game\objects\items\granters\oragami.dm" @@ -4571,6 +4540,37 @@ #include "code\modules\food_and_drinks\pizzabox.dm" #include "code\modules\food_and_drinks\equipment\kitchen_utensils.dm" #include "code\modules\food_and_drinks\equipment\plate.dm" +#include "code\modules\food_and_drinks\food\_food.dm" +#include "code\modules\food_and_drinks\food\bait.dm" +#include "code\modules\food_and_drinks\food\bread.dm" +#include "code\modules\food_and_drinks\food\burgers.dm" +#include "code\modules\food_and_drinks\food\cake.dm" +#include "code\modules\food_and_drinks\food\cheese.dm" +#include "code\modules\food_and_drinks\food\donkpocket.dm" +#include "code\modules\food_and_drinks\food\donuts.dm" +#include "code\modules\food_and_drinks\food\dough.dm" +#include "code\modules\food_and_drinks\food\egg.dm" +#include "code\modules\food_and_drinks\food\frozen.dm" +#include "code\modules\food_and_drinks\food\lizard.dm" +#include "code\modules\food_and_drinks\food\martian.dm" +#include "code\modules\food_and_drinks\food\meatdish.dm" +#include "code\modules\food_and_drinks\food\meatslab.dm" +#include "code\modules\food_and_drinks\food\mexican.dm" +#include "code\modules\food_and_drinks\food\misc.dm" +#include "code\modules\food_and_drinks\food\monkeycube.dm" +#include "code\modules\food_and_drinks\food\moth.dm" +#include "code\modules\food_and_drinks\food\packaged.dm" +#include "code\modules\food_and_drinks\food\pancakes.dm" +#include "code\modules\food_and_drinks\food\pastries.dm" +#include "code\modules\food_and_drinks\food\pie.dm" +#include "code\modules\food_and_drinks\food\pizza.dm" +#include "code\modules\food_and_drinks\food\salad.dm" +#include "code\modules\food_and_drinks\food\sandwichtoast.dm" +#include "code\modules\food_and_drinks\food\snacks.dm" +#include "code\modules\food_and_drinks\food\soup.dm" +#include "code\modules\food_and_drinks\food\spaghetti.dm" +#include "code\modules\food_and_drinks\food\sweets.dm" +#include "code\modules\food_and_drinks\food\vegetables.dm" #include "code\modules\food_and_drinks\machinery\coffeemaker.dm" #include "code\modules\food_and_drinks\machinery\deep_fryer.dm" #include "code\modules\food_and_drinks\machinery\food_cart.dm"