From 57dda16449db6bdae22eb55f84230ba494ce3337 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 11 Feb 2021 22:40:30 +0100
Subject: [PATCH] [MIRROR] right clicking on a ranged attack now calls
 afterattack when it's supposed to (#3309)

* right clicking on a ranged attack now calls afterattack when it's supposed to (#56829)

Makes right-click ranged attacks run afterattack, if afterattack_secondary returns SECONDARY_ATTACK_CALL_NORMAL, as it's supposed to.

Fixes #56795 and #56810

* right clicking on a ranged attack now calls afterattack when it's supposed to

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
---
 code/_onclick/click.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 5da1c42e83c..e06cfa5b42f 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -156,7 +156,10 @@
 	else
 		if(W)
 			if(modifiers["right"])
-				W.afterattack_secondary(A,src,0,params)
+				var/after_attack_secondary_result = W.afterattack_secondary(A, src, FALSE, params)
+
+				if(after_attack_secondary_result == SECONDARY_ATTACK_CALL_NORMAL)
+					W.afterattack(A, src, FALSE, params)
 			else
 				W.afterattack(A,src,0,params)
 		else