diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm
index 36e1a4ca48..393eaab1d4 100644
--- a/code/modules/mob/animations.dm
+++ b/code/modules/mob/animations.dm
@@ -210,6 +210,8 @@
 /mob/proc/spin(spintime, speed)
 	if(!speed || speed < 1)		// Do NOT spin with infinite speed, it will break the reality
 		return
+	if(istype(buckled,/obj/structure/bed/chair/office)) // WEEEE!!!
+		playsound(src, 'sound/effects/roll.ogg', 100, 1)
 	spawn()
 		var/D = dir
 		while(spintime >= speed)
@@ -224,5 +226,9 @@
 				if(WEST)
 					D = NORTH
 			set_dir(D)
+			if(istype(buckled,/obj/structure/bed/chair/office))
+				var/obj/structure/bed/chair/office/O = buckled
+				O.dir = D
+				O.set_dir(D)
 			spintime -= speed
 	return