Merge branch 'animation'

Merging animation fixes

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_movement.dm
	config/admins.txt

code/modules/mob/mob_defines.dm

@@ -3,6 +3,7 @@
 	layer = 4.0
 	animate_movement = 2
 	flags = NOREACT
+	glide_size = 8
 	var/datum/mind/mind
 
 	var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
@@ -227,3 +228,5 @@
 	var/can_stand = 1 //Whether this mob have ability to stand
 
 	var/immune_to_ssd = 0
+//Animation speed changer
+	var/lastmovementdelay = 0

code/modules/mob/mob_movement.dm

@@ -289,8 +289,28 @@
 					move_delay += 6
 				move_delay += 1+config.run_speed
 			if("walk")
+<<<<<<< HEAD
 				move_delay += 7+config.walk_speed
 		move_delay += mob.movement_delay()
+=======
+//				if(mob.organStructure && mob.organStructure.legs)
+//					move_delay += mob.organStructure.legs.moveWalkDelay
+				move_delay += 5
+
+
+
+
+
+		if (mob.movement_delay() != mob.lastmovementdelay)
+			mob.lastmovementdelay = mob.movement_delay()
+			mob.glide_size = 40/mob.lastmovementdelay //Slightly faster than tile (32 pixels) per second assuming 10 FPS.
+			src << "Debug: Your new glide speed is [mob.glide_size]"
+		else
+			mob.lastmovementdelay = mob.movement_delay()
+
+		move_delay += mob.lastmovementdelay
+		move_delay += mob.grav_delay
+>>>>>>> animation
 
 		if(config.Tickcomp)
 			move_delay -= 1.3
@@ -505,4 +525,4 @@
 		prob_slip = 0  // Changing this to zero to make it line up with the comment.
 
 	prob_slip = round(prob_slip)
-	return(prob_slip)
+	return(prob_slip)