Merge pull request #6001 from Rykka-Stormheart/shep-dev-spec-fix-2

Species Sounds Hotfix 2
This commit is contained in:
Razgriz
2023-04-01 18:59:39 -07:00
committed by GitHub
6 changed files with 26 additions and 5 deletions

View File

@@ -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
)