diff --git a/code/datums/components/plumbing/reaction_chamber.dm b/code/datums/components/plumbing/reaction_chamber.dm
index d0a9416e34..6435d11ae6 100644
--- a/code/datums/components/plumbing/reaction_chamber.dm
+++ b/code/datums/components/plumbing/reaction_chamber.dm
@@ -32,7 +32,6 @@
 
 	RC.reagent_flags &= ~NO_REACT
 	reagents.handle_reactions()
-	Add when everything works:
 	if(reagents.fermiIsReacting)
 		return
 	RC.emptying = TRUE
diff --git a/icons/obj/plumbing/fluid_ducts.dmi b/icons/obj/plumbing/fluid_ducts.dmi
new file mode 100644
index 0000000000..87d9d2233b
Binary files /dev/null and b/icons/obj/plumbing/fluid_ducts.dmi differ
diff --git a/icons/obj/plumbing/plumbers.dmi b/icons/obj/plumbing/plumbers.dmi
new file mode 100644
index 0000000000..242622e000
Binary files /dev/null and b/icons/obj/plumbing/plumbers.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 2c5d30e2b7..f6e46312d0 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -79,6 +79,7 @@
 #include "code\__DEFINES\networks.dm"
 #include "code\__DEFINES\pinpointers.dm"
 #include "code\__DEFINES\pipe_construction.dm"
+#include "code\__DEFINES\plumbing.dm"
 #include "code\__DEFINES\pool.dm"
 #include "code\__DEFINES\power.dm"
 #include "code\__DEFINES\preferences.dm"
@@ -289,6 +290,7 @@
 #include "code\controllers\subsystem\events.dm"
 #include "code\controllers\subsystem\fail2topic.dm"
 #include "code\controllers\subsystem\fire_burning.dm"
+#include "code\controllers\subsystem\fluid.dm"
 #include "code\controllers\subsystem\garbage.dm"
 #include "code\controllers\subsystem\holodeck.dm"
 #include "code\controllers\subsystem\icon_smooth.dm"
@@ -362,6 +364,7 @@
 #include "code\datums\datumvars.dm"
 #include "code\datums\dna.dm"
 #include "code\datums\dog_fashion.dm"
+#include "code\datums\ductnet.dm"
 #include "code\datums\emotes.dm"
 #include "code\datums\ert.dm"
 #include "code\datums\explosion.dm"
@@ -472,6 +475,11 @@
 #include "code\datums\components\fantasy\affix.dm"
 #include "code\datums\components\fantasy\prefixes.dm"
 #include "code\datums\components\fantasy\suffixes.dm"
+#include "code\datums\components\plumbing\_plumbing.dm"
+#include "code\datums\components\plumbing\chemical_acclimator.dm"
+#include "code\datums\components\plumbing\filter.dm"
+#include "code\datums\components\plumbing\reaction_chamber.dm"
+#include "code\datums\components\plumbing\splitter.dm"
 #include "code\datums\components\storage\storage.dm"
 #include "code\datums\components\storage\ui.dm"
 #include "code\datums\components\storage\concrete\_concrete.dm"
@@ -1181,6 +1189,7 @@
 #include "code\game\objects\structures\flora.dm"
 #include "code\game\objects\structures\fluff.dm"
 #include "code\game\objects\structures\fugitive_role_spawners.dm"
+#include "code\game\objects\structures\geyser.dm"
 #include "code\game\objects\structures\ghost_role_spawners.dm"
 #include "code\game\objects\structures\girders.dm"
 #include "code\game\objects\structures\grille.dm"
@@ -2797,6 +2806,20 @@
 #include "code\modules\photography\photos\album.dm"
 #include "code\modules\photography\photos\frame.dm"
 #include "code\modules\photography\photos\photo.dm"
+#include "code\modules\plumbing\ducts.dm"
+#include "code\modules\plumbing\plumbers\_plumb_machinery.dm"
+#include "code\modules\plumbing\plumbers\acclimator.dm"
+#include "code\modules\plumbing\plumbers\autohydro.dm"
+#include "code\modules\plumbing\plumbers\bottler.dm"
+#include "code\modules\plumbing\plumbers\destroyer.dm"
+#include "code\modules\plumbing\plumbers\fermenter.dm"
+#include "code\modules\plumbing\plumbers\filter.dm"
+#include "code\modules\plumbing\plumbers\grinder_chemical.dm"
+#include "code\modules\plumbing\plumbers\pill_press.dm"
+#include "code\modules\plumbing\plumbers\pumps.dm"
+#include "code\modules\plumbing\plumbers\reaction_chamber.dm"
+#include "code\modules\plumbing\plumbers\splitters.dm"
+#include "code\modules\plumbing\plumbers\synthesizer.dm"
 #include "code\modules\pool\pool_controller.dm"
 #include "code\modules\pool\pool_drain.dm"
 #include "code\modules\pool\pool_effects.dm"