From ce59d483062ffabd9fc3aa4e04264cf8c6faf37a Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Wed, 19 Sep 2012 11:12:03 +0300
Subject: [PATCH 01/10] Initial glide_size increase.

---
 code/defines/obj.dm             | 1 +
 code/modules/mob/mob_defines.dm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 2441c741073..0e1efc65e68 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -11,6 +11,7 @@
 	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)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 5b55ecfe231..43513c9b1bd 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -2,6 +2,7 @@
 	density = 1
 	layer = 4.0
 	animate_movement = 2
+	glide_size = 8
 //	flags = NOREACT
 //THE SOLUTION BUBBLES was funnier.
 	var/datum/mind/mind

From 2deb70a1a961051a0be44a2922849e2ee3f7f204 Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Wed, 7 Nov 2012 00:08:02 +0200
Subject: [PATCH 02/10] Some changes. Untested.

---
 baystation12.dme                 |  1 -
 code/modules/mob/mob_defines.dm  |  2 ++
 code/modules/mob/mob_movement.dm | 14 +++++++++++++-
 config/admins.txt                | 27 +--------------------------
 4 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/baystation12.dme b/baystation12.dme
index 7da86180317..d0fb5184064 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -173,7 +173,6 @@
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/BirdMan"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter/backup"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
 #define FILE_DIR "code/WorkInProgress/Chinsky"
 #define FILE_DIR "code/WorkInProgress/mapload"
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 43513c9b1bd..e7c8c071667 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -297,3 +297,5 @@ the mob is also allowed to move without any sort of restriction. For instance, i
 
 	var/swap_on_mobbump = 1	//by default, mob collisions will swap the two mobs (if allowed)
 
+//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 162c89a9dd1..95ab7a821e2 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -340,7 +340,19 @@
 //				if(mob.organStructure && mob.organStructure.legs)
 //					move_delay += mob.organStructure.legs.moveWalkDelay
 				move_delay += 5
-		move_delay += mob.movement_delay()
+
+
+
+
+
+		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
 
 		if(config.Tickcomp)
diff --git a/config/admins.txt b/config/admins.txt
index 236c0f78ff1..cd00c619ba7 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -1,26 +1 @@
-abi79 - Game Master
-arcalane - 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 - Game Master
-spaceman96 - Retired Admin
-strumpetplaya - Retired Admin
-tastyfish - Retired Admin
-uristqwerty - Game Master
-wrongnumber - Game Admin
+kreastr - Game Master
\ No newline at end of file

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 03/10] 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)

From bd6a7ec86b565b421110b531e68d586474ff796a Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Wed, 7 Nov 2012 11:13:27 +0200
Subject: [PATCH 04/10] Merge fixes part2

---
 code/defines/obj.dm | 49 ---------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index e22e1b66c20..739354707bb 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -1,52 +1,3 @@
-//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"

From 2a80909a9474c5caca870925fe98b1411ea015d3 Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Wed, 7 Nov 2012 11:16:28 +0200
Subject: [PATCH 05/10] Making it work

---
 code/modules/mob/mob_movement.dm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index c4098840dc4..3ab47d7afa6 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -291,15 +291,10 @@
 			if("walk")
 				move_delay += 7+config.walk_speed
 
-		if (mob.movement_delay() != mob.lastmovementdelay)
-			mob.lastmovementdelay = mob.movement_delay()
+		if (move_delay != mob.lastmovementdelay)
+			mob.lastmovementdelay = move_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
 
 		if(config.Tickcomp)
 			move_delay -= 1.3

From cf01509f8eed0cba6e0e8dc36d5badd445b9436e Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Wed, 7 Nov 2012 11:23:45 +0200
Subject: [PATCH 06/10] Split speed from actual delay time

---
 code/modules/mob/mob_movement.dm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 3ab47d7afa6..68b893bd0eb 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -282,17 +282,19 @@
 					return 0
 
 		move_delay = world.time//set move delay
-
+		var/mdelay = 0
 		switch(mob.m_intent)
 			if("run")
 				if(mob.drowsyness > 0)
-					move_delay += 6
-				move_delay += 1+config.run_speed
+					mdelay += 6
+				mdelay += 1+config.run_speed
 			if("walk")
-				move_delay += 7+config.walk_speed
+				mdelay += 7+config.walk_speed
 
-		if (move_delay != mob.lastmovementdelay)
-			mob.lastmovementdelay = move_delay
+		move_delay += mdelay
+
+		if (mdelay != mob.lastmovementdelay)
+			mob.lastmovementdelay = mdelay
 			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]"
 

From 484351a200c639d7c8143ca67d7ac1df16b1f363 Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Wed, 7 Nov 2012 11:51:44 +0200
Subject: [PATCH 07/10] Adapting glide size formula

---
 code/modules/mob/mob_movement.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 68b893bd0eb..66f8b862933 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -287,7 +287,7 @@
 			if("run")
 				if(mob.drowsyness > 0)
 					mdelay += 6
-				mdelay += 1+config.run_speed
+				mdelay += 2+config.run_speed
 			if("walk")
 				mdelay += 7+config.walk_speed
 
@@ -295,7 +295,7 @@
 
 		if (mdelay != mob.lastmovementdelay)
 			mob.lastmovementdelay = mdelay
-			mob.glide_size = 40/mob.lastmovementdelay //Slightly faster than tile (32 pixels) per second assuming 10 FPS.
+			mob.glide_size = 40*(world.tick_lag)/mob.lastmovementdelay
 			src << "Debug: Your new glide speed is [mob.glide_size]"
 
 		if(config.Tickcomp)

From 2e8b305ac3c2d3b85d0e4dd7f82dcc446f0eea02 Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Wed, 7 Nov 2012 13:13:45 +0200
Subject: [PATCH 08/10] Now gliding_size for pulled objects and mobs is also
 changed.

---
 code/modules/mob/mob_movement.dm | 33 ++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 66f8b862933..624b5804408 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -291,20 +291,20 @@
 			if("walk")
 				mdelay += 7+config.walk_speed
 
+		if(config.Tickcomp)
+			mdelay -= 1.3
+			var/tickcomp = ((1/(world.tick_lag))*1.3)
+			mdelay += tickcomp
+
 		move_delay += mdelay
 
-		if (mdelay != mob.lastmovementdelay)
-			mob.lastmovementdelay = mdelay
-			mob.glide_size = 40*(world.tick_lag)/mob.lastmovementdelay
-			src << "Debug: Your new glide speed is [mob.glide_size]"
-
-		if(config.Tickcomp)
-			move_delay -= 1.3
-			var/tickcomp = ((1/(world.tick_lag))*1.3)
-			move_delay = move_delay + tickcomp
-
-
-
+		mob.UpdateGlide(mdelay)
+		if (mob.pulling)
+			if (istype(mob.pulling,/mob))
+				var/mob/M = mob.pulling
+				M.UpdateGlide(mdelay)
+			else
+				mob.pulling.glide_size = mob.glide_size
 
 		//We are now going to move
 		moving = 1
@@ -326,6 +326,7 @@
 								else
 									diag = null
 								if ((get_dist(mob, M) > 1 || diag))
+									M.UpdateGlide(mdelay)
 									step(M, get_dir(M.loc, T))
 				else
 					for(var/mob/M in L)
@@ -334,6 +335,7 @@
 							M.animate_movement = 3
 					for(var/mob/M in L)
 						spawn( 0 )
+							M.UpdateGlide(mdelay)
 							step(M, direct)
 							return
 						spawn( 1 )
@@ -512,3 +514,10 @@
 
 	prob_slip = round(prob_slip)
 	return(prob_slip)
+
+//Updates Glide_size of mob according to its speed.
+/mob/proc/UpdateGlide(var/mdelay = 2)
+	if (mdelay != lastmovementdelay)
+		lastmovementdelay = mdelay
+		glide_size = 32*(world.tick_lag)/lastmovementdelay
+		src << "Debug: Your new glide speed is [glide_size]"
\ No newline at end of file

From 41846c57bfed8ba971ceb17447560e1937fc8212 Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Sun, 11 Nov 2012 14:36:23 +0200
Subject: [PATCH 09/10] Preparations for pull request.

---
 config/admins.txt | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/config/admins.txt b/config/admins.txt
index f052934eda5..c2b5bf032eb 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -1 +1,27 @@
-kreastr - Game Master
+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

From 0fe02fcd27604f6321c4a8b8d985e2a434f3d1c0 Mon Sep 17 00:00:00 2001
From: Kreastr <kreastr@gmail.com>
Date: Sun, 11 Nov 2012 14:39:22 +0200
Subject: [PATCH 10/10] More clean up

---
 code/modules/mob/mob_movement.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 624b5804408..887ae13e271 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -520,4 +520,4 @@
 	if (mdelay != lastmovementdelay)
 		lastmovementdelay = mdelay
 		glide_size = 32*(world.tick_lag)/lastmovementdelay
-		src << "Debug: Your new glide speed is [glide_size]"
\ No newline at end of file
+		//src << "Debug: Your new glide speed is [glide_size]"
\ No newline at end of file