Merge pull request #34654 from ShizCalev/tailwag-fix

Actually fixes wag emote runtime
2018-01-20 15:09:35 -05:00
parent 7ec2a4230d
commit b2d7044eb9
1 changed files with 2 additions and 0 deletions
--- 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()