From 0aa0332699e5161126fe36544fcf6e320a57cd5d Mon Sep 17 00:00:00 2001
From: Sierra Helper <125094432+SierraHelper@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:48:42 +0300
Subject: [PATCH] [MIRROR] Fixes disarm intent combat (#2660)

Co-authored-by: BurpleBineapple <67706292+BurpleBineapple@users.noreply.github.com>
Co-authored-by: AmShegars <88627712+AmShegars@users.noreply.github.com>
---
 code/_onclick/item_attack.dm    | 2 +-
 code/modules/projectiles/gun.dm | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 8e2210475c668..2011fcf541bb5 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -53,7 +53,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 
 	use_call = "use"
 	. = use_before(atom, user, click_params)
-	if (!. && user.a_intent == I_HURT)
+	if (!. && (user.a_intent == I_HURT || user.a_intent == I_DISARM))
 		use_call = "weapon"
 		. = atom.use_weapon(src, user, click_params)
 	if (!.)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index f02aba7877412..c4dab27add143 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -234,11 +234,8 @@
 			else
 				Fire(target, user, pointblank = TRUE)
 		return TRUE
-
 	// Point blank shooting
 	if (user.a_intent == I_HURT && !user.isEquipped(target))
-		if (safety()) // Pistol whip instead of unsafety+fire
-			return ..()
 		Fire(target, user, pointblank = TRUE)
 		return TRUE