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

@@ -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)
 

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!