From f82952d3472baeb8abe3718eee89549b9629d817 Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Wed, 7 Nov 2012 01:39:56 +0200
Subject: [PATCH] Fixes

---
 baystation12.dme                 |  2 +-
 code/modules/mob/mob_movement.dm | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/baystation12.dme b/baystation12.dme
index 9c3d462b51a..5c481cc856f 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -213,7 +213,7 @@
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
+#define FILE_DIR "code/WorkInProgress/carn"
 #define FILE_DIR "code/WorkInProgress/Chinsky"
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/Mini"
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 6e6b0d6dfe8..c4098840dc4 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -289,17 +289,7 @@
 					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()
@@ -310,7 +300,6 @@
 
 		move_delay += mob.lastmovementdelay
 		move_delay += mob.grav_delay
->>>>>>> animation
 
 		if(config.Tickcomp)
 			move_delay -= 1.3
@@ -525,4 +514,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)