Skip to content

Commit

Permalink
yes (#22834)
Browse files Browse the repository at this point in the history
  • Loading branch information
warface1234455 authored Dec 9, 2024
1 parent d04c9f6 commit a177f24
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions code/modules/mob/living/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit a177f24

Please sign in to comment.