diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 72acbdedaa8..a6687dd3077 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -156,8 +156,8 @@ if(!get_reagents()) to_chat(usr, span_warning("There's nothing attached to the IV drip!")) return - if(!target.reagents) - to_chat(usr, span_warning("Target can't hold reagents!")) + if(!target.is_injectable(usr)) + to_chat(usr, span_warning("Can't inject into this!")) return if(attached) visible_message(span_warning("[attached] is detached from [src].")) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 930b2dd588b..9beb58e18bc 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -57,7 +57,7 @@ /obj/machinery/hydroponics/Initialize(mapload) //ALRIGHT YOU DEGENERATES. YOU HAD REAGENT HOLDERS FOR AT LEAST 4 YEARS AND NONE OF YOU MADE HYDROPONICS TRAYS HOLD NUTRIENT CHEMS INSTEAD OF USING "Points". //SO HERE LIES THE "nutrilevel" VAR. IT'S DEAD AND I PUT IT OUT OF IT'S MISERY. USE "reagents" INSTEAD. ~ArcaneMusic, accept no substitutes. - create_reagents(maxnutri) + create_reagents(maxnutri, INJECTABLE) reagents.add_reagent(/datum/reagent/plantnutriment/eznutriment, 10) //Half filled nutrient trays for dirt trays to have more to grow with in prison/lavaland. . = ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_separator.dm b/code/modules/reagents/chemistry/machinery/chem_separator.dm index 814e79492f4..24806b4b00c 100644 --- a/code/modules/reagents/chemistry/machinery/chem_separator.dm +++ b/code/modules/reagents/chemistry/machinery/chem_separator.dm @@ -31,7 +31,7 @@ /obj/structure/chem_separator/Initialize(mapload) . = ..() - create_reagents(300, TRANSPARENT) + create_reagents(300, TRANSPARENT | INJECTABLE) condenser = new() soundloop = new(src, boiling) diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm index a333c8ac3cb..768a3edf2ed 100644 --- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm +++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm @@ -36,7 +36,7 @@ /obj/machinery/smoke_machine/Initialize(mapload) . = ..() - create_reagents(REAGENTS_BASE_VOLUME) + create_reagents(REAGENTS_BASE_VOLUME, INJECTABLE) AddComponent(/datum/component/plumbing/simple_demand) for(var/obj/item/stock_parts/matter_bin/B in component_parts) reagents.maximum_volume += REAGENTS_BASE_VOLUME * B.rating @@ -57,7 +57,7 @@ for(var/obj/item/stock_parts/matter_bin/B in component_parts) new_volume += REAGENTS_BASE_VOLUME * B.rating if(!reagents) - create_reagents(new_volume) + create_reagents(new_volume, INJECTABLE) reagents.maximum_volume = new_volume if(new_volume < reagents.total_volume) reagents.expose(loc, TOUCH) // if someone manages to downgrade it without deconstructing