From c1623792c9d2ad59c6bae6b1f07f7346aeaafb52 Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Wed, 3 Jan 2018 11:35:38 -0200
Subject: [PATCH] Merge pull request #34033 from
 AutomaticFrenzy/patch/mime-laugh

Fix mimes being able to laugh audibly
---
 code/modules/mob/living/emote.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 9f541aaf67..10a5b3cd87 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -218,6 +218,7 @@
 	key = "laugh"
 	key_third_person = "laughs"
 	message = "laughs."
+	message_mime = "laughs silently!"
 	emote_type = EMOTE_AUDIBLE
 
 /datum/emote/living/laugh/can_run_emote(mob/living/user, status_check = TRUE)
@@ -230,7 +231,7 @@
 	. = ..()
 	if(. && ishuman(user))
 		var/mob/living/carbon/human/H = user
-		if(H.dna.species.id == "human")
+		if(H.dna.species.id == "human" && (!H.mind || !H.mind.miming))
 			if(user.gender == FEMALE)
 				playsound(H, 'sound/voice/human/womanlaugh.ogg', 50, 1)
 			else