From 36da801edd201e25bbaea1e30fa5a3365af917a0 Mon Sep 17 00:00:00 2001 From: blessedmulligan Date: Sat, 27 Jul 2019 21:43:09 -0500 Subject: [PATCH] welders no longer flash the user if the user somehow manages to not be adjacent to the welder --- code/game/objects/items/tools/weldingtool.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 248d6589ff1..edc88a53a12 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -233,13 +233,13 @@ // When welding is about to start, run a normal tool_use_check, then flash a mob if it succeeds. /obj/item/weldingtool/tool_start_check(mob/living/user, amount=0) . = tool_use_check(user, amount) - if(. && user) + if(. && user && get_dist(get_turf(src), get_turf(user)) <= 1) user.flash_act(light_intensity) // Flash the user during welding progress /obj/item/weldingtool/tool_check_callback(mob/living/user, amount, datum/callback/extra_checks) . = ..() - if(. && user) + if(. && user && get_dist(get_turf(src), get_turf(user)) <= 1) if (progress_flash_divisor == 0) user.flash_act(min(light_intensity,1)) progress_flash_divisor = initial(progress_flash_divisor)