diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 85ba39ad7c19..fd887392903e 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -173,6 +173,25 @@ emote_type = EMOTE_AUDIBLE stat_allowed = UNCONSCIOUS +/datum/emote/living/gasp/get_sound(mob/living/user) + if(!ishuman(user)) + return + var/mob/living/carbon/human/human_user = user + if(ishumanbasic(human_user) || iscatperson(human_user) && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING)) + if(human_user.gender == FEMALE) + return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg') + else + return pick('sound/voice/human/gasp_male1.ogg', 'sound/voice/human/gasp_male2.ogg') + +/datum/emote/living/gasp/gasp_shock + key = "gaspshock" + key_third_person = "gaspsshock" + message = "gasps in shock!" + message_mime = "gasps in silent shock!" + cooldown = 2 SECONDS + emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE + stat_allowed = SOFT_CRIT + /datum/emote/living/giggle key = "giggle" key_third_person = "giggles" @@ -474,25 +493,6 @@ message = "yawns." emote_type = EMOTE_AUDIBLE -/datum/emote/living/gasp_shock - key = "gaspshock" - key_third_person = "gaspsshock" - message = "gasps in shock!" - message_mime = "gasps in silent shock!" - cooldown = 2 SECONDS - emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE - stat_allowed = SOFT_CRIT - -/datum/emote/living/gasp_shock/get_sound(mob/living/user) - if(!ishuman(user)) - return - var/mob/living/carbon/human/human_user = user - if(ishumanbasic(human_user) || iscatperson(human_user) && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING)) - if(human_user.gender == FEMALE) - return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg') - else - return pick('sound/voice/human/gasp_male1.ogg', 'sound/voice/human/gasp_male2.ogg') - /datum/emote/living/custom key = "me" key_third_person = "custom"