mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
c4921dfdf7
Gives Cough/Sneeze/Gasp back default sounds if they lack one in their species list. Fixes death sound doubling up. Fixes runtime in sounds - it will now simply return null rather than trying to index the list and failing.
28 lines
1002 B
Plaintext
28 lines
1002 B
Plaintext
/decl/emote/audible/wheeze
|
|
emote_sound = 'modular_chomp/sound/voice/wheeze.ogg'
|
|
|
|
/decl/emote/audible/prbt2
|
|
key = "prbt2"
|
|
emote_message_1p = "You prbt."
|
|
emote_message_3p = "prbts."
|
|
emote_message_1p_target = "You prbt at TARGET."
|
|
emote_message_3p_target = "prbts at TARGET."
|
|
emote_sound = 'sound/voice/prbt2.ogg'
|
|
|
|
/decl/emote/audible/gasp/get_emote_sound(var/atom/user)
|
|
..()
|
|
var/mob/living/carbon/human/H = user
|
|
// CHOMPEdit: Standardize Species Sounds Getters
|
|
var/vol = H.species.gasp_volume
|
|
var/s = get_species_sound(get_gendered_sound(H))["gasp"]
|
|
if(!s && !(get_species_sound(H.species.species_sounds) == "None")) // Failsafe, so we always use the default gasp/etc sounds. None will cancel out anyways.
|
|
if(H.identifying_gender == FEMALE)
|
|
s = get_species_sound("Human Female")["gasp"]
|
|
else // Update this if we ever get herm/etc sounds.
|
|
s = get_species_sound("Human Male")["gasp"]
|
|
return list(
|
|
"sound" = s,
|
|
"vol" = vol,
|
|
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
|
|
)
|