Merge pull request #4975 from Citadel-Station-13/upstream-merge-34654

[MIRROR] Actually fixes wag emote runtime
2018-01-21 11:49:13 -06:00
parent 7a43017325 d1f9a1d004
commit 9840a18b5a
1 changed files with 2 additions and 0 deletions
@@ -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()