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

don't assume it's a human (#9091)

Browse Source
This commit is contained in:
Kashargul
2024-09-29 12:46:49 +02:00
committed by GitHub
parent f0905c72fd
commit d7759055ff
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/player_effects.dm
View File

@@ -1,7 +1,7 @@
/client/proc/player_effects(var/mob/target in mob_list)
set name = "Player Effects"
set desc = "Modify a player character with various 'special treatments' from a list."
set category = "Fun"
set category = "Fun.Event Kit" //CHOMPEdit
if(!check_rights(R_FUN))
return

2
code/modules/client/client procs.dm
View File

@@ -529,7 +529,7 @@
/client/verb/game_options()
set name = "Game Options"
set category = "Preferences"
set category = "Preferences.Game" //CHOMPEdit
if(prefs)
prefs.tgui_interact(usr)

29
modular_chomp/code/modules/emotes/definitions/audiable.dm
View File

@@ -11,20 +11,21 @@
/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
)
if(ishuman(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
)
/decl/emote/audible/mgeow
key = "mgeow"