diff --git a/modular_ss220/text_to_speech/code/tts_subsystem.dm b/modular_ss220/text_to_speech/code/tts_subsystem.dm index a51f699a3bb4..78f5f5233cf1 100644 --- a/modular_ss220/text_to_speech/code/tts_subsystem.dm +++ b/modular_ss220/text_to_speech/code/tts_subsystem.dm @@ -279,10 +279,9 @@ SUBSYSTEM_DEF(tts220) if(traits & TTS_TRAIT_PITCH_WHISPER) text = provider.pitch_whisper(text) - var/hash = rustg_hash_string(RUSTG_HASH_MD5, text) + var/hash = rustg_hash_string(RUSTG_HASH_MD5, lowertext(text)) var/filename = "data/tts_cache/[seed.name]/[hash]" - var/datum/callback/play_tts_cb = CALLBACK(src, PROC_REF(play_tts), speaker, listener, filename, is_local, effect, preSFX, postSFX) if(fexists("[filename].ogg")) tts_reused++ @@ -290,6 +289,8 @@ SUBSYSTEM_DEF(tts220) play_tts(speaker, listener, filename, is_local, effect, preSFX, postSFX) return + var/datum/callback/play_tts_cb = CALLBACK(src, PROC_REF(play_tts), speaker, listener, filename, is_local, effect, preSFX, postSFX) + if(LAZYLEN(tts_queue[filename])) tts_reused++ tts_rrps_counter++ @@ -306,14 +307,14 @@ SUBSYSTEM_DEF(tts220) // Bail if it errored if(response.errored) provider.timed_out_requests++ - message_admins("Error connecting to [provider.name] TTS API. Please inform a maintainer or server host.") + log_game(span_warning("Error connecting to [provider.name] TTS API. Please inform a maintainer or server host.")) + message_admins(span_warning("Error connecting to [provider.name] TTS API. Please inform a maintainer or server host.")) return if(response.status_code != 200) provider.failed_requests++ - if(provider.failed_requests >= provider.failed_requests_limit) - provider.is_enabled = FALSE - message_admins("Error performing [provider.name] TTS API request (Code: [response.status_code])") + log_game(span_warning("Error performing [provider.name] TTS API request (Code: [response.status_code])")) + message_admins(span_warning("Error performing [provider.name] TTS API request (Code: [response.status_code])")) tts_request_failed++ if(response.status_code) if(tts_errors["[response.status_code]"]) @@ -408,7 +409,7 @@ SUBSYSTEM_DEF(tts220) if(preSFX) play_sfx(listener, preSFX, output.channel, output.volume, output.environment) - listener.playsound_local(turf_source, output, volume, S = output, channel = channel, wait = TRUE) + output = listener.playsound_local(turf_source, output, volume, S = output, channel = channel, wait = TRUE) if(!output || output.volume <= 0) return @@ -458,7 +459,7 @@ SUBSYSTEM_DEF(tts220) /datum/controller/subsystem/tts220/proc/sanitize_tts_input(message) var/hash if(sanitized_messages_caching) - hash = rustg_hash_string(RUSTG_HASH_MD5, message) + hash = rustg_hash_string(RUSTG_HASH_MD5, lowertext(message)) if(sanitized_messages_cache[hash]) sanitized_messages_cache_hit++ return sanitized_messages_cache[hash]