mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Species Sounds Hotfix 2
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.
This commit is contained in:
@@ -14,8 +14,14 @@
|
||||
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" = get_species_sound(get_gendered_sound(H))["gasp"],
|
||||
"sound" = s,
|
||||
"vol" = vol,
|
||||
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user