Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033

[MIRROR] Fix mimes being able to laugh audibly
This commit is contained in:
deathride58
2018-01-03 18:54:12 +00:00
committed by GitHub
+2 -1
View File
@@ -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