diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index e741c385e3..f961b8df3c 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -68,8 +68,14 @@ character.offset_override = pref.offset_override //CHOMPEdit character.voice_freq = pref.voice_freq character.resize(pref.size_multiplier, animate = FALSE, ignore_prefs = TRUE) + + //CHOMPEDIT Global voice lookup if(!pref.voice_sound) character.voice_sounds_list = talk_sound + else + character.voice_sounds_list = get_talk_sound(pref.voice_sound) + /*if(!pref.voice_sound) + character.voice_sounds_list = talk_sound else switch(pref.voice_sound) if("beep-boop") @@ -100,6 +106,7 @@ character.voice_sounds_list = goon_speak_roach_sound if("goon speak skelly") character.voice_sounds_list = goon_speak_skelly_sound + */ //CHOMPEDIT Global voice lookup character.custom_speech_bubble = pref.custom_speech_bubble /datum/category_item/player_setup_item/vore/size/content(var/mob/user) diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm index e4b639533c..b6cb182039 100644 --- a/code/modules/mob/living/living_vr.dm +++ b/code/modules/mob/living/living_vr.dm @@ -58,7 +58,8 @@ set desc = "Sets your voice style!" set category = "OOC" - var/list/possible_voice_types = list( + //CHOMPEDIT START, Global Talk Sounds + var/list/possible_voice_types = talk_sounds/*list( "beep-boop", "goon speak 1", "goon speak 2", @@ -73,6 +74,7 @@ "goon speak pugg", "goon speak roach", "goon speak skelly") + */ //CHOMPEDIT END, Global Talk Sounds 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(!choice) voice_sounds_list = talk_sound diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index e68d333cec..55a0f5700f 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -35,6 +35,8 @@ if(!voice_sounds_list.len || !voice_sounds_list) if(client.prefs.voice_sound) var/prefsound = client.prefs.voice_sound + voice_sounds_list = get_talk_sound(prefsound) //CHOMEPEDIT GLobal voice getter + /* CHOMPRemval, redundant voice selector switch(prefsound) if("beep-boop") voice_sounds_list = talk_sound @@ -64,6 +66,7 @@ voice_sounds_list = goon_speak_roach_sound if("goon speak skelly") voice_sounds_list = goon_speak_skelly_sound + */ //CHOMPRemval, redundant voice selector else voice_sounds_list = talk_sound //VOREStation Add End diff --git a/modular_chomp/code/global.dm b/modular_chomp/code/global.dm index 3131ce21ff..5bc5615a06 100644 --- a/modular_chomp/code/global.dm +++ b/modular_chomp/code/global.dm @@ -4,3 +4,29 @@ var/list/shell_module_blacklist = list( ) var/list/latejoin_gatewaystation = list() var/list/latejoin_plainspath = list() + +var/list/talk_sounds = list() + +var/list/talk_sound_map = list( + "beep-boop" = talk_sound, + "goon speak 1" = goon_speak_one_sound, + "goon speak 2" = goon_speak_two_sound, + "goon speak 3"=goon_speak_three_sound, + "goon speak 4"=goon_speak_four_sound, + "goon speak blub"=goon_speak_blub_sound, + "goon speak bottalk"=goon_speak_bottalk_sound, + "goon speak buwoo"=goon_speak_buwoo_sound, + "goon speak cow"=goon_speak_cow_sound, + "goon speak lizard"=goon_speak_lizard_sound, + "goon speak pug"=goon_speak_pug_sound, + "goon speak pugg"=goon_speak_pugg_sound, + "goon speak roach"=goon_speak_roach_sound, + "goon speak skelly"=goon_speak_skelly_sound,) + +/hook/startup/proc/Init_talk_sounds() + for(var/i in talk_sound_map) + talk_sounds |= talk_sound_map[i] //Thank you BM absolute legend + return 1 + +proc/get_talk_sound(var/voice_sound) + return talk_sound_map[voice_sound] diff --git a/modular_chomp/code/modules/client/preferences.dm b/modular_chomp/code/modules/client/preferences.dm index 135250340b..24b0e35cf9 100644 --- a/modular_chomp/code/modules/client/preferences.dm +++ b/modular_chomp/code/modules/client/preferences.dm @@ -244,6 +244,7 @@ if(!voice_sound) character.voice_sounds_list = talk_sound else + /* CHOMPREMOVAL, redundant list switch(voice_sound) if("beep-boop") character.voice_sounds_list = talk_sound @@ -273,6 +274,8 @@ character.voice_sounds_list = goon_speak_roach_sound if("goon speak skelly") character.voice_sounds_list = goon_speak_skelly_sound + */ //CHOMPREMOVAL, redundant list + character.voice_sounds_list = get_talk_sound(voice_sound) character.species?.blood_color = blood_color