From d2e76e82e556cbbeb31d1027556fb5c52f265219 Mon Sep 17 00:00:00 2001 From: Tim Date: Wed, 30 Mar 2022 07:29:36 -0500 Subject: [PATCH] Fix welders using fuel when clicking on tiles (#65762) Fixes #49664 Welders now conserve fuel when you accidentally click on tiles. --- code/game/objects/items/tools/weldingtool.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 5715c5ad622..8a745b9a005 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -136,14 +136,12 @@ if(!proximity) return - if(isOn()) + if(isOn() && !QDELETED(attacked_atom) && isliving(attacked_atom)) // can't ignite something that doesn't exist handle_fuel_and_temps(1, user) - - if(!QDELETED(attacked_atom) && isliving(attacked_atom)) // can't ignite something that doesn't exist - var/mob/living/attacked_mob = attacked_atom - if(attacked_mob.IgniteMob()) - message_admins("[ADMIN_LOOKUPFLW(user)] set [key_name_admin(attacked_mob)] on fire with [src] at [AREACOORD(user)]") - log_game("[key_name(user)] set [key_name(attacked_mob)] on fire with [src] at [AREACOORD(user)]") + var/mob/living/attacked_mob = attacked_atom + if(attacked_mob.IgniteMob()) + message_admins("[ADMIN_LOOKUPFLW(user)] set [key_name_admin(attacked_mob)] on fire with [src] at [AREACOORD(user)]") + log_game("[key_name(user)] set [key_name(attacked_mob)] on fire with [src] at [AREACOORD(user)]") if(!status && attacked_atom.is_refillable()) reagents.trans_to(attacked_atom, reagents.total_volume, transfered_by = user)