From 15e5acd279740ceaaf47639e74024a69afd0e5cb Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Tue, 24 May 2016 06:06:19 -0400
Subject: [PATCH] Fixes Buckled Flipping

---
 code/modules/mob/living/carbon/human/emote.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 10dc8c41a1f..b1d7e356b39 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -321,6 +321,8 @@
 						if(istype(get_active_hand(), /obj/item/weapon/grab))
 							G = get_active_hand()
 						if(G && G.affecting)
+							if(buckled || G.affecting.buckled)
+								return
 							var/turf/oldloc = loc
 							var/turf/newloc = G.affecting.loc
 							if(isturf(oldloc) && isturf(newloc))