Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit a177f24

Browse files
yes (#22834)
1 parent d04c9f6 commit a177f24

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

code/modules/mob/living/emote.dm

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,25 @@
173173
emote_type = EMOTE_AUDIBLE
174174
stat_allowed = UNCONSCIOUS
175175

176+
/datum/emote/living/gasp/get_sound(mob/living/user)
177+
if(!ishuman(user))
178+
return
179+
var/mob/living/carbon/human/human_user = user
180+
if(ishumanbasic(human_user) || iscatperson(human_user) && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING))
181+
if(human_user.gender == FEMALE)
182+
return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg')
183+
else
184+
return pick('sound/voice/human/gasp_male1.ogg', 'sound/voice/human/gasp_male2.ogg')
185+
186+
/datum/emote/living/gasp/gasp_shock
187+
key = "gaspshock"
188+
key_third_person = "gaspsshock"
189+
message = "gasps in shock!"
190+
message_mime = "gasps in silent shock!"
191+
cooldown = 2 SECONDS
192+
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
193+
stat_allowed = SOFT_CRIT
194+
176195
/datum/emote/living/giggle
177196
key = "giggle"
178197
key_third_person = "giggles"
@@ -474,25 +493,6 @@
474493
message = "yawns."
475494
emote_type = EMOTE_AUDIBLE
476495

477-
/datum/emote/living/gasp_shock
478-
key = "gaspshock"
479-
key_third_person = "gaspsshock"
480-
message = "gasps in shock!"
481-
message_mime = "gasps in silent shock!"
482-
cooldown = 2 SECONDS
483-
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
484-
stat_allowed = SOFT_CRIT
485-
486-
/datum/emote/living/gasp_shock/get_sound(mob/living/user)
487-
if(!ishuman(user))
488-
return
489-
var/mob/living/carbon/human/human_user = user
490-
if(ishumanbasic(human_user) || iscatperson(human_user) && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING))
491-
if(human_user.gender == FEMALE)
492-
return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg')
493-
else
494-
return pick('sound/voice/human/gasp_male1.ogg', 'sound/voice/human/gasp_male2.ogg')
495-
496496
/datum/emote/living/custom
497497
key = "me"
498498
key_third_person = "custom"

0 commit comments

Comments
 (0)