cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Species Sounds Hotfix 2
This commit is contained in:
Razgriz
2023-04-01 18:59:39 -07:00
committed by GitHub
parent 566f0856f3 c4921dfdf7
commit ee54791e47
6 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/emotes/definitions/audible_cough.dm
View File

@@ -19,8 +19,14 @@
if(ishuman(user) && !check_synthetic(user))
var/mob/living/carbon/human/H = user
var/vol = H.species.cough_volume
var/s = get_species_sound(get_gendered_sound(H))["cough"]
if(!s && !(get_species_sound(H.species.species_sounds) == "None")) // Failsafe, so we always use the default cough/etc sounds. None will cancel out anyways.
if(H.identifying_gender == FEMALE)
s = get_species_sound("Human Female")["cough"]
else // Update this if we ever get herm/etc sounds.
s = get_species_sound("Human Male")["cough"]
return list(
"sound" = get_species_sound(get_gendered_sound(H))["cough"],
"sound" = s,
"vol" = vol,
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS
)

8
code/modules/emotes/definitions/audible_sneeze.dm
View File

@@ -12,8 +12,14 @@
var/mob/living/carbon/human/H = user
// CHOMPEdit Start: Standardize Species Sounds
var/vol = H.species.sneeze_volume
var/s = get_species_sound(get_gendered_sound(H))["sneeze"]
if(!s && !(get_species_sound(H.species.species_sounds) == "None")) // Failsafe, so we always use the default sneeze/etc sounds. None will cancel out anyways.
if(H.identifying_gender == FEMALE)
s = get_species_sound("Human Female")["sneeze"]
else // Update this if we ever get herm/etc sounds.
s = get_species_sound("Human Male")["sneeze"]
return list(
"sound" = get_species_sound(get_gendered_sound(H))["sneeze"],
"sound" = s,
"vol" = vol,
"exr" = 20,
"volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS