diff --git a/baystation12.dme b/baystation12.dme
index 5c481cc856f..9c3d462b51a 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/carn"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
 #define FILE_DIR "code/WorkInProgress/Chinsky"
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/Mini"
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 739354707bb..e22e1b66c20 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -1,3 +1,52 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+
+/obj
+	//var/datum/module/mod		//not used
+	var/m_amt = 0	// metal
+	var/g_amt = 0	// glass
+	var/w_amt = 0	// waster amounts
+	var/origin_tech = null	//Used by R&D to determine what research bonuses it grants.
+	var/reliability = 100	//Used by SOME devices to determine how reliable they are.
+	var/crit_fail = 0
+	var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
+	var/datum/marked_datum
+	animate_movement = 2
+	glide_size = 8
+	var/throwforce = 1
+
+	proc/handle_internal_lifeform(mob/lifeform_inside_me, breath_request)
+		//Return: (NONSTANDARD)
+		//		null if object handles breathing logic for lifeform
+		//		datum/air_group to tell lifeform to process using that breath return
+		//DEFAULT: Take air from turf to give to have mob process
+		if(breath_request>0)
+			return remove_air(breath_request)
+		else
+			return null
+
+	proc/initialize()
+
+//Define all tape types in policetape.dm
+/obj/item/taperoll
+	name = "tape roll"
+	icon = 'policetape.dmi'
+	icon_state = "rollstart"
+	flags = FPRINT
+	w_class = 1.0
+	var/turf/start
+	var/turf/end
+	var/tape_type = /obj/item/tape
+	var/icon_base
+
+/obj/item/tape
+	name = "tape"
+	icon = 'policetape.dmi'
+	anchored = 1
+	density = 1
+	var/icon_base
+/*
+
+*/
 /obj/structure/signpost
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "signpost"
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 8fa35edf2d9..4ca10d4b608 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/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
\ No newline at end of file
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index a6c3ebe5877..6e6b0d6dfe8 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/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)
\ No newline at end of file
+	return(prob_slip)
diff --git a/config/admins.txt b/config/admins.txt
index c2b5bf032eb..f052934eda5 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -1,27 +1 @@
-abi79 - Game Master
-arcalane - Game Admin
-asanadas - Game Admin
-bobbehluvspropane - Game Admin
-cacophony - Game Admin
-cajoes - Game Admin
-cib - Retired Admin
-compactninja - Retired Admin
-duntadaman - Game Admin
-dysthymia - Retired Admin
-doughnuts - Game Admin
-erthilo - Game Master
-hawkv3 - Game Master
-headswe - Game Master
-iaryni - Game Master
-masterofapples - Game Admin
-megacaesar - Retired Admin
-miniature - Game Master
-misterbook - Game Admin
-misterfox - Game Admin
-mloc - Game Master
-skymarshal - Retired Admin
-spaceman96 - Retired Admin
-strumpetplaya - Retired Admin
-tastyfish - Retired Admin
-uristqwerty - Game Master
-wrongnumber - Game Admin
+kreastr - Game Master