From f33487e972fc85cf1724588efc63ce39e57c1609 Mon Sep 17 00:00:00 2001 From: lolman360 Date: Wed, 22 Jul 2020 11:36:50 +1000 Subject: [PATCH] complie --- .../components/plumbing/reaction_chamber.dm | 1 - icons/obj/plumbing/fluid_ducts.dmi | Bin 0 -> 979 bytes icons/obj/plumbing/plumbers.dmi | Bin 0 -> 16528 bytes tgstation.dme | 23 ++++++++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 icons/obj/plumbing/fluid_ducts.dmi create mode 100644 icons/obj/plumbing/plumbers.dmi 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 0000000000000000000000000000000000000000..87d9d2233b43ec1fe08f2f0d529166c3c74131d0 GIT binary patch literal 979 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 HZ`5_WK4d- zgK3xKPT`?liAP0eGyala%(Vl)^gC!MxV0f%je;+c762X2E8xC_Xon_M+^DSHlseh@ z1FJ8$olJH7sd&%o{5)^kcGTvT!6Pc%&X~BEn6(tMf3mzBV+-yVEmcH<7_`6uf)okd zR*|SH(2qt(5{b$RJGqUPwXg0bOFvdIw5Q^IWvp#XN_IL8`j~)9Pc-7{J!%>b)f(IUIUbHeV30hmIpJx}`Nh zll~{&@yiF(@wh*7>IdCo-92ez?e|lC4Wn;Sw^f+3@J`(l`KTN~;rUhstkt{zIq+6x zml8F|K1%1}^Kdt7-AbLnkjBT0&5X1s2z)rBU*#cR`s1_$^7@3^SX1d0}V)prRQ%tEv;Wz?G|}& zQZf_|x_R0;JpE+uXJ8Y%zbcvc12Zoa{?*V4Vq0hgE6%k(Ur0!t#D0qbYYI~oJIz|( z|5B7?$$Waq{+`k}8p+3u>=L95iGr(XAKQuo!jBsi?Bi)u9j#~9Ui*R~R5V4{9->~$ zT&pw!Lj_{Q)j#z`g1!V6CulrbM4$t=Yyaf7ZPB0+=OlgOO`^a$B3PG&4@19X_}AMj z->}mmHj=pb$(B}b{1VeIXENb0dIXIa$2(cucFAQYLxY)KF_J!wT+ABtcAGMJl-#+T rX$TS(C~FEO&j^hd5RUC2(OfYe(THM}i3WdZ0MNN@sPR$F_WAz<->$Gj literal 0 HcmV?d00001 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"