diff --git a/code/modules/admin/player_effects.dm b/code/modules/admin/player_effects.dm index e4c0801167..9425a16fce 100644 --- a/code/modules/admin/player_effects.dm +++ b/code/modules/admin/player_effects.dm @@ -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 diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index e0caa7ac7b..1b0de586af 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -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) diff --git a/modular_chomp/code/modules/emotes/definitions/audiable.dm b/modular_chomp/code/modules/emotes/definitions/audiable.dm index b022cec147..41b2df5cab 100644 --- a/modular_chomp/code/modules/emotes/definitions/audiable.dm +++ b/modular_chomp/code/modules/emotes/definitions/audiable.dm @@ -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"