From 17dd5ad6566c814446b533ce18f678909bd3cfbd Mon Sep 17 00:00:00 2001 From: Geeves Date: Wed, 29 May 2024 21:20:00 +0200 Subject: [PATCH] Aim Intent Safety Fix --- .../projectiles/targeting/targeting_triggers.dm | 13 +++++++------ html/changelogs/geeves-aim_intent_safety_fix.yml | 6 ++++++ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/geeves-aim_intent_safety_fix.yml diff --git a/code/modules/projectiles/targeting/targeting_triggers.dm b/code/modules/projectiles/targeting/targeting_triggers.dm index 461fe24bc0d..d5fdd71f2d1 100644 --- a/code/modules/projectiles/targeting/targeting_triggers.dm +++ b/code/modules/projectiles/targeting/targeting_triggers.dm @@ -23,6 +23,13 @@ return TRUE /obj/aiming_overlay/proc/trigger(var/perm) + if(!owner || !aiming_with || !aiming_at || !locked) + return FALSE + if(perm && (target_permissions & perm)) + return FALSE + if(!owner.canClick()) + return FALSE + var/obj/item/gun/G = aiming_with if(istype(G) && G.safety()) if(owner.a_intent == I_HURT) @@ -30,12 +37,6 @@ else G.handle_click_empty(owner) to_chat(owner, SPAN_WARNING("Your [G]'s safety prevents firing.")) - if(!owner || !aiming_with || !aiming_at || !locked) - return FALSE - if(perm && (target_permissions & perm)) - return FALSE - if(!owner.canClick()) - return FALSE owner.setClickCooldown(DEFAULT_QUICK_COOLDOWN) // Spam prevention, essentially. owner.visible_message( diff --git a/html/changelogs/geeves-aim_intent_safety_fix.yml b/html/changelogs/geeves-aim_intent_safety_fix.yml new file mode 100644 index 00000000000..81fd5e47610 --- /dev/null +++ b/html/changelogs/geeves-aim_intent_safety_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed aim intent triggering clicking messages if someone moves (despite being allowed to move) when you're not on harm intent." \ No newline at end of file