From 7f49175967bb52e1132c747b080e60eee266d20b Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Tue, 24 May 2016 12:10:52 +0100 Subject: [PATCH 1/2] Renames files under code/ with naughty characters Like seriously, don't use spaces in file names, this is a codebase, they're annoying. Hopefully Github will show these renames correctly. --- ... 13 areas.dm => Space_Station_13_areas.dm} | 0 .../admin/{DB ban => DB_ban}/functions.dm | 0 .../{client defines.dm => client_defines.dm} | 0 .../{client procs.dm => client_procs.dm} | 0 .../drinks/drinks.dm | 0 .../drinks/drinks/bottle.dm | 0 .../drinks/drinks/drinkingglass.dm | 0 .../{food&drinks => foodndrinks}/food.dm | 0 .../food/condiment.dm | 0 .../food/customizables.dm | 0 .../food/snacks.dm | 0 .../food/snacks/dough.dm | 0 .../food/snacks/meat.dm | 0 .../food/snacks_bread.dm | 0 .../food/snacks_burgers.dm | 0 .../food/snacks_cake.dm | 0 .../food/snacks_egg.dm | 0 .../food/snacks_meat.dm | 0 .../food/snacks_other.dm | 0 .../food/snacks_pastry.dm | 0 .../food/snacks_pie.dm | 0 .../food/snacks_pizza.dm | 0 .../food/snacks_salad.dm | 0 .../food/snacks_sandwichtoast.dm | 0 .../food/snacks_soup.dm | 0 .../food/snacks_spaghetti.dm | 0 .../food/snacks_vend.dm | 0 .../kitchen_machinery}/food_cart.dm | 0 .../kitchen_machinery}/gibber.dm | 0 .../kitchen_machinery}/icecream_vat.dm | 0 .../kitchen_machinery}/juicer.dm | 0 .../kitchen_machinery}/microwave.dm | 0 .../kitchen_machinery}/monkeyrecycler.dm | 0 .../kitchen_machinery}/processor.dm | 0 .../kitchen_machinery}/smartfridge.dm | 0 .../{food&drinks => foodndrinks}/pizzabox.dm | 0 .../recipes/drinks_recipes.dm | 0 .../recipes/food_mixtures.dm | 0 .../recipes/tablecraft/recipes_bread.dm | 0 .../recipes/tablecraft/recipes_burger.dm | 0 .../recipes/tablecraft/recipes_cake.dm | 0 .../recipes/tablecraft/recipes_egg.dm | 0 .../recipes/tablecraft/recipes_meat.dm | 0 .../recipes/tablecraft/recipes_misc.dm | 0 .../recipes/tablecraft/recipes_pastry.dm | 0 .../recipes/tablecraft/recipes_pie.dm | 0 .../recipes/tablecraft/recipes_pizza.dm | 0 .../recipes/tablecraft/recipes_salad.dm | 0 .../recipes/tablecraft/recipes_sandwich.dm | 0 .../recipes/tablecraft/recipes_soup.dm | 0 .../recipes/tablecraft/recipes_spaghetti.dm | 0 .../mapGenerator.dm | 0 .../mapGeneratorModule.dm | 0 .../mapGeneratorModules/helpers.dm | 0 .../mapGeneratorModules/nature.dm | 0 .../mapGeneratorObj.dm | 0 .../mapGeneratorReadme.dm | 0 .../mapGenerators/asteroid.dm | 0 .../mapGenerators/cellular.dm | 0 .../mapGenerators/lava_river.dm | 0 .../mapGenerators/nature.dm | 0 .../mapGenerators/shuttle.dm | 0 .../mapGenerators/syndicate.dm | 0 .../keycard_authentication.dm} | 0 .../security_levels.dm} | 0 .../space_transition.dm | 0 ...b augmentation.dm => limb_augmentation.dm} | 0 .../AStar.dm | 0 .../dbcore.dm | 0 .../priority_announce.dm | 0 .../statistics.dm | 0 tgstation.dme | 142 +++++++++--------- 72 files changed, 71 insertions(+), 71 deletions(-) rename code/game/area/{Space Station 13 areas.dm => Space_Station_13_areas.dm} (100%) rename code/modules/admin/{DB ban => DB_ban}/functions.dm (100%) rename code/modules/client/{client defines.dm => client_defines.dm} (100%) rename code/modules/client/{client procs.dm => client_procs.dm} (100%) rename code/modules/{food&drinks => foodndrinks}/drinks/drinks.dm (100%) rename code/modules/{food&drinks => foodndrinks}/drinks/drinks/bottle.dm (100%) rename code/modules/{food&drinks => foodndrinks}/drinks/drinks/drinkingglass.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/condiment.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/customizables.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks/dough.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks/meat.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_bread.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_burgers.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_cake.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_egg.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_meat.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_other.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_pastry.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_pie.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_pizza.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_salad.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_sandwichtoast.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_soup.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_spaghetti.dm (100%) rename code/modules/{food&drinks => foodndrinks}/food/snacks_vend.dm (100%) rename code/modules/{food&drinks/kitchen machinery => foodndrinks/kitchen_machinery}/food_cart.dm (100%) rename code/modules/{food&drinks/kitchen machinery => foodndrinks/kitchen_machinery}/gibber.dm (100%) rename code/modules/{food&drinks/kitchen machinery => foodndrinks/kitchen_machinery}/icecream_vat.dm (100%) rename code/modules/{food&drinks/kitchen machinery => foodndrinks/kitchen_machinery}/juicer.dm (100%) rename code/modules/{food&drinks/kitchen machinery => foodndrinks/kitchen_machinery}/microwave.dm (100%) rename code/modules/{food&drinks/kitchen machinery => foodndrinks/kitchen_machinery}/monkeyrecycler.dm (100%) rename code/modules/{food&drinks/kitchen machinery => foodndrinks/kitchen_machinery}/processor.dm (100%) rename code/modules/{food&drinks/kitchen machinery => foodndrinks/kitchen_machinery}/smartfridge.dm (100%) rename code/modules/{food&drinks => foodndrinks}/pizzabox.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/drinks_recipes.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/food_mixtures.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_bread.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_burger.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_cake.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_egg.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_meat.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_misc.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_pastry.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_pie.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_pizza.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_salad.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_sandwich.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_soup.dm (100%) rename code/modules/{food&drinks => foodndrinks}/recipes/tablecraft/recipes_spaghetti.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGenerator.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGeneratorModule.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGeneratorModules/helpers.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGeneratorModules/nature.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGeneratorObj.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGeneratorReadme.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGenerators/asteroid.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGenerators/cellular.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGenerators/lava_river.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGenerators/nature.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGenerators/shuttle.dm (100%) rename code/modules/{procedural mapping => procedural_mapping}/mapGenerators/syndicate.dm (100%) rename code/modules/{security levels/keycard authentication.dm => security_levels/keycard_authentication.dm} (100%) rename code/modules/{security levels/security levels.dm => security_levels/security_levels.dm} (100%) rename code/modules/{space transition => space_transition}/space_transition.dm (100%) rename code/modules/surgery/{limb augmentation.dm => limb_augmentation.dm} (100%) rename code/{orphaned procs => orphaned_procs}/AStar.dm (100%) rename code/{orphaned procs => orphaned_procs}/dbcore.dm (100%) rename code/{orphaned procs => orphaned_procs}/priority_announce.dm (100%) rename code/{orphaned procs => orphaned_procs}/statistics.dm (100%) diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space_Station_13_areas.dm similarity index 100% rename from code/game/area/Space Station 13 areas.dm rename to code/game/area/Space_Station_13_areas.dm diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB_ban/functions.dm similarity index 100% rename from code/modules/admin/DB ban/functions.dm rename to code/modules/admin/DB_ban/functions.dm diff --git a/code/modules/client/client defines.dm b/code/modules/client/client_defines.dm similarity index 100% rename from code/modules/client/client defines.dm rename to code/modules/client/client_defines.dm diff --git a/code/modules/client/client procs.dm b/code/modules/client/client_procs.dm similarity index 100% rename from code/modules/client/client procs.dm rename to code/modules/client/client_procs.dm diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/foodndrinks/drinks/drinks.dm similarity index 100% rename from code/modules/food&drinks/drinks/drinks.dm rename to code/modules/foodndrinks/drinks/drinks.dm diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/foodndrinks/drinks/drinks/bottle.dm similarity index 100% rename from code/modules/food&drinks/drinks/drinks/bottle.dm rename to code/modules/foodndrinks/drinks/drinks/bottle.dm diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/foodndrinks/drinks/drinks/drinkingglass.dm similarity index 100% rename from code/modules/food&drinks/drinks/drinks/drinkingglass.dm rename to code/modules/foodndrinks/drinks/drinks/drinkingglass.dm diff --git a/code/modules/food&drinks/food.dm b/code/modules/foodndrinks/food.dm similarity index 100% rename from code/modules/food&drinks/food.dm rename to code/modules/foodndrinks/food.dm diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/foodndrinks/food/condiment.dm similarity index 100% rename from code/modules/food&drinks/food/condiment.dm rename to code/modules/foodndrinks/food/condiment.dm diff --git a/code/modules/food&drinks/food/customizables.dm b/code/modules/foodndrinks/food/customizables.dm similarity index 100% rename from code/modules/food&drinks/food/customizables.dm rename to code/modules/foodndrinks/food/customizables.dm diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/foodndrinks/food/snacks.dm similarity index 100% rename from code/modules/food&drinks/food/snacks.dm rename to code/modules/foodndrinks/food/snacks.dm diff --git a/code/modules/food&drinks/food/snacks/dough.dm b/code/modules/foodndrinks/food/snacks/dough.dm similarity index 100% rename from code/modules/food&drinks/food/snacks/dough.dm rename to code/modules/foodndrinks/food/snacks/dough.dm diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/foodndrinks/food/snacks/meat.dm similarity index 100% rename from code/modules/food&drinks/food/snacks/meat.dm rename to code/modules/foodndrinks/food/snacks/meat.dm diff --git a/code/modules/food&drinks/food/snacks_bread.dm b/code/modules/foodndrinks/food/snacks_bread.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_bread.dm rename to code/modules/foodndrinks/food/snacks_bread.dm diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/foodndrinks/food/snacks_burgers.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_burgers.dm rename to code/modules/foodndrinks/food/snacks_burgers.dm diff --git a/code/modules/food&drinks/food/snacks_cake.dm b/code/modules/foodndrinks/food/snacks_cake.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_cake.dm rename to code/modules/foodndrinks/food/snacks_cake.dm diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/foodndrinks/food/snacks_egg.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_egg.dm rename to code/modules/foodndrinks/food/snacks_egg.dm diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/foodndrinks/food/snacks_meat.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_meat.dm rename to code/modules/foodndrinks/food/snacks_meat.dm diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/foodndrinks/food/snacks_other.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_other.dm rename to code/modules/foodndrinks/food/snacks_other.dm diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/foodndrinks/food/snacks_pastry.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_pastry.dm rename to code/modules/foodndrinks/food/snacks_pastry.dm diff --git a/code/modules/food&drinks/food/snacks_pie.dm b/code/modules/foodndrinks/food/snacks_pie.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_pie.dm rename to code/modules/foodndrinks/food/snacks_pie.dm diff --git a/code/modules/food&drinks/food/snacks_pizza.dm b/code/modules/foodndrinks/food/snacks_pizza.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_pizza.dm rename to code/modules/foodndrinks/food/snacks_pizza.dm diff --git a/code/modules/food&drinks/food/snacks_salad.dm b/code/modules/foodndrinks/food/snacks_salad.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_salad.dm rename to code/modules/foodndrinks/food/snacks_salad.dm diff --git a/code/modules/food&drinks/food/snacks_sandwichtoast.dm b/code/modules/foodndrinks/food/snacks_sandwichtoast.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_sandwichtoast.dm rename to code/modules/foodndrinks/food/snacks_sandwichtoast.dm diff --git a/code/modules/food&drinks/food/snacks_soup.dm b/code/modules/foodndrinks/food/snacks_soup.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_soup.dm rename to code/modules/foodndrinks/food/snacks_soup.dm diff --git a/code/modules/food&drinks/food/snacks_spaghetti.dm b/code/modules/foodndrinks/food/snacks_spaghetti.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_spaghetti.dm rename to code/modules/foodndrinks/food/snacks_spaghetti.dm diff --git a/code/modules/food&drinks/food/snacks_vend.dm b/code/modules/foodndrinks/food/snacks_vend.dm similarity index 100% rename from code/modules/food&drinks/food/snacks_vend.dm rename to code/modules/foodndrinks/food/snacks_vend.dm diff --git a/code/modules/food&drinks/kitchen machinery/food_cart.dm b/code/modules/foodndrinks/kitchen_machinery/food_cart.dm similarity index 100% rename from code/modules/food&drinks/kitchen machinery/food_cart.dm rename to code/modules/foodndrinks/kitchen_machinery/food_cart.dm diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/foodndrinks/kitchen_machinery/gibber.dm similarity index 100% rename from code/modules/food&drinks/kitchen machinery/gibber.dm rename to code/modules/foodndrinks/kitchen_machinery/gibber.dm diff --git a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm b/code/modules/foodndrinks/kitchen_machinery/icecream_vat.dm similarity index 100% rename from code/modules/food&drinks/kitchen machinery/icecream_vat.dm rename to code/modules/foodndrinks/kitchen_machinery/icecream_vat.dm diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/foodndrinks/kitchen_machinery/juicer.dm similarity index 100% rename from code/modules/food&drinks/kitchen machinery/juicer.dm rename to code/modules/foodndrinks/kitchen_machinery/juicer.dm diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/foodndrinks/kitchen_machinery/microwave.dm similarity index 100% rename from code/modules/food&drinks/kitchen machinery/microwave.dm rename to code/modules/foodndrinks/kitchen_machinery/microwave.dm diff --git a/code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm b/code/modules/foodndrinks/kitchen_machinery/monkeyrecycler.dm similarity index 100% rename from code/modules/food&drinks/kitchen machinery/monkeyrecycler.dm rename to code/modules/foodndrinks/kitchen_machinery/monkeyrecycler.dm diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/foodndrinks/kitchen_machinery/processor.dm similarity index 100% rename from code/modules/food&drinks/kitchen machinery/processor.dm rename to code/modules/foodndrinks/kitchen_machinery/processor.dm diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/foodndrinks/kitchen_machinery/smartfridge.dm similarity index 100% rename from code/modules/food&drinks/kitchen machinery/smartfridge.dm rename to code/modules/foodndrinks/kitchen_machinery/smartfridge.dm diff --git a/code/modules/food&drinks/pizzabox.dm b/code/modules/foodndrinks/pizzabox.dm similarity index 100% rename from code/modules/food&drinks/pizzabox.dm rename to code/modules/foodndrinks/pizzabox.dm diff --git a/code/modules/food&drinks/recipes/drinks_recipes.dm b/code/modules/foodndrinks/recipes/drinks_recipes.dm similarity index 100% rename from code/modules/food&drinks/recipes/drinks_recipes.dm rename to code/modules/foodndrinks/recipes/drinks_recipes.dm diff --git a/code/modules/food&drinks/recipes/food_mixtures.dm b/code/modules/foodndrinks/recipes/food_mixtures.dm similarity index 100% rename from code/modules/food&drinks/recipes/food_mixtures.dm rename to code/modules/foodndrinks/recipes/food_mixtures.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_bread.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_bread.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_burger.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_burger.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_cake.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_cake.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_egg.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_egg.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_meat.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_meat.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_misc.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_misc.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_pastry.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_pastry.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_pie.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_pie.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_pizza.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_pizza.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_salad.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_salad.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_sandwich.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_sandwich.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_soup.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_soup.dm diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/foodndrinks/recipes/tablecraft/recipes_spaghetti.dm similarity index 100% rename from code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm rename to code/modules/foodndrinks/recipes/tablecraft/recipes_spaghetti.dm diff --git a/code/modules/procedural mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm similarity index 100% rename from code/modules/procedural mapping/mapGenerator.dm rename to code/modules/procedural_mapping/mapGenerator.dm diff --git a/code/modules/procedural mapping/mapGeneratorModule.dm b/code/modules/procedural_mapping/mapGeneratorModule.dm similarity index 100% rename from code/modules/procedural mapping/mapGeneratorModule.dm rename to code/modules/procedural_mapping/mapGeneratorModule.dm diff --git a/code/modules/procedural mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm similarity index 100% rename from code/modules/procedural mapping/mapGeneratorModules/helpers.dm rename to code/modules/procedural_mapping/mapGeneratorModules/helpers.dm diff --git a/code/modules/procedural mapping/mapGeneratorModules/nature.dm b/code/modules/procedural_mapping/mapGeneratorModules/nature.dm similarity index 100% rename from code/modules/procedural mapping/mapGeneratorModules/nature.dm rename to code/modules/procedural_mapping/mapGeneratorModules/nature.dm diff --git a/code/modules/procedural mapping/mapGeneratorObj.dm b/code/modules/procedural_mapping/mapGeneratorObj.dm similarity index 100% rename from code/modules/procedural mapping/mapGeneratorObj.dm rename to code/modules/procedural_mapping/mapGeneratorObj.dm diff --git a/code/modules/procedural mapping/mapGeneratorReadme.dm b/code/modules/procedural_mapping/mapGeneratorReadme.dm similarity index 100% rename from code/modules/procedural mapping/mapGeneratorReadme.dm rename to code/modules/procedural_mapping/mapGeneratorReadme.dm diff --git a/code/modules/procedural mapping/mapGenerators/asteroid.dm b/code/modules/procedural_mapping/mapGenerators/asteroid.dm similarity index 100% rename from code/modules/procedural mapping/mapGenerators/asteroid.dm rename to code/modules/procedural_mapping/mapGenerators/asteroid.dm diff --git a/code/modules/procedural mapping/mapGenerators/cellular.dm b/code/modules/procedural_mapping/mapGenerators/cellular.dm similarity index 100% rename from code/modules/procedural mapping/mapGenerators/cellular.dm rename to code/modules/procedural_mapping/mapGenerators/cellular.dm diff --git a/code/modules/procedural mapping/mapGenerators/lava_river.dm b/code/modules/procedural_mapping/mapGenerators/lava_river.dm similarity index 100% rename from code/modules/procedural mapping/mapGenerators/lava_river.dm rename to code/modules/procedural_mapping/mapGenerators/lava_river.dm diff --git a/code/modules/procedural mapping/mapGenerators/nature.dm b/code/modules/procedural_mapping/mapGenerators/nature.dm similarity index 100% rename from code/modules/procedural mapping/mapGenerators/nature.dm rename to code/modules/procedural_mapping/mapGenerators/nature.dm diff --git a/code/modules/procedural mapping/mapGenerators/shuttle.dm b/code/modules/procedural_mapping/mapGenerators/shuttle.dm similarity index 100% rename from code/modules/procedural mapping/mapGenerators/shuttle.dm rename to code/modules/procedural_mapping/mapGenerators/shuttle.dm diff --git a/code/modules/procedural mapping/mapGenerators/syndicate.dm b/code/modules/procedural_mapping/mapGenerators/syndicate.dm similarity index 100% rename from code/modules/procedural mapping/mapGenerators/syndicate.dm rename to code/modules/procedural_mapping/mapGenerators/syndicate.dm diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security_levels/keycard_authentication.dm similarity index 100% rename from code/modules/security levels/keycard authentication.dm rename to code/modules/security_levels/keycard_authentication.dm diff --git a/code/modules/security levels/security levels.dm b/code/modules/security_levels/security_levels.dm similarity index 100% rename from code/modules/security levels/security levels.dm rename to code/modules/security_levels/security_levels.dm diff --git a/code/modules/space transition/space_transition.dm b/code/modules/space_transition/space_transition.dm similarity index 100% rename from code/modules/space transition/space_transition.dm rename to code/modules/space_transition/space_transition.dm diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb_augmentation.dm similarity index 100% rename from code/modules/surgery/limb augmentation.dm rename to code/modules/surgery/limb_augmentation.dm diff --git a/code/orphaned procs/AStar.dm b/code/orphaned_procs/AStar.dm similarity index 100% rename from code/orphaned procs/AStar.dm rename to code/orphaned_procs/AStar.dm diff --git a/code/orphaned procs/dbcore.dm b/code/orphaned_procs/dbcore.dm similarity index 100% rename from code/orphaned procs/dbcore.dm rename to code/orphaned_procs/dbcore.dm diff --git a/code/orphaned procs/priority_announce.dm b/code/orphaned_procs/priority_announce.dm similarity index 100% rename from code/orphaned procs/priority_announce.dm rename to code/orphaned_procs/priority_announce.dm diff --git a/code/orphaned procs/statistics.dm b/code/orphaned_procs/statistics.dm similarity index 100% rename from code/orphaned procs/statistics.dm rename to code/orphaned_procs/statistics.dm diff --git a/tgstation.dme b/tgstation.dme index 240016c3b9b..4464cbd608d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -258,7 +258,7 @@ #include "code\game\sound.dm" #include "code\game\area\ai_monitored.dm" #include "code\game\area\areas.dm" -#include "code\game\area\Space Station 13 areas.dm" +#include "code\game\area\Space_Station_13_areas.dm" #include "code\game\gamemodes\antag_hud.dm" #include "code\game\gamemodes\antag_spawner.dm" #include "code\game\gamemodes\events.dm" @@ -820,7 +820,7 @@ #include "code\modules\admin\stickyban.dm" #include "code\modules\admin\topic.dm" #include "code\modules\admin\watchlist.dm" -#include "code\modules\admin\DB ban\functions.dm" +#include "code\modules\admin\DB_ban\functions.dm" #include "code\modules\admin\permissionverbs\permissionedit.dm" #include "code\modules\admin\verbs\adminhelp.dm" #include "code\modules\admin\verbs\adminjump.dm" @@ -957,8 +957,8 @@ #include "code\modules\cargo\exports\weapons.dm" #include "code\modules\chatter\chatter.dm" #include "code\modules\client\asset_cache.dm" -#include "code\modules\client\client defines.dm" -#include "code\modules\client\client procs.dm" +#include "code\modules\client\client_defines.dm" +#include "code\modules\client\client_procs.dm" #include "code\modules\client\client_colour.dm" #include "code\modules\client\message.dm" #include "code\modules\client\preferences.dm" @@ -1080,53 +1080,53 @@ #include "code\modules\flufftext\Dreaming.dm" #include "code\modules\flufftext\Hallucination.dm" #include "code\modules\flufftext\TextFilters.dm" -#include "code\modules\food&drinks\food.dm" -#include "code\modules\food&drinks\pizzabox.dm" -#include "code\modules\food&drinks\drinks\drinks.dm" -#include "code\modules\food&drinks\drinks\drinks\bottle.dm" -#include "code\modules\food&drinks\drinks\drinks\drinkingglass.dm" -#include "code\modules\food&drinks\food\condiment.dm" -#include "code\modules\food&drinks\food\customizables.dm" -#include "code\modules\food&drinks\food\snacks.dm" -#include "code\modules\food&drinks\food\snacks_bread.dm" -#include "code\modules\food&drinks\food\snacks_burgers.dm" -#include "code\modules\food&drinks\food\snacks_cake.dm" -#include "code\modules\food&drinks\food\snacks_egg.dm" -#include "code\modules\food&drinks\food\snacks_meat.dm" -#include "code\modules\food&drinks\food\snacks_other.dm" -#include "code\modules\food&drinks\food\snacks_pastry.dm" -#include "code\modules\food&drinks\food\snacks_pie.dm" -#include "code\modules\food&drinks\food\snacks_pizza.dm" -#include "code\modules\food&drinks\food\snacks_salad.dm" -#include "code\modules\food&drinks\food\snacks_sandwichtoast.dm" -#include "code\modules\food&drinks\food\snacks_soup.dm" -#include "code\modules\food&drinks\food\snacks_spaghetti.dm" -#include "code\modules\food&drinks\food\snacks_vend.dm" -#include "code\modules\food&drinks\food\snacks\dough.dm" -#include "code\modules\food&drinks\food\snacks\meat.dm" -#include "code\modules\food&drinks\kitchen machinery\food_cart.dm" -#include "code\modules\food&drinks\kitchen machinery\gibber.dm" -#include "code\modules\food&drinks\kitchen machinery\icecream_vat.dm" -#include "code\modules\food&drinks\kitchen machinery\juicer.dm" -#include "code\modules\food&drinks\kitchen machinery\microwave.dm" -#include "code\modules\food&drinks\kitchen machinery\monkeyrecycler.dm" -#include "code\modules\food&drinks\kitchen machinery\processor.dm" -#include "code\modules\food&drinks\kitchen machinery\smartfridge.dm" -#include "code\modules\food&drinks\recipes\drinks_recipes.dm" -#include "code\modules\food&drinks\recipes\food_mixtures.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_bread.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_burger.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_cake.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_egg.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_meat.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_misc.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_pastry.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_pie.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_pizza.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_salad.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_sandwich.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_soup.dm" -#include "code\modules\food&drinks\recipes\tablecraft\recipes_spaghetti.dm" +#include "code\modules\foodndrinks\food.dm" +#include "code\modules\foodndrinks\pizzabox.dm" +#include "code\modules\foodndrinks\drinks\drinks.dm" +#include "code\modules\foodndrinks\drinks\drinks\bottle.dm" +#include "code\modules\foodndrinks\drinks\drinks\drinkingglass.dm" +#include "code\modules\foodndrinks\food\condiment.dm" +#include "code\modules\foodndrinks\food\customizables.dm" +#include "code\modules\foodndrinks\food\snacks.dm" +#include "code\modules\foodndrinks\food\snacks_bread.dm" +#include "code\modules\foodndrinks\food\snacks_burgers.dm" +#include "code\modules\foodndrinks\food\snacks_cake.dm" +#include "code\modules\foodndrinks\food\snacks_egg.dm" +#include "code\modules\foodndrinks\food\snacks_meat.dm" +#include "code\modules\foodndrinks\food\snacks_other.dm" +#include "code\modules\foodndrinks\food\snacks_pastry.dm" +#include "code\modules\foodndrinks\food\snacks_pie.dm" +#include "code\modules\foodndrinks\food\snacks_pizza.dm" +#include "code\modules\foodndrinks\food\snacks_salad.dm" +#include "code\modules\foodndrinks\food\snacks_sandwichtoast.dm" +#include "code\modules\foodndrinks\food\snacks_soup.dm" +#include "code\modules\foodndrinks\food\snacks_spaghetti.dm" +#include "code\modules\foodndrinks\food\snacks_vend.dm" +#include "code\modules\foodndrinks\food\snacks\dough.dm" +#include "code\modules\foodndrinks\food\snacks\meat.dm" +#include "code\modules\foodndrinks\kitchen_machinery\food_cart.dm" +#include "code\modules\foodndrinks\kitchen_machinery\gibber.dm" +#include "code\modules\foodndrinks\kitchen_machinery\icecream_vat.dm" +#include "code\modules\foodndrinks\kitchen_machinery\juicer.dm" +#include "code\modules\foodndrinks\kitchen_machinery\microwave.dm" +#include "code\modules\foodndrinks\kitchen_machinery\monkeyrecycler.dm" +#include "code\modules\foodndrinks\kitchen_machinery\processor.dm" +#include "code\modules\foodndrinks\kitchen_machinery\smartfridge.dm" +#include "code\modules\foodndrinks\recipes\drinks_recipes.dm" +#include "code\modules\foodndrinks\recipes\food_mixtures.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_bread.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_burger.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_cake.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_egg.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_meat.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_misc.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_pastry.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_pie.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_pizza.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_salad.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_sandwich.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_soup.dm" +#include "code\modules\foodndrinks\recipes\tablecraft\recipes_spaghetti.dm" #include "code\modules\games\cards.dm" #include "code\modules\games\cas.dm" #include "code\modules\holiday\easter.dm" @@ -1538,18 +1538,18 @@ #include "code\modules\power\tesla\coil.dm" #include "code\modules\power\tesla\energy_ball.dm" #include "code\modules\power\tesla\generator.dm" -#include "code\modules\procedural mapping\mapGenerator.dm" -#include "code\modules\procedural mapping\mapGeneratorModule.dm" -#include "code\modules\procedural mapping\mapGeneratorObj.dm" -#include "code\modules\procedural mapping\mapGeneratorReadme.dm" -#include "code\modules\procedural mapping\mapGeneratorModules\helpers.dm" -#include "code\modules\procedural mapping\mapGeneratorModules\nature.dm" -#include "code\modules\procedural mapping\mapGenerators\asteroid.dm" -#include "code\modules\procedural mapping\mapGenerators\cellular.dm" -#include "code\modules\procedural mapping\mapGenerators\lava_river.dm" -#include "code\modules\procedural mapping\mapGenerators\nature.dm" -#include "code\modules\procedural mapping\mapGenerators\shuttle.dm" -#include "code\modules\procedural mapping\mapGenerators\syndicate.dm" +#include "code\modules\procedural_mapping\mapGenerator.dm" +#include "code\modules\procedural_mapping\mapGeneratorModule.dm" +#include "code\modules\procedural_mapping\mapGeneratorObj.dm" +#include "code\modules\procedural_mapping\mapGeneratorReadme.dm" +#include "code\modules\procedural_mapping\mapGeneratorModules\helpers.dm" +#include "code\modules\procedural_mapping\mapGeneratorModules\nature.dm" +#include "code\modules\procedural_mapping\mapGenerators\asteroid.dm" +#include "code\modules\procedural_mapping\mapGenerators\cellular.dm" +#include "code\modules\procedural_mapping\mapGenerators\lava_river.dm" +#include "code\modules\procedural_mapping\mapGenerators\nature.dm" +#include "code\modules\procedural_mapping\mapGenerators\shuttle.dm" +#include "code\modules\procedural_mapping\mapGenerators\syndicate.dm" #include "code\modules\projectiles\ammunition.dm" #include "code\modules\projectiles\firing.dm" #include "code\modules\projectiles\gun.dm" @@ -1659,8 +1659,8 @@ #include "code\modules\research\xenobiology\xenobiology.dm" #include "code\modules\ruins\lavaland_ruin_code.dm" #include "code\modules\ruins\ruin_areas.dm" -#include "code\modules\security levels\keycard authentication.dm" -#include "code\modules\security levels\security levels.dm" +#include "code\modules\security_levels\keycard_authentication.dm" +#include "code\modules\security_levels\security_levels.dm" #include "code\modules\shuttle\assault_pod.dm" #include "code\modules\shuttle\computer.dm" #include "code\modules\shuttle\emergency.dm" @@ -1670,7 +1670,7 @@ #include "code\modules\shuttle\supply.dm" #include "code\modules\shuttle\syndicate.dm" #include "code\modules\shuttle\white_ship.dm" -#include "code\modules\space transition\space_transition.dm" +#include "code\modules\space_transition\space_transition.dm" #include "code\modules\spells\spell.dm" #include "code\modules\spells\spell_types\area_teleport.dm" #include "code\modules\spells\spell_types\barnyard.dm" @@ -1719,7 +1719,7 @@ #include "code\modules\surgery\generic_steps.dm" #include "code\modules\surgery\helpers.dm" #include "code\modules\surgery\implant_removal.dm" -#include "code\modules\surgery\limb augmentation.dm" +#include "code\modules\surgery\limb_augmentation.dm" #include "code\modules\surgery\lipoplasty.dm" #include "code\modules\surgery\organ_manipulation.dm" #include "code\modules\surgery\plastic_surgery.dm" @@ -1768,10 +1768,10 @@ #include "code\modules\vehicles\secway.dm" #include "code\modules\vehicles\speedbike.dm" #include "code\modules\vehicles\vehicle.dm" -#include "code\orphaned procs\AStar.dm" -#include "code\orphaned procs\dbcore.dm" -#include "code\orphaned procs\priority_announce.dm" -#include "code\orphaned procs\statistics.dm" +#include "code\orphaned_procs\AStar.dm" +#include "code\orphaned_procs\dbcore.dm" +#include "code\orphaned_procs\priority_announce.dm" +#include "code\orphaned_procs\statistics.dm" #include "interface\interface.dm" #include "interface\stylesheet.dm" #include "interface\skin.dmf" From 5478a81ee468ad2e4bb92a5a2b8af109b9c7631d Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Wed, 25 May 2016 06:26:28 +0100 Subject: [PATCH 2/2] foodndrinks to food_and_drinks --- .../drinks/drinks.dm | 0 .../drinks/drinks/bottle.dm | 0 .../drinks/drinks/drinkingglass.dm | 0 .../{foodndrinks => food_and_drinks}/food.dm | 0 .../food/condiment.dm | 0 .../food/customizables.dm | 0 .../food/snacks.dm | 0 .../food/snacks/dough.dm | 0 .../food/snacks/meat.dm | 0 .../food/snacks_bread.dm | 0 .../food/snacks_burgers.dm | 0 .../food/snacks_cake.dm | 0 .../food/snacks_egg.dm | 0 .../food/snacks_meat.dm | 0 .../food/snacks_other.dm | 0 .../food/snacks_pastry.dm | 0 .../food/snacks_pie.dm | 0 .../food/snacks_pizza.dm | 0 .../food/snacks_salad.dm | 0 .../food/snacks_sandwichtoast.dm | 0 .../food/snacks_soup.dm | 0 .../food/snacks_spaghetti.dm | 0 .../food/snacks_vend.dm | 0 .../kitchen_machinery/food_cart.dm | 0 .../kitchen_machinery/gibber.dm | 0 .../kitchen_machinery/icecream_vat.dm | 0 .../kitchen_machinery/juicer.dm | 0 .../kitchen_machinery/microwave.dm | 0 .../kitchen_machinery/monkeyrecycler.dm | 0 .../kitchen_machinery/processor.dm | 0 .../kitchen_machinery/smartfridge.dm | 0 .../pizzabox.dm | 0 .../recipes/drinks_recipes.dm | 0 .../recipes/food_mixtures.dm | 0 .../recipes/tablecraft/recipes_bread.dm | 0 .../recipes/tablecraft/recipes_burger.dm | 0 .../recipes/tablecraft/recipes_cake.dm | 0 .../recipes/tablecraft/recipes_egg.dm | 0 .../recipes/tablecraft/recipes_meat.dm | 0 .../recipes/tablecraft/recipes_misc.dm | 0 .../recipes/tablecraft/recipes_pastry.dm | 0 .../recipes/tablecraft/recipes_pie.dm | 0 .../recipes/tablecraft/recipes_pizza.dm | 0 .../recipes/tablecraft/recipes_salad.dm | 0 .../recipes/tablecraft/recipes_sandwich.dm | 0 .../recipes/tablecraft/recipes_soup.dm | 0 .../recipes/tablecraft/recipes_spaghetti.dm | 0 tgstation.dme | 94 +++++++++---------- 48 files changed, 47 insertions(+), 47 deletions(-) rename code/modules/{foodndrinks => food_and_drinks}/drinks/drinks.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/drinks/drinks/bottle.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/drinks/drinks/drinkingglass.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/condiment.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/customizables.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks/dough.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks/meat.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_bread.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_burgers.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_cake.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_egg.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_meat.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_other.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_pastry.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_pie.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_pizza.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_salad.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_sandwichtoast.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_soup.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_spaghetti.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/food/snacks_vend.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/kitchen_machinery/food_cart.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/kitchen_machinery/gibber.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/kitchen_machinery/icecream_vat.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/kitchen_machinery/juicer.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/kitchen_machinery/microwave.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/kitchen_machinery/monkeyrecycler.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/kitchen_machinery/processor.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/kitchen_machinery/smartfridge.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/pizzabox.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/drinks_recipes.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/food_mixtures.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_bread.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_burger.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_cake.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_egg.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_meat.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_misc.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_pastry.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_pie.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_pizza.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_salad.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_sandwich.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_soup.dm (100%) rename code/modules/{foodndrinks => food_and_drinks}/recipes/tablecraft/recipes_spaghetti.dm (100%) diff --git a/code/modules/foodndrinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm similarity index 100% rename from code/modules/foodndrinks/drinks/drinks.dm rename to code/modules/food_and_drinks/drinks/drinks.dm diff --git a/code/modules/foodndrinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm similarity index 100% rename from code/modules/foodndrinks/drinks/drinks/bottle.dm rename to code/modules/food_and_drinks/drinks/drinks/bottle.dm diff --git a/code/modules/foodndrinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm similarity index 100% rename from code/modules/foodndrinks/drinks/drinks/drinkingglass.dm rename to code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm diff --git a/code/modules/foodndrinks/food.dm b/code/modules/food_and_drinks/food.dm similarity index 100% rename from code/modules/foodndrinks/food.dm rename to code/modules/food_and_drinks/food.dm diff --git a/code/modules/foodndrinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm similarity index 100% rename from code/modules/foodndrinks/food/condiment.dm rename to code/modules/food_and_drinks/food/condiment.dm diff --git a/code/modules/foodndrinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm similarity index 100% rename from code/modules/foodndrinks/food/customizables.dm rename to code/modules/food_and_drinks/food/customizables.dm diff --git a/code/modules/foodndrinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks.dm rename to code/modules/food_and_drinks/food/snacks.dm diff --git a/code/modules/foodndrinks/food/snacks/dough.dm b/code/modules/food_and_drinks/food/snacks/dough.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks/dough.dm rename to code/modules/food_and_drinks/food/snacks/dough.dm diff --git a/code/modules/foodndrinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks/meat.dm rename to code/modules/food_and_drinks/food/snacks/meat.dm diff --git a/code/modules/foodndrinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_bread.dm rename to code/modules/food_and_drinks/food/snacks_bread.dm diff --git a/code/modules/foodndrinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_burgers.dm rename to code/modules/food_and_drinks/food/snacks_burgers.dm diff --git a/code/modules/foodndrinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_cake.dm rename to code/modules/food_and_drinks/food/snacks_cake.dm diff --git a/code/modules/foodndrinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_egg.dm rename to code/modules/food_and_drinks/food/snacks_egg.dm diff --git a/code/modules/foodndrinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_meat.dm rename to code/modules/food_and_drinks/food/snacks_meat.dm diff --git a/code/modules/foodndrinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_other.dm rename to code/modules/food_and_drinks/food/snacks_other.dm diff --git a/code/modules/foodndrinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_pastry.dm rename to code/modules/food_and_drinks/food/snacks_pastry.dm diff --git a/code/modules/foodndrinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_pie.dm rename to code/modules/food_and_drinks/food/snacks_pie.dm diff --git a/code/modules/foodndrinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_pizza.dm rename to code/modules/food_and_drinks/food/snacks_pizza.dm diff --git a/code/modules/foodndrinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_salad.dm rename to code/modules/food_and_drinks/food/snacks_salad.dm diff --git a/code/modules/foodndrinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_sandwichtoast.dm rename to code/modules/food_and_drinks/food/snacks_sandwichtoast.dm diff --git a/code/modules/foodndrinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_soup.dm rename to code/modules/food_and_drinks/food/snacks_soup.dm diff --git a/code/modules/foodndrinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_spaghetti.dm rename to code/modules/food_and_drinks/food/snacks_spaghetti.dm diff --git a/code/modules/foodndrinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm similarity index 100% rename from code/modules/foodndrinks/food/snacks_vend.dm rename to code/modules/food_and_drinks/food/snacks_vend.dm diff --git a/code/modules/foodndrinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm similarity index 100% rename from code/modules/foodndrinks/kitchen_machinery/food_cart.dm rename to code/modules/food_and_drinks/kitchen_machinery/food_cart.dm diff --git a/code/modules/foodndrinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm similarity index 100% rename from code/modules/foodndrinks/kitchen_machinery/gibber.dm rename to code/modules/food_and_drinks/kitchen_machinery/gibber.dm diff --git a/code/modules/foodndrinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm similarity index 100% rename from code/modules/foodndrinks/kitchen_machinery/icecream_vat.dm rename to code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm diff --git a/code/modules/foodndrinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm similarity index 100% rename from code/modules/foodndrinks/kitchen_machinery/juicer.dm rename to code/modules/food_and_drinks/kitchen_machinery/juicer.dm diff --git a/code/modules/foodndrinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm similarity index 100% rename from code/modules/foodndrinks/kitchen_machinery/microwave.dm rename to code/modules/food_and_drinks/kitchen_machinery/microwave.dm diff --git a/code/modules/foodndrinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm similarity index 100% rename from code/modules/foodndrinks/kitchen_machinery/monkeyrecycler.dm rename to code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm diff --git a/code/modules/foodndrinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm similarity index 100% rename from code/modules/foodndrinks/kitchen_machinery/processor.dm rename to code/modules/food_and_drinks/kitchen_machinery/processor.dm diff --git a/code/modules/foodndrinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm similarity index 100% rename from code/modules/foodndrinks/kitchen_machinery/smartfridge.dm rename to code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm diff --git a/code/modules/foodndrinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm similarity index 100% rename from code/modules/foodndrinks/pizzabox.dm rename to code/modules/food_and_drinks/pizzabox.dm diff --git a/code/modules/foodndrinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm similarity index 100% rename from code/modules/foodndrinks/recipes/drinks_recipes.dm rename to code/modules/food_and_drinks/recipes/drinks_recipes.dm diff --git a/code/modules/foodndrinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm similarity index 100% rename from code/modules/foodndrinks/recipes/food_mixtures.dm rename to code/modules/food_and_drinks/recipes/food_mixtures.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_bread.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_burger.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_cake.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_egg.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_meat.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_misc.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_pastry.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_pie.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_pizza.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_salad.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_sandwich.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_soup.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm diff --git a/code/modules/foodndrinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm similarity index 100% rename from code/modules/foodndrinks/recipes/tablecraft/recipes_spaghetti.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm diff --git a/tgstation.dme b/tgstation.dme index 4464cbd608d..6ebcf6892d3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1080,53 +1080,53 @@ #include "code\modules\flufftext\Dreaming.dm" #include "code\modules\flufftext\Hallucination.dm" #include "code\modules\flufftext\TextFilters.dm" -#include "code\modules\foodndrinks\food.dm" -#include "code\modules\foodndrinks\pizzabox.dm" -#include "code\modules\foodndrinks\drinks\drinks.dm" -#include "code\modules\foodndrinks\drinks\drinks\bottle.dm" -#include "code\modules\foodndrinks\drinks\drinks\drinkingglass.dm" -#include "code\modules\foodndrinks\food\condiment.dm" -#include "code\modules\foodndrinks\food\customizables.dm" -#include "code\modules\foodndrinks\food\snacks.dm" -#include "code\modules\foodndrinks\food\snacks_bread.dm" -#include "code\modules\foodndrinks\food\snacks_burgers.dm" -#include "code\modules\foodndrinks\food\snacks_cake.dm" -#include "code\modules\foodndrinks\food\snacks_egg.dm" -#include "code\modules\foodndrinks\food\snacks_meat.dm" -#include "code\modules\foodndrinks\food\snacks_other.dm" -#include "code\modules\foodndrinks\food\snacks_pastry.dm" -#include "code\modules\foodndrinks\food\snacks_pie.dm" -#include "code\modules\foodndrinks\food\snacks_pizza.dm" -#include "code\modules\foodndrinks\food\snacks_salad.dm" -#include "code\modules\foodndrinks\food\snacks_sandwichtoast.dm" -#include "code\modules\foodndrinks\food\snacks_soup.dm" -#include "code\modules\foodndrinks\food\snacks_spaghetti.dm" -#include "code\modules\foodndrinks\food\snacks_vend.dm" -#include "code\modules\foodndrinks\food\snacks\dough.dm" -#include "code\modules\foodndrinks\food\snacks\meat.dm" -#include "code\modules\foodndrinks\kitchen_machinery\food_cart.dm" -#include "code\modules\foodndrinks\kitchen_machinery\gibber.dm" -#include "code\modules\foodndrinks\kitchen_machinery\icecream_vat.dm" -#include "code\modules\foodndrinks\kitchen_machinery\juicer.dm" -#include "code\modules\foodndrinks\kitchen_machinery\microwave.dm" -#include "code\modules\foodndrinks\kitchen_machinery\monkeyrecycler.dm" -#include "code\modules\foodndrinks\kitchen_machinery\processor.dm" -#include "code\modules\foodndrinks\kitchen_machinery\smartfridge.dm" -#include "code\modules\foodndrinks\recipes\drinks_recipes.dm" -#include "code\modules\foodndrinks\recipes\food_mixtures.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_bread.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_burger.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_cake.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_egg.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_meat.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_misc.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_pastry.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_pie.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_pizza.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_salad.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_sandwich.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_soup.dm" -#include "code\modules\foodndrinks\recipes\tablecraft\recipes_spaghetti.dm" +#include "code\modules\food_and_drinks\food.dm" +#include "code\modules\food_and_drinks\pizzabox.dm" +#include "code\modules\food_and_drinks\drinks\drinks.dm" +#include "code\modules\food_and_drinks\drinks\drinks\bottle.dm" +#include "code\modules\food_and_drinks\drinks\drinks\drinkingglass.dm" +#include "code\modules\food_and_drinks\food\condiment.dm" +#include "code\modules\food_and_drinks\food\customizables.dm" +#include "code\modules\food_and_drinks\food\snacks.dm" +#include "code\modules\food_and_drinks\food\snacks_bread.dm" +#include "code\modules\food_and_drinks\food\snacks_burgers.dm" +#include "code\modules\food_and_drinks\food\snacks_cake.dm" +#include "code\modules\food_and_drinks\food\snacks_egg.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_pastry.dm" +#include "code\modules\food_and_drinks\food\snacks_pie.dm" +#include "code\modules\food_and_drinks\food\snacks_pizza.dm" +#include "code\modules\food_and_drinks\food\snacks_salad.dm" +#include "code\modules\food_and_drinks\food\snacks_sandwichtoast.dm" +#include "code\modules\food_and_drinks\food\snacks_soup.dm" +#include "code\modules\food_and_drinks\food\snacks_spaghetti.dm" +#include "code\modules\food_and_drinks\food\snacks_vend.dm" +#include "code\modules\food_and_drinks\food\snacks\dough.dm" +#include "code\modules\food_and_drinks\food\snacks\meat.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\juicer.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\monkeyrecycler.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\processor.dm" +#include "code\modules\food_and_drinks\kitchen_machinery\smartfridge.dm" +#include "code\modules\food_and_drinks\recipes\drinks_recipes.dm" +#include "code\modules\food_and_drinks\recipes\food_mixtures.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_bread.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_misc.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pie.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sandwich.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm" #include "code\modules\games\cards.dm" #include "code\modules\games\cas.dm" #include "code\modules\holiday\easter.dm"