diff --git a/tgstation.dme b/tgstation.dme
index c0dc866a47..1ef38195b0 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -70,6 +70,7 @@
 #include "code\__DEFINES\misc.dm"
 #include "code\__DEFINES\mobs.dm"
 #include "code\__DEFINES\monkeys.dm"
+#include "code\__DEFINES\move_force.dm"
 #include "code\__DEFINES\movespeed_modification.dm"
 #include "code\__DEFINES\nanites.dm"
 #include "code\__DEFINES\networks.dm"
@@ -391,6 +392,7 @@
 #include "code\datums\components\shrink.dm"
 #include "code\datums\components\sizzle.dm"
 #include "code\datums\components\slippery.dm"
+#include "code\datums\components\spawner.dm"
 #include "code\datums\components\spooky.dm"
 #include "code\datums\components\squeak.dm"
 #include "code\datums\components\stationloving.dm"
@@ -471,6 +473,7 @@
 #include "code\datums\diseases\advance\symptoms\youth.dm"
 #include "code\datums\elements\_element.dm"
 #include "code\datums\elements\cleaning.dm"
+#include "code\datums\elements\dusts_on_catatonia.dm"
 #include "code\datums\elements\earhealing.dm"
 #include "code\datums\elements\ghost_role_eligibility.dm"
 #include "code\datums\elements\wuv.dm"
@@ -1070,6 +1073,7 @@
 #include "code\game\objects\structures\reflector.dm"
 #include "code\game\objects\structures\safe.dm"
 #include "code\game\objects\structures\showcase.dm"
+#include "code\game\objects\structures\spawner.dm"
 #include "code\game\objects\structures\spirit_board.dm"
 #include "code\game\objects\structures\stairs.dm"
 #include "code\game\objects\structures\statues.dm"
@@ -1113,6 +1117,7 @@
 #include "code\game\objects\structures\crates_lockers\crates\large.dm"
 #include "code\game\objects\structures\crates_lockers\crates\secure.dm"
 #include "code\game\objects\structures\crates_lockers\crates\wooden.dm"
+#include "code\game\objects\structures\lavaland\necropolis_tendril.dm"
 #include "code\game\objects\structures\signs\_signs.dm"
 #include "code\game\objects\structures\signs\signs_departments.dm"
 #include "code\game\objects\structures\signs\signs_maps.dm"
@@ -1471,6 +1476,7 @@
 #include "code\modules\atmospherics\machinery\components\binary_devices\dp_vent_pump.dm"
 #include "code\modules\atmospherics\machinery\components\binary_devices\passive_gate.dm"
 #include "code\modules\atmospherics\machinery\components\binary_devices\pump.dm"
+#include "code\modules\atmospherics\machinery\components\binary_devices\relief_valve.dm"
 #include "code\modules\atmospherics\machinery\components\binary_devices\valve.dm"
 #include "code\modules\atmospherics\machinery\components\binary_devices\volume_pump.dm"
 #include "code\modules\atmospherics\machinery\components\trinary_devices\filter.dm"
@@ -1479,7 +1485,9 @@
 #include "code\modules\atmospherics\machinery\components\unary_devices\cryo.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\heat_exchanger.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\outlet_injector.dm"
+#include "code\modules\atmospherics\machinery\components\unary_devices\passive_vent.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\portables_connector.dm"
+#include "code\modules\atmospherics\machinery\components\unary_devices\relief_valve.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\tank.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\thermomachine.dm"
 #include "code\modules\atmospherics\machinery\components\unary_devices\unary_devices.dm"
@@ -2012,11 +2020,15 @@
 #include "code\modules\lighting\lighting_turf.dm"
 #include "code\modules\mapping\dmm_suite.dm"
 #include "code\modules\mapping\map_template.dm"
-#include "code\modules\mapping\mapping_helpers.dm"
 #include "code\modules\mapping\preloader.dm"
 #include "code\modules\mapping\reader.dm"
 #include "code\modules\mapping\ruins.dm"
 #include "code\modules\mapping\verify.dm"
+#include "code\modules\mapping\mapping_helpers\_mapping_helpers.dm"
+#include "code\modules\mapping\mapping_helpers\baseturf.dm"
+#include "code\modules\mapping\mapping_helpers\network_builder\_network_builder.dm"
+#include "code\modules\mapping\mapping_helpers\network_builder\atmos_pipe.dm"
+#include "code\modules\mapping\mapping_helpers\network_builder\power_cables.dm"
 #include "code\modules\mapping\space_management\multiz_helpers.dm"
 #include "code\modules\mapping\space_management\space_level.dm"
 #include "code\modules\mapping\space_management\space_reservation.dm"
@@ -2286,7 +2298,6 @@
 #include "code\modules\mob\living\simple_animal\simple_animal.dm"
 #include "code\modules\mob\living\simple_animal\simple_animal_vr.dm"
 #include "code\modules\mob\living\simple_animal\simplemob_vore_values.dm"
-#include "code\modules\mob\living\simple_animal\spawner.dm"
 #include "code\modules\mob\living\simple_animal\status_procs.dm"
 #include "code\modules\mob\living\simple_animal\bot\bot.dm"
 #include "code\modules\mob\living\simple_animal\bot\cleanbot.dm"
@@ -2391,7 +2402,6 @@
 #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\gutlunch.dm"
 #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\hivelord.dm"
 #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\mining_mobs.dm"
-#include "code\modules\mob\living\simple_animal\hostile\mining_mobs\necropolis_tendril.dm"
 #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\elite.dm"
 #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\goliath_broodmother.dm"
 #include "code\modules\mob\living\simple_animal\hostile\mining_mobs\elites\herald.dm"
@@ -3090,6 +3100,7 @@
 #include "modular_citadel\code\_onclick\hud\stamina.dm"
 #include "modular_citadel\code\datums\components\souldeath.dm"
 #include "modular_citadel\code\datums\status_effects\chems.dm"
+#include "modular_citadel\code\datums\status_effects\debuffs.dm"
 #include "modular_citadel\code\game\machinery\wishgranter.dm"
 #include "modular_citadel\code\game\objects\cit_screenshake.dm"
 #include "modular_citadel\code\game\objects\effects\temporary_visuals\souldeath.dm"