From b07dab729c0089573c6f1c5870f8f93172e9605a Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Tue, 23 Oct 2018 21:54:46 +0800 Subject: [PATCH 1/2] Fix reagent dispenser getting attack cooldown --- code/modules/reagents/reagent_dispenser.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index a90dd80ac59..f5d055e7799 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -13,9 +13,7 @@ var/lastrigger = "" // The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation /obj/structure/reagent_dispensers/attackby(obj/item/I, mob/user, params) - . = ..() - if(I.is_refillable()) - return FALSE //so we can refill them via their afterattack. + return FALSE /obj/structure/reagent_dispensers/New() create_reagents(tank_volume) From 9de64fa8c79c769c0977cfb1f83f96d22127bd27 Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Wed, 24 Oct 2018 06:53:31 +0800 Subject: [PATCH 2/2] Better fix --- code/modules/reagents/reagent_dispenser.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index f5d055e7799..dda7471dab8 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -13,7 +13,9 @@ var/lastrigger = "" // The last person to rig this fuel tank - Stored with the object. Only the last person matter for investigation /obj/structure/reagent_dispensers/attackby(obj/item/I, mob/user, params) - return FALSE + if(I.is_refillable()) + return FALSE //so we can refill them via their afterattack. + . = ..() /obj/structure/reagent_dispensers/New() create_reagents(tank_volume)