diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index 4a16b81edc..f109255b94 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -88,6 +88,10 @@ /decl/emote/audible/clap key = "clap" emote_message_3p = "claps." + emote_sound = list('sound/misc/clap1.ogg', //ChompEDIT START + 'sound/misc/clap2.ogg', + 'sound/misc/clap3.ogg', + 'sound/misc/clap4.ogg') //ChompEDIT END /decl/emote/audible/chuckle key = "chuckle" diff --git a/code/modules/emotes/definitions/audible_scream_ch.dm b/code/modules/emotes/definitions/audible_scream_ch.dm index 91b3fbf85f..9b3136a43b 100644 --- a/code/modules/emotes/definitions/audible_scream_ch.dm +++ b/code/modules/emotes/definitions/audible_scream_ch.dm @@ -31,3 +31,8 @@ "volchannel" = VOLUME_CHANNEL_SPECIES_SOUNDS ) */ + +/decl/emote/audible/malehumanscream + key = "malehumanscream" + emote_message_3p = "screams!" + emote_sound = 'sound/voice/malescream_2.ogg' diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index cb16a2d1d5..cb8a708c6e 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -183,7 +183,8 @@ var/list/_human_default_emotes = list( /decl/emote/audible/xenohiss, /decl/emote/audible/xenopurr, /decl/emote/audible/gwah, - /decl/emote/audible/wawa + /decl/emote/audible/wawa, + /decl/emote/audible/malehumanscream //CHOMP Add end ) diff --git a/sound/misc/clap1.ogg b/sound/misc/clap1.ogg new file mode 100644 index 0000000000..da0f7eded7 Binary files /dev/null and b/sound/misc/clap1.ogg differ diff --git a/sound/misc/clap2.ogg b/sound/misc/clap2.ogg new file mode 100644 index 0000000000..72e26d4a24 Binary files /dev/null and b/sound/misc/clap2.ogg differ diff --git a/sound/misc/clap3.ogg b/sound/misc/clap3.ogg new file mode 100644 index 0000000000..7a72ab9bf3 Binary files /dev/null and b/sound/misc/clap3.ogg differ diff --git a/sound/misc/clap4.ogg b/sound/misc/clap4.ogg new file mode 100644 index 0000000000..cdc533ca77 Binary files /dev/null and b/sound/misc/clap4.ogg differ diff --git a/sound/voice/malescream_2.ogg b/sound/voice/malescream_2.ogg new file mode 100644 index 0000000000..989b612ab1 Binary files /dev/null and b/sound/voice/malescream_2.ogg differ