diff --git a/code/game/sound.dm b/code/game/sound.dm index 7e43adb093..b7b6e859fd 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -318,6 +318,9 @@ var/list/wf_speak_lure_sound = list ('sound/talksounds/wf/lure_1.ogg', 'sound/ta var/list/wf_speak_lyst_sound = list ('sound/talksounds/wf/lyst_1.ogg', 'sound/talksounds/wf/lyst_2.ogg', 'sound/talksounds/wf/lyst_3.ogg', 'sound/talksounds/wf/lyst_4.ogg', 'sound/talksounds/wf/lyst_5.ogg', 'sound/talksounds/wf/lyst_6.ogg') var/list/wf_speak_void_sound = list ('sound/talksounds/wf/void_1.ogg', 'sound/talksounds/wf/void_2.ogg', 'sound/talksounds/wf/void_3.ogg') var/list/wf_speak_vomva_sound = list ('sound/talksounds/wf/vomva_1.ogg', 'sound/talksounds/wf/vomva_2.ogg', 'sound/talksounds/wf/vomva_3.ogg', 'sound/talksounds/wf/vomva_4.ogg') +//CHOMPedit start: More sounds. +var/list/xeno_speak_sound = list('modular_chomp/sound/talksounds/xeno/xenotalk.ogg', 'modular_chomp/sound/talksounds/xeno/xenotalk2.ogg', 'modular_chomp/sound/talksounds/xeno/xenotalk3.ogg') +//CHOMPedit end. // CHOMPEdit Start: Species sounds. This is probably inefficient, but I'm sure someone will yell at me or just do it better later:tm: diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index c047003b50..b86a8e5cb7 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -229,7 +229,8 @@ "goon speak pug", "goon speak pugg", "goon speak roach", - "goon speak skelly") + "goon speak skelly", + "xeno speak") // CHOMPedit var/choice = tgui_input_list(usr, "Which set of sounds would you like to use for your character's speech sounds?", "Voice Sounds", possible_voice_types) if(!pref.voice_sound) pref.voice_sound = "goon speak 1" //CHOMPEdit - Defaults voice to a less jarring sound @@ -277,6 +278,10 @@ S = sound(pick(goon_speak_roach_sound)) if("goon speak skelly") S = sound(pick(goon_speak_skelly_sound)) +//CHOMPedit start. + if("xeno speak") + S = sound(pick(xeno_speak_sound)) +//CHOMPedit end. if(S) S.frequency = pick(pref.voice_freq) S.volume = 50 diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index c5e4f32aef..9ff5d73769 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -178,7 +178,10 @@ var/list/_human_default_emotes = list( /decl/emote/audible/prbt2, /decl/emote/audible/pain, /decl/emote/audible/mgeow, - /decl/emote/visible/flip/slip + /decl/emote/visible/flip/slip, + /decl/emote/audible/xenogrowl, + /decl/emote/audible/xenohiss, + /decl/emote/audible/xenopurr //CHOMP Add end ) @@ -324,7 +327,10 @@ var/list/_simple_mob_default_emotes = list( //CHOMP Add start /decl/emote/audible/prbt2, /decl/emote/audible/pain, - /decl/emote/audible/mgeow + /decl/emote/audible/mgeow, + /decl/emote/audible/xenogrowl, + /decl/emote/audible/xenohiss, + /decl/emote/audible/xenopurr //CHOMP Add end ) //VOREStation Add End diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm index 4cc196dbb7..8db176f604 100644 --- a/code/modules/mob/living/living_vr.dm +++ b/code/modules/mob/living/living_vr.dm @@ -184,3 +184,7 @@ voice_sounds_list = goon_speak_roach_sound if("goon speak skelly") voice_sounds_list = goon_speak_skelly_sound +//CHOMPedit start. + if("xeno speak") + voice_sounds_list = xeno_speak_sound +//CHOMPedit end. \ No newline at end of file diff --git a/modular_chomp/code/global.dm b/modular_chomp/code/global.dm index f8c47a1291..288ccc10df 100644 --- a/modular_chomp/code/global.dm +++ b/modular_chomp/code/global.dm @@ -20,7 +20,8 @@ var/list/talk_sound_map = rlist( "goon speak pug", "goon speak pugg", "goon speak roach", - "goon speak skelly" + "goon speak skelly", + "xeno speak" // CHOMPedit ), list( talk_sound, @@ -36,7 +37,8 @@ var/list/talk_sound_map = rlist( goon_speak_pug_sound, goon_speak_pugg_sound, goon_speak_roach_sound, - goon_speak_skelly_sound + goon_speak_skelly_sound, + xeno_speak_sound // CHOMPedit ) ) diff --git a/modular_chomp/code/modules/emotes/definitions/audiable.dm b/modular_chomp/code/modules/emotes/definitions/audiable.dm index 127c25b877..272cf50cd5 100644 --- a/modular_chomp/code/modules/emotes/definitions/audiable.dm +++ b/modular_chomp/code/modules/emotes/definitions/audiable.dm @@ -32,4 +32,28 @@ emote_message_3p = "mgeows." emote_message_1p_target = "You mgeow at TARGET." emote_message_3p_target = "mgeow at TARGET." - emote_sound = 'modular_chomp/sound/voice/mgeow.ogg' \ No newline at end of file + emote_sound = 'modular_chomp/sound/voice/mgeow.ogg' + +/decl/emote/audible/xenogrowl + key = "xenogrowl" + emote_message_1p = "You growl unnervingly." + emote_message_3p = "growls unnervingly." + emote_message_1p_target = "You growl unnervingly at TARGET." + emote_message_3p_target = "growls unnervingly at TARGET." + emote_sound = 'modular_chomp/sound/voice/emotes/xenogrowl.ogg' + +/decl/emote/audible/xenohiss + key = "xenohiss" + emote_message_1p = "You hiss unnervingly." + emote_message_3p = "hisses unnervingly." + emote_message_1p_target = "You hiss unnervingly at TARGET." + emote_message_3p_target = "hisses unnervingly at TARGET." + emote_sound = 'modular_chomp/sound/voice/emotes/xenohiss.ogg' + +/decl/emote/audible/xenopurr + key = "xenopurr" + emote_message_1p = "You purr unnervingly." + emote_message_3p = "purrs unnervingly." + emote_message_1p_target = "You purr unnervingly at TARGET." + emote_message_3p_target = "purrs unnervingly at TARGET." + emote_sound = 'modular_chomp/sound/voice/emotes/xenopurr.ogg' \ No newline at end of file diff --git a/modular_chomp/sound/talksounds/xeno/xenotalk.ogg b/modular_chomp/sound/talksounds/xeno/xenotalk.ogg new file mode 100644 index 0000000000..761348cb3b Binary files /dev/null and b/modular_chomp/sound/talksounds/xeno/xenotalk.ogg differ diff --git a/modular_chomp/sound/talksounds/xeno/xenotalk2.ogg b/modular_chomp/sound/talksounds/xeno/xenotalk2.ogg new file mode 100644 index 0000000000..c58b29abae Binary files /dev/null and b/modular_chomp/sound/talksounds/xeno/xenotalk2.ogg differ diff --git a/modular_chomp/sound/talksounds/xeno/xenotalk3.ogg b/modular_chomp/sound/talksounds/xeno/xenotalk3.ogg new file mode 100644 index 0000000000..cb348a4878 Binary files /dev/null and b/modular_chomp/sound/talksounds/xeno/xenotalk3.ogg differ diff --git a/modular_chomp/sound/voice/emotes/xenogrowl.ogg b/modular_chomp/sound/voice/emotes/xenogrowl.ogg new file mode 100644 index 0000000000..a6b820bf1f Binary files /dev/null and b/modular_chomp/sound/voice/emotes/xenogrowl.ogg differ diff --git a/modular_chomp/sound/voice/emotes/xenohiss.ogg b/modular_chomp/sound/voice/emotes/xenohiss.ogg new file mode 100644 index 0000000000..ea6a0a960c Binary files /dev/null and b/modular_chomp/sound/voice/emotes/xenohiss.ogg differ diff --git a/modular_chomp/sound/voice/emotes/xenopurr.ogg b/modular_chomp/sound/voice/emotes/xenopurr.ogg new file mode 100644 index 0000000000..2231494c40 Binary files /dev/null and b/modular_chomp/sound/voice/emotes/xenopurr.ogg differ