From 640a20878aa875a3861063282ce99e091bcc5818 Mon Sep 17 00:00:00 2001 From: Vi3trice <80771500+Vi3trice@users.noreply.github.com> Date: Fri, 5 Nov 2021 05:01:58 -0400 Subject: [PATCH] Item attacks send no logs if they have no force (#17029) * Hush if no force * Move it to the other force check instead --- code/_onclick/item_attack.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index a2a4aec80c4..7d9438e5ded 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -72,6 +72,7 @@ playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1) else SEND_SIGNAL(M, COMSIG_ITEM_ATTACK) + add_attack_logs(user, M, "Attacked with [name] ([uppertext(user.a_intent)]) ([uppertext(damtype)])", (M.ckey && force > 0 && damtype != STAMINA) ? null : ATKLOG_ALMOSTALL) if(hitsound) playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0) @@ -81,8 +82,6 @@ user.do_attack_animation(M) . = M.attacked_by(src, user, def_zone) - add_attack_logs(user, M, "Attacked with [name] ([uppertext(user.a_intent)]) ([uppertext(damtype)])", (M.ckey && force > 0 && damtype != STAMINA) ? null : ATKLOG_ALMOSTALL) - add_fingerprint(user)