diff --git a/code/datums/components/plumbing/chemical_acclimator.dm b/code/datums/components/plumbing/chemical_acclimator.dm index ae4e13095c4..a8bb511c374 100644 --- a/code/datums/components/plumbing/chemical_acclimator.dm +++ b/code/datums/components/plumbing/chemical_acclimator.dm @@ -15,6 +15,7 @@ . = ..() if(!reagents.holder_full()) return + reagents.flags &= ~NO_REACT myacclimator.acclimate_state = reagents.chem_temp > myacclimator.target_temperature ? AC_COOLING : AC_HEATING myacclimator.update_appearance(UPDATE_ICON_STATE) diff --git a/code/game/objects/items/rcd/RPLD.dm b/code/game/objects/items/rcd/RPLD.dm index 2a6ace7783e..46c39e53619 100644 --- a/code/game/objects/items/rcd/RPLD.dm +++ b/code/game/objects/items/rcd/RPLD.dm @@ -44,7 +44,6 @@ /obj/machinery/plumbing/fermenter = 30, /obj/machinery/plumbing/liquid_pump = 35, //extracting chemicals from ground is one way of creation /obj/machinery/plumbing/disposer = 10, - /obj/machinery/plumbing/buffer = 10, //creates chemicals as it waits for other buffers containing other chemicals and when mixed creates new chemicals ), //category 2 distributors i.e devices which inject , move around , remove chemicals from the network @@ -62,9 +61,10 @@ "Storage" = list( /obj/machinery/plumbing/tank = 20, /obj/machinery/plumbing/acclimator = 10, + /obj/machinery/plumbing/buffer = 10, /obj/machinery/plumbing/bottler = 50, /obj/machinery/plumbing/pill_press = 20, - /obj/machinery/iv_drip/plumbing = 20 + /obj/machinery/iv_drip/plumbing = 20, ), ) diff --git a/code/modules/asset_cache/assets/plumbing.dm b/code/modules/asset_cache/assets/plumbing.dm index 538fcf5dfe4..19225184038 100644 --- a/code/modules/asset_cache/assets/plumbing.dm +++ b/code/modules/asset_cache/assets/plumbing.dm @@ -24,7 +24,7 @@ "manifold", "pipe_input", "filter", - "splitter_tri", + "splitter", "beacon", "pipe_output", "tank", diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm index 23d12b88f2a..52e759ef816 100644 --- a/code/modules/plumbing/plumbers/_plumb_machinery.dm +++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm @@ -17,7 +17,7 @@ ///Plumbing machinery is always gonna need reagents, so we might aswell put it here var/buffer = 50 ///Flags for reagents, like INJECTABLE, TRANSPARENT bla bla everything thats in DEFINES/reagents.dm - var/reagent_flags = TRANSPARENT + var/reagent_flags = TRANSPARENT | NO_REACT /obj/machinery/plumbing/Initialize(mapload) . = ..() diff --git a/code/modules/plumbing/plumbers/_plumb_reagents.dm b/code/modules/plumbing/plumbers/_plumb_reagents.dm index 74d2e45de9d..f32ebacc31f 100644 --- a/code/modules/plumbing/plumbers/_plumb_reagents.dm +++ b/code/modules/plumbing/plumbers/_plumb_reagents.dm @@ -52,9 +52,6 @@ if(amount <= 0) return FALSE - //Set up new reagents to inherit the old ongoing reactions - transfer_reactions(target_holder) - var/list/cached_reagents = reagent_list var/transfer_amount var/transfered_amount @@ -100,10 +97,6 @@ break update_total() - //handle reactions - target_holder.handle_reactions() - handle_reactions() - return total_transfered_amount ///Excludes catalysts during the emptying process @@ -190,9 +183,6 @@ if(amount <= 0) return FALSE - //Set up new reagents to inherit the old ongoing reactions - transfer_reactions(target_holder) - var/working_volume var/catalyst_volume var/transfer_amount @@ -247,10 +237,6 @@ break update_total() - //handle reactions - target_holder.handle_reactions() - handle_reactions() - return total_transfered_amount @@ -302,9 +288,6 @@ if(amount <= 0) return FALSE - //Set up new reagents to inherit the old ongoing reactions - transfer_reactions(target_holder) - var/transfer_amount var/transfered_amount var/total_transfered_amount = 0 @@ -342,8 +325,4 @@ reagent.volume -= transfered_amount update_total() - //handle reactions - target_holder.handle_reactions() - handle_reactions() - return total_transfered_amount diff --git a/code/modules/plumbing/plumbers/acclimator.dm b/code/modules/plumbing/plumbers/acclimator.dm index cca587d9a2b..28c1ef7b821 100644 --- a/code/modules/plumbing/plumbers/acclimator.dm +++ b/code/modules/plumbing/plumbers/acclimator.dm @@ -82,6 +82,7 @@ if(acclimate_state == AC_EMPTYING && !reagents.total_volume) acclimate_state = AC_FILLING + reagents.flags |= NO_REACT update_appearance(UPDATE_ICON_STATE) /obj/machinery/plumbing/acclimator/ui_interact(mob/user, datum/tgui/ui) diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm index 26a85714d37..1fb1abed37f 100644 --- a/code/modules/plumbing/plumbers/bottler.dm +++ b/code/modules/plumbing/plumbers/bottler.dm @@ -5,7 +5,7 @@ reagents = /datum/reagents layer = ABOVE_ALL_MOB_LAYER plane = ABOVE_GAME_PLANE - reagent_flags = TRANSPARENT | DRAINABLE + reagent_flags = /obj/machinery/plumbing::reagent_flags | DRAINABLE buffer = 100 ///how much do we fill diff --git a/code/modules/plumbing/plumbers/fermenter.dm b/code/modules/plumbing/plumbers/fermenter.dm index e0e006db090..320d364b015 100644 --- a/code/modules/plumbing/plumbers/fermenter.dm +++ b/code/modules/plumbing/plumbers/fermenter.dm @@ -4,7 +4,7 @@ icon_state = "fermenter" layer = ABOVE_ALL_MOB_LAYER plane = ABOVE_GAME_PLANE - reagent_flags = TRANSPARENT | DRAINABLE + reagent_flags = /obj/machinery/plumbing::reagent_flags | DRAINABLE buffer = 400 ///input dir diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm index b304bc78b2f..d1c21bf5c32 100644 --- a/code/modules/plumbing/plumbers/grinder_chemical.dm +++ b/code/modules/plumbing/plumbers/grinder_chemical.dm @@ -4,7 +4,7 @@ icon_state = "grinder_chemical" layer = ABOVE_ALL_MOB_LAYER plane = ABOVE_GAME_PLANE - reagent_flags = TRANSPARENT | DRAINABLE + reagent_flags = /obj/machinery/plumbing::reagent_flags | DRAINABLE buffer = 400 /// Are we grinding or juicing diff --git a/code/modules/plumbing/plumbers/reaction_chamber.dm b/code/modules/plumbing/plumbers/reaction_chamber.dm index c3943cc3400..77ee9e4a52c 100644 --- a/code/modules/plumbing/plumbers/reaction_chamber.dm +++ b/code/modules/plumbing/plumbers/reaction_chamber.dm @@ -8,7 +8,6 @@ desc = "Keeps chemicals separated until given conditions are met." icon_state = "reaction_chamber" buffer = 200 - reagent_flags = TRANSPARENT | NO_REACT reagents = /datum/reagents/plumbing/reaction_chamber /** diff --git a/code/modules/plumbing/plumbers/simple_machines.dm b/code/modules/plumbing/plumbers/simple_machines.dm index ed5a835a8f1..cb8a3f4a4a6 100644 --- a/code/modules/plumbing/plumbers/simple_machines.dm +++ b/code/modules/plumbing/plumbers/simple_machines.dm @@ -4,7 +4,7 @@ desc = "Can be manually filled with reagents from containers." icon_state = "pipe_input" pass_flags_self = PASSMACHINE | LETPASSTHROW // Small - reagent_flags = TRANSPARENT | REFILLABLE + reagent_flags = /obj/machinery/plumbing::reagent_flags | REFILLABLE /obj/machinery/plumbing/input/Initialize(mapload, layer) . = ..() @@ -16,7 +16,7 @@ desc = "A manual output for plumbing systems, for taking reagents directly into containers." icon_state = "pipe_output" pass_flags_self = PASSMACHINE | LETPASSTHROW // Small - reagent_flags = TRANSPARENT | DRAINABLE + reagent_flags = /obj/machinery/plumbing::reagent_flags | DRAINABLE reagents = /datum/reagents /obj/machinery/plumbing/output/Initialize(mapload, layer) diff --git a/code/modules/plumbing/plumbers/splitters.dm b/code/modules/plumbing/plumbers/splitters.dm index 24a0761cc70..52a7ac99197 100644 --- a/code/modules/plumbing/plumbers/splitters.dm +++ b/code/modules/plumbing/plumbers/splitters.dm @@ -4,7 +4,7 @@ /obj/machinery/plumbing/splitter name = "chemical splitter" desc = "A chemical splitter for smart chemical factorization. Waits till a set of conditions is met and then stops all input and splits the buffer evenly or other in two ducts." - icon_state = "splitter_tri" + icon_state = "splitter" buffer = 100 density = FALSE diff --git a/icons/obj/pipes_n_cables/hydrochem/plumbers.dmi b/icons/obj/pipes_n_cables/hydrochem/plumbers.dmi index 6ee8c29af44..39c2257b708 100644 Binary files a/icons/obj/pipes_n_cables/hydrochem/plumbers.dmi and b/icons/obj/pipes_n_cables/hydrochem/plumbers.dmi differ