From ac33c3341b8416062dc5b9cd6a9d1cc3d28a2e00 Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Mon, 6 Dec 2021 04:48:10 -0500
Subject: [PATCH] Merge pull request #11971 from Heroman3003/grabattack

Makes player-controlled simplemobs not do attacks when on grab intent
---
 code/modules/mob/living/simple_mob/on_click.dm      | 2 ++
 code/modules/mob/living/simple_mob/simple_mob_vr.dm | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/living/simple_mob/on_click.dm b/code/modules/mob/living/simple_mob/on_click.dm
index 9707e3b01d..ed0916e885 100644
--- a/code/modules/mob/living/simple_mob/on_click.dm
+++ b/code/modules/mob/living/simple_mob/on_click.dm
@@ -34,6 +34,8 @@
 		if(I_GRAB)
 			if(has_hands)
 				A.attack_hand(src)
+			else if(isliving(A) && src.client)
+				animal_nom(A)
 			else
 				attack_target(A)
 
diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
index 305ecf70fc..932d3edfc1 100644
--- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
@@ -279,13 +279,6 @@
 		return MOVEMENT_FAILED //Mobs aren't that stupid, probably
 	return ..() // Procede as normal.
 
-//Grab = Nomf
-/mob/living/simple_mob/UnarmedAttack(var/atom/A, var/proximity)
-	. = ..()
-
-	if(a_intent == I_GRAB && isliving(A) && !has_hands)
-		animal_nom(A)
-
 // Riding
 /datum/riding/simple_mob
 	keytype = /obj/item/weapon/material/twohanded/riding_crop // Crack!