From ac91d9e37b5735ce1eeed883d6814ad5860074aa Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Sun, 22 May 2016 17:00:13 -0400 Subject: [PATCH] Fixes Flipping Runtime --- code/modules/mob/living/carbon/human/emote.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index eca554dcb0c..10dc8c41a1f 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -317,7 +317,9 @@ if(lying || weakened) message = "[src] flops and flails around on the floor." else - var/obj/item/weapon/grab/G = get_active_hand() + var/obj/item/weapon/grab/G + if(istype(get_active_hand(), /obj/item/weapon/grab)) + G = get_active_hand() if(G && G.affecting) var/turf/oldloc = loc var/turf/newloc = G.affecting.loc