Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allows normal gasp emote to have sound too #22834

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Allows normal gasp emote to have sound too #22834

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions code/modules/mob/living/emote.dm
View file
Open in desktop
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
Loading