From 81458fa46359b624d2dd2f550f9db971c4079986 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 25 Aug 2021 04:05:56 +0200
Subject: [PATCH] Fixes monkey being unable to access right click functions on
 many objects. (#60990) (#7753)

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/_onclick/other_mobs.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index e62f6d2ce8b..7571e6f3876 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -40,10 +40,7 @@
 		return
 	SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A, proximity_flag, modifiers)
 
-	if(dna?.species?.spec_unarmedattack(src, A, modifiers)) //Because species like monkeys dont use attack hand
-		return
-
-	if(!right_click_attack_chain(A, modifiers))
+	if(!right_click_attack_chain(A, modifiers) && !dna?.species?.spec_unarmedattack(src, A, modifiers)) //Because species like monkeys dont use attack hand
 		A.attack_hand(src, modifiers)