diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index bff1637e47..5659a20f5b 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -14,8 +14,8 @@ var/weight_gain = 100 // Weight gain rate. var/weight_loss = 50 // Weight loss rate. var/fuzzy = 0 // Preference toggle for sharp/fuzzy icon. Default sharp. - var/voice_freq = 0 - var/voice_sound = "beep-boop" + var/voice_freq = 42500 //CHOMPEdit - Why was the default 0 + var/voice_sound = "goon speak 1" //CHOMPEdit - Changed the default voice to one less jarring // Definition of the stuff for Sizing /datum/category_item/player_setup_item/vore/size @@ -97,6 +97,7 @@ . += "Scaled Appearance: [pref.fuzzy ? "Fuzzy" : "Sharp"]
" . += "Voice Frequency: [pref.voice_freq]
" . += "Voice Sounds: [pref.voice_sound]
" +// . += "Test Voice:
" Maybe later . += "
" . += "Relative Weight: [pref.weight_vr]
" . += "Weight Gain Rate: [pref.weight_gain]
" @@ -186,7 +187,11 @@ "goon speak skelly") 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) - pref.voice_sound = "beep-boop" + pref.voice_sound = "goon speak 1" else pref.voice_sound = choice + /* Maybe later + else if(href_list["voice_test"]) + SEND_SOUND(user, sound(pick(voice_sounds_list), 50, frequency = pref.voice_freq)) + */ return ..(); diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm index 4aacfe7dcb..24b7ae2ccd 100644 --- a/code/modules/client/preferences_toggle_procs.dm +++ b/code/modules/client/preferences_toggle_procs.dm @@ -407,9 +407,9 @@ feedback_add_details("admin_verb","TRadioSounds") /client/verb/toggle_say_sounds() - set name = "Sound Toggle: Say" + set name = "Toggle Voice Sounds" set category = "Preferences" - set desc = "Toggle hearing a sound when somebody speaks using say." + set desc = "Toggle hearing a sound when somebody speaks or emotes." var/pref_path = /datum/client_preference/say_sounds toggle_preference(pref_path) @@ -418,6 +418,8 @@ to_chat(src, "You will now [(is_preference_enabled(/datum/client_preference/say_sounds)) ? "hear" : "not hear"] say sounds.") feedback_add_details("admin_verb","TSaySounds") +/* +CHOMPRemove. Bundled voice sounds into emote/whisper/subtle. Going this extra length to babyproof prefs wasn't necessary and got in the way of quick whisper/say autofill. /client/verb/toggle_emote_sounds() set name = "Sound Toggle: Me" @@ -457,6 +459,7 @@ to_chat(src, "You will now [(is_preference_enabled(/datum/client_preference/subtle_sounds)) ? "hear" : "not hear"] subtle sounds.") feedback_add_details("admin_verb","TSubtleSounds") +*/ // Not attached to a pref datum because those are strict binary toggles /client/verb/toggle_examine_mode() diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index 29e8ed58e3..d1ace0f090 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -191,11 +191,13 @@ if(message) message = encode_html_emphasis(message) + /* CHOMPRemove - Not needed if you set your defaults right var/ourfreq = null if(isliving(src)) var/mob/living/L = src if(L.voice_freq > 0 ) ourfreq = L.voice_freq + */ // Hearing gasp and such every five seconds is not good emotes were not global for a reason. @@ -205,7 +207,7 @@ if(!T) return if(client) - playsound(T, pick(emote_sound), 25, TRUE, falloff = 1 , is_global = TRUE, frequency = ourfreq, ignore_walls = FALSE, preference = /datum/client_preference/emote_sounds) + playsound(T, pick(voice_sounds_list), 75, TRUE, falloff = 1 , is_global = TRUE, frequency = voice_freq, ignore_walls = FALSE, preference = /datum/client_preference/say_sounds) var/list/in_range = get_mobs_and_objs_in_view_fast(T,range,2,remote_ghosts = client ? TRUE : FALSE) var/list/m_viewers = in_range["mobs"] var/list/o_viewers = in_range["objs"] diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index da722c0aa4..09a593f14b 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -402,20 +402,22 @@ var/list/channel_to_radio_key = new C.images -= I qdel(I) + /* CHOMPEdit - Not needed if you set your defaults right var/ourfreq = null if(voice_freq > 0 ) ourfreq = voice_freq + */ //Log the message to file if(message_mode) message = "([message_mode == "headset" ? "Common" : capitalize(message_mode)]) [message]" //Adds radio keys used if available if(whispering) if(do_sound && message) - playsound(T, pick(voice_sounds_list), 25, TRUE, extrarange = -6, falloff = 1 , is_global = TRUE, frequency = ourfreq, ignore_walls = FALSE, preference = /datum/client_preference/whisper_sounds) + playsound(T, pick(voice_sounds_list), 25, TRUE, extrarange = -6, falloff = 1 , is_global = TRUE, frequency = voice_freq, ignore_walls = FALSE, preference = /datum/client_preference/say_sounds) log_whisper(message, src) else if(do_sound && message) - playsound(T, pick(voice_sounds_list), 75, TRUE, falloff = 1 , is_global = TRUE, frequency = ourfreq, ignore_walls = FALSE, preference = /datum/client_preference/say_sounds) + playsound(T, pick(voice_sounds_list), 75, TRUE, falloff = 1 , is_global = TRUE, frequency = voice_freq, ignore_walls = FALSE, preference = /datum/client_preference/say_sounds) log_say(message, src) return 1 diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 39a396b19c..a43406eb48 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -67,8 +67,9 @@ else spawn(0) M.show_message(message, 2) - if(M.is_preference_enabled(/datum/client_preference/subtle_sounds)) - M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(M.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes to subtle emotes to use mob voice instead + M << sound(pick(voice_sounds_list), volume = 25) for(var/obj/O as anything in vis_objs) spawn(0) @@ -147,14 +148,16 @@ else pb = db.pred_body to_chat(pb, "The captive mind of \the [M] thinks, \"[message]\"") //To our pred if dominated brain - if(pb.is_preference_enabled(/datum/client_preference/subtle_sounds)) - pb << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(pb.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + pb << sound(pick(voice_sounds_list), volume = 25) f = TRUE else if(M.absorbed && isbelly(M.loc)) pb = M.loc.loc to_chat(pb, "\The [M] thinks, \"[message]\"") //To our pred if absorbed - if(pb.is_preference_enabled(/datum/client_preference/subtle_sounds)) - pb << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(pb.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + pb << sound(pick(voice_sounds_list), volume = 25) f = TRUE if(pb) //We are prey, let's do the prey thing. @@ -163,15 +166,17 @@ if(istype(I, /mob/living/dominated_brain) && I != M) var/mob/living/dominated_brain/db = I to_chat(db, "The captive mind of \the [M] thinks, \"[message]\"") //To any dominated brains in the pred - if(db.is_preference_enabled(/datum/client_preference/subtle_sounds)) - db << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(db.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + db << sound(pick(voice_sounds_list), volume = 25) f = TRUE for(var/B in pb.vore_organs) for(var/mob/living/L in B) if(L.absorbed && L != M && L.ckey) to_chat(L, "\The [M] thinks, \"[message]\"") //To any absorbed people in the pred - if(L.is_preference_enabled(/datum/client_preference/subtle_sounds)) - L << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(L.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + L << sound(pick(voice_sounds_list), volume = 25) f = TRUE //Let's also check and see if there's anyone inside of us to send the message to. @@ -179,26 +184,30 @@ if(istype(I, /mob/living/dominated_brain)) var/mob/living/dominated_brain/db = I to_chat(db, "\The [M] thinks, \"[message]\"") //To any dominated brains inside us - if(db.is_preference_enabled(/datum/client_preference/subtle_sounds)) - db << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(db.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + db << sound(pick(voice_sounds_list), volume = 25) f = TRUE for(var/B in M.vore_organs) for(var/mob/living/L in B) if(L.absorbed) to_chat(L, "\The [M] thinks, \"[message]\"") //To any absorbed people inside us - if(L.is_preference_enabled(/datum/client_preference/subtle_sounds)) - L << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(L.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + L << sound(pick(voice_sounds_list), volume = 25) f = TRUE if(f) //We found someone to send the message to if(pb) to_chat(M, "You think \"[message]\"") //To us if we are the prey - if(M.is_preference_enabled(/datum/client_preference/subtle_sounds)) - M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(M.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + M << sound(pick(voice_sounds_list), volume = 25) else to_chat(M, "You think \"[message]\"") //To us if we are the pred - if(M.is_preference_enabled(/datum/client_preference/subtle_sounds)) - M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(M.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + M << sound(pick(voice_sounds_list), volume = 25) for (var/mob/G in player_list) if (istype(G, /mob/new_player)) continue @@ -243,15 +252,17 @@ else pb = db.pred_body to_chat(pb, "\The [M] [message]") //To our pred if dominated brain - if(pb.is_preference_enabled(/datum/client_preference/subtle_sounds)) - pb << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(pb.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + pb << sound(pick(voice_sounds_list), volume = 25) f = TRUE else if(M.absorbed && isbelly(M.loc)) pb = M.loc.loc to_chat(pb, "\The [M] [message]") //To our pred if absorbed - if(pb.is_preference_enabled(/datum/client_preference/subtle_sounds)) - pb << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(pb.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + pb << sound(pick(voice_sounds_list), volume = 25) f = TRUE if(pb) //We are prey, let's do the prey thing. @@ -260,15 +271,17 @@ if(istype(I, /mob/living/dominated_brain) && I != M) var/mob/living/dominated_brain/db = I to_chat(db, "\The [M] [message]") //To any dominated brains in the pred - if(db.is_preference_enabled(/datum/client_preference/subtle_sounds)) - db << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(pb.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + pb << sound(pick(voice_sounds_list), volume = 25) f = TRUE for(var/B in pb.vore_organs) for(var/mob/living/L in B) if(L.absorbed && L != M && L.ckey) to_chat(L, "\The [M] [message]") //To any absorbed people in the pred - if(L.is_preference_enabled(/datum/client_preference/subtle_sounds)) - L << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(L.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + L << sound(pick(voice_sounds_list), volume = 25) f = TRUE //Let's also check and see if there's anyone inside of us to send the message to. @@ -276,26 +289,30 @@ if(istype(I, /mob/living/dominated_brain)) var/mob/living/dominated_brain/db = I to_chat(db, "\The [M] [message]") //To any dominated brains inside us - if(db.is_preference_enabled(/datum/client_preference/subtle_sounds)) - db << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(db.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + db << sound(pick(voice_sounds_list), volume = 25) f = TRUE for(var/B in M.vore_organs) for(var/mob/living/L in B) if(L.absorbed) to_chat(L, "\The [M] [message]") //To any absorbed people inside us - if(L.is_preference_enabled(/datum/client_preference/subtle_sounds)) - L << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(L.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + L << sound(pick(voice_sounds_list), volume = 25) f = TRUE if(f) //We found someone to send the message to if(pb) to_chat(M, "\The [M] [message]") //To us if we are the prey - if(M.is_preference_enabled(/datum/client_preference/subtle_sounds)) - M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(M.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + M << sound(pick(voice_sounds_list), volume = 25) else to_chat(M, "\The [M] [message]") //To us if we are the pred - if(M.is_preference_enabled(/datum/client_preference/subtle_sounds)) - M << sound('sound/talksounds/subtle_sound.ogg', volume = 50) + if(M.is_preference_enabled(/datum/client_preference/say_sounds)) + if(voice_sounds_list) //CHOMPEdit, changes subtle emote sound to use mob voice instead + M << sound(pick(voice_sounds_list), volume = 25) for (var/mob/G in player_list) if (istype(G, /mob/new_player)) continue diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index a4bd70c186..f54f0b87c8 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -30,8 +30,8 @@ var/absorbing_prey = 0 // Determines if the person is using the succubus drain or not. See station_special_abilities_vr. var/drain_finalized = 0 // Determines if the succubus drain will be KO'd/absorbed. Can be toggled on at any time. var/fuzzy = 0 // Preference toggle for sharp/fuzzy icon. - var/voice_freq = 0 // Preference for character voice frequency - var/list/voice_sounds_list = list() // The sound list containing our voice sounds! +// var/voice_freq = 0 // Preference for character voice frequency CHOMPEdit - Moved to modular_chomp/code/modules/mob/mob.dm +// var/list/voice_sounds_list = list() // The sound list containing our voice sounds! CHOMPEdit - Moved to modular_chomp/code/modules/mob/mob.dm var/permit_healbelly = TRUE var/stumble_vore = TRUE //Enabled by default since you have to enable drop pred/prey to do this anyway var/slip_vore = TRUE //Enabled by default since you have to enable drop pred/prey to do this anyway @@ -327,7 +327,7 @@ drop_vore = P.drop_vore slip_vore = P.slip_vore stumble_vore = P.stumble_vore - + nutrition_message_visible = P.nutrition_message_visible nutrition_messages = P.nutrition_messages weight_message_visible = P.weight_message_visible diff --git a/modular_chomp/code/modules/mob/mob.dm b/modular_chomp/code/modules/mob/mob.dm new file mode 100644 index 0000000000..ba287eada4 --- /dev/null +++ b/modular_chomp/code/modules/mob/mob.dm @@ -0,0 +1,3 @@ +/mob + var/voice_freq = 42500 // Preference for character voice frequency + var/list/voice_sounds_list = list() // The sound list containing our voice sounds! \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 5b8c0609c9..70b358bdc3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4494,6 +4494,7 @@ #include "modular_chomp\code\modules\datums\supplypacks\munitions.dm" #include "modular_chomp\code\modules\emotes\definitions\audiable.dm" #include "modular_chomp\code\modules\mob\holder.dm" +#include "modular_chomp\code\modules\mob\mob.dm" #include "modular_chomp\code\modules\mob\living\emote.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\species.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\protean\_protean_defines.dm"