Minor speedups to movement: First Blood Part 2

2017-11-14 22:59:45 +02:00
parent 9c7da6a133
commit 8136148303
27 changed files with 48 additions and 63 deletions
@@ -395,7 +395,10 @@
 		pulling = null
 		grab_state = 0
 		update_pull_hud_icon()
+<<<<<<< HEAD

+=======
+>>>>>>> 3f58245... Minor speedups to movement: First Blood Part 2 (#32702)
 		if(isliving(ex_pulled))
 			var/mob/living/L = ex_pulled
 			L.update_canmove()// mob gets up if it was lyng down in a chokehold
@@ -676,8 +679,6 @@
 /mob/proc/canface()
 	if(!canmove)
 		return 0
-	if(client.moving)
-		return 0
 	if(world.time < client.move_delay)
 		return 0
 	if(stat==2)