From cd6fef55d2258744971060e503344716e510eca5 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sun, 21 Apr 2024 01:52:33 -0400 Subject: [PATCH 1/3] Update reagent_dispensers.dm --- .../objects/structures/reagent_dispensers.dm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index a89f35ce38f3..fed9aac54e0f 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -129,6 +129,25 @@ if(N) amount_per_transfer_from_this = N +/obj/structure/reagent_dispensers/clicked(mob/user, list/mods) + if(!Adjacent(user)) + return ..() + + if(!ishuman(user)) + return ..() + + if(!reagents || reagents.locked) + return ..() + + if(mods["alt"]) + dispensing = !dispensing + if(dispensing) + to_chat(usr, SPAN_NOTICE("[src] is now dispensing")) + else + to_chat(usr, SPAN_NOTICE("[src] is now filling")) + return TRUE + . = ..() + /obj/structure/reagent_dispensers/attackby(obj/item/hit_item, mob/living/user) if(istype(hit_item, /obj/item/reagent_container)) return From e07ddc02eea27076ff9952dfdc121cbc920f1cb9 Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Sun, 21 Apr 2024 00:17:58 -0700 Subject: [PATCH 2/3] Update code/game/objects/structures/reagent_dispensers.dm --- code/game/objects/structures/reagent_dispensers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index fed9aac54e0f..ec730b5d3ce2 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -146,7 +146,7 @@ else to_chat(usr, SPAN_NOTICE("[src] is now filling")) return TRUE - . = ..() + return ..() /obj/structure/reagent_dispensers/attackby(obj/item/hit_item, mob/living/user) if(istype(hit_item, /obj/item/reagent_container)) From 538d301ec7b345837acc8bf8022c164e9fe4aec2 Mon Sep 17 00:00:00 2001 From: iloveloopers <140007537+iloveloopers@users.noreply.github.com> Date: Sun, 21 Apr 2024 14:37:51 -0400 Subject: [PATCH 3/3] Update reagent_dispensers.dm --- code/game/objects/structures/reagent_dispensers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index ec730b5d3ce2..d0f9f513e7f8 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -142,9 +142,9 @@ if(mods["alt"]) dispensing = !dispensing if(dispensing) - to_chat(usr, SPAN_NOTICE("[src] is now dispensing")) + to_chat(user, SPAN_NOTICE("[src] is now dispensing")) else - to_chat(usr, SPAN_NOTICE("[src] is now filling")) + to_chat(user, SPAN_NOTICE("[src] is now filling")) return TRUE return ..()