diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm index 801b035349b..5352e45bd17 100644 --- a/code/modules/plumbing/plumbers/bottler.dm +++ b/code/modules/plumbing/plumbers/bottler.dm @@ -1,6 +1,6 @@ /obj/machinery/plumbing/bottler name = "chemical bottler" - desc = "Puts reagents into containers, like bottles and beakers." + desc = "Puts reagents into containers, like bottles and beakers in the tile facing the green light spot, they will exit on the red light spot if successfully filled." icon_state = "bottler" layer = ABOVE_ALL_MOB_LAYER @@ -21,6 +21,10 @@ AddComponent(/datum/component/plumbing/simple_demand, bolt) setDir(dir) +/obj/machinery/plumbing/bottler/examine(mob/user) + . = ..() + . += "A small screen indicates that it will fill for [wanted_amount]u." + /obj/machinery/plumbing/bottler/can_be_rotated(mob/user, rotation_type) if(anchored) to_chat(user, "It is fastened to the floor!") @@ -52,7 +56,6 @@ /obj/machinery/plumbing/bottler/interact(mob/user) . = ..() wanted_amount = clamp(round(input(user,"maximum is 100u","set ammount to fill with") as num|null, 1), 1, 100) - reagents.clear_reagents() to_chat(user, " The [src] will now fill for [wanted_amount]u.") /obj/machinery/plumbing/bottler/process() @@ -61,7 +64,7 @@ ///see if machine has enough to fill if(reagents.total_volume >= wanted_amount && anchored) var/obj/AM = pick(inputspot.contents)///pick a reagent_container that could be used - if(istype(AM, /obj/item/reagent_containers) && (!istype(AM, /obj/item/reagent_containers/hypospray/medipen))) + if(istype(AM, /obj/item/reagent_containers) && (!istype(AM, /obj/item/reagent_containers/hypospray/medipen)) || (istype(AM, /obj/item/ammo_casing/shotgun/dart))) var/obj/item/reagent_containers/B = AM ///see if it would overflow else inject if((B.reagents.total_volume + wanted_amount) <= B.reagents.maximum_volume) diff --git a/icons/obj/plumbing/plumbers.dmi b/icons/obj/plumbing/plumbers.dmi index 2d14ee9b226..e45942fc24f 100644 Binary files a/icons/obj/plumbing/plumbers.dmi and b/icons/obj/plumbing/plumbers.dmi differ