From 3f82ca30532d3ce61969b7802ca1e5bd9f544bcd Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 25 May 2021 04:42:03 +0200 Subject: [PATCH] [MIRROR] Fixed backpack firefighter tank nozzle refilling not working in extinguisher mode (#5920) * Fixed backpack firefighter tank nozzle refilling not working in extinguisher mode (#59216) Also removed useless local var from /obj/item/extinguisher/proc/AttemptRefill * Fixed backpack firefighter tank nozzle refilling not working in extinguisher mode Co-authored-by: norill --- code/game/objects/items/extinguisher.dm | 4 ---- code/game/objects/items/tanks/watertank.dm | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 5429676fd50..3db5d4f7012 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -133,11 +133,8 @@ /obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user) if(istype(target, tanktype) && target.Adjacent(user)) - var/safety_save = safety - safety = TRUE if(reagents.total_volume == reagents.maximum_volume) to_chat(user, "\The [src] is already full!") - safety = safety_save return TRUE var/obj/structure/reagent_dispensers/W = target //will it work? var/transferred = W.reagents.trans_to(src, max_water, transfered_by = user) @@ -148,7 +145,6 @@ R.cooling_temperature = cooling_power else to_chat(user, "\The [W] is empty!") - safety = safety_save return TRUE else return FALSE diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 81b96b64bde..eb57eeb81ce 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -268,12 +268,12 @@ return /obj/item/extinguisher/mini/nozzle/afterattack(atom/target, mob/user) + if(AttemptRefill(target, user)) + return if(nozzle_mode == EXTINGUISHER) ..() return var/Adj = user.Adjacent(target) - if(Adj) - AttemptRefill(target, user) if(nozzle_mode == RESIN_LAUNCHER) if(Adj) return //Safety check so you don't blast yourself trying to refill your tank