Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them"

2020-05-03 07:12:41 +02:00
parent c1d1e4f0c0
commit 76e1ee80b7
12 changed files with 92 additions and 18 deletions
@@ -109,6 +109,8 @@
 /// Process_Grab(): checks for grab, attempts to break if so. Return TRUE to prevent movement.
 /client/proc/Process_Grab()
 	if(mob.pulledby)
+		if((mob.pulledby == mob.pulling) && (mob.pulledby.grab_state == GRAB_PASSIVE))			//Don't autoresist passive grabs if we're grabbing them too.
+			return
 		if(mob.incapacitated(ignore_restraints = 1))
 			move_delay = world.time + 10
 			return TRUE