[MIRROR] Fixes disarm intent combat (#2660)

Co-authored-by: BurpleBineapple <[email protected]> Co-authored-by: AmShegars <[email protected]>
SierraBay · Nov 21, 2024 · 0aa0332 · 0aa0332
1 parent ea64e7e
commit 0aa0332
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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