From d4de91ce15e200e70999bdceeac8db2c9e71d1a2 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sat, 28 Mar 2015 23:17:00 -0400
Subject: [PATCH] You Spin Me Right Round

---
 code/game/atoms_movable.dm        | 3 ++-
 code/modules/mob/living/living.dm | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 5fe1ed9faba..3cc9da2c0d8 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -141,6 +141,7 @@
 				var/mob/living/M = src
 				M.turf_collision(T, speed)
 
+	SpinAnimation(0, 0)
 //decided whether a movable atom being thrown can pass through the turf it is in.
 /atom/movable/proc/hit_check(var/speed)
 	if(src.throwing)
@@ -163,7 +164,7 @@
 	src.throw_source = get_turf(src)	//store the origin turf
 
 	if(!no_spin)
-		SpinAnimation(5, 1)
+		SpinAnimation(5, -1)
 	var/dist_x = abs(target.x - src.x)
 	var/dist_y = abs(target.y - src.y)
 
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 135f3f0e85c..2103200edfe 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -764,6 +764,8 @@
 	float(!has_gravity)
 
 /mob/living/proc/float(on)
+	if(throwing)
+		return
 	if(on && !floating)
 		animate(src, pixel_y = 2, time = 10, loop = -1)
 		floating = 1