From b2d7044eb956f579b375149a1ecc94c2a9aefe17 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 20 Jan 2018 15:09:35 -0500
Subject: [PATCH] Merge pull request #34654 from ShizCalev/tailwag-fix

Actually fixes wag emote runtime
---
 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 35aecbf6cb..5b756fd3d5 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -74,6 +74,8 @@
 
 /datum/emote/living/carbon/human/wag/run_emote(mob/user, params)
 	. = ..()
+	if(!.)
+		return
 	var/mob/living/carbon/human/H = user
 	if(!H.is_wagging_tail())
 		H.startTailWag()