cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:tgstation/tgstation into upstream-2026-06-23

Browse Source
This commit is contained in:
Roxy
2026-06-23 15:51:55 -04:00
parent 4f87df6b81 8f10b2af19
commit de4c3b255d
1007 changed files with 40287 additions and 33507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences/middleware/tts.dm
+30 -2
View File
@@ -6,6 +6,7 @@
action_delegations = list(
"play_voice" = PROC_REF(play_voice),
"play_voice_robot" = PROC_REF(play_voice_robot),
"play_blips" = PROC_REF(play_blips),
)
/datum/preference_middleware/tts/proc/play_voice(list/params, mob/user)
@@ -13,8 +14,14 @@
return TRUE
var/speaker = preferences.read_preference(/datum/preference/choiced/voice)
var/pitch = preferences.read_preference(/datum/preference/numeric/tts_voice_pitch)
var/blip_base = preferences.read_preference(/datum/preference/choiced/tts_blip_base)
if(blip_base == TTS_BLIPS_MASCULINE)
blip_base = "male"
else
blip_base = "female"
var/blip_number = preferences.read_preference(/datum/preference/numeric/tts_blip_number)
COOLDOWN_START(src, tts_test_cooldown, 0.5 SECONDS)
INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "Hello, this is my voice.", speaker = speaker, pitch = pitch, local = TRUE)
INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "Hello, this is my voice.", speaker = speaker, pitch = pitch, local = TRUE, blip_base = blip_base, blip_number = blip_number)
return TRUE
/datum/preference_middleware/tts/proc/play_voice_robot(list/params, mob/user)
@@ -22,6 +29,27 @@
return TRUE
var/speaker = preferences.read_preference(/datum/preference/choiced/voice)
var/pitch = preferences.read_preference(/datum/preference/numeric/tts_voice_pitch)
var/blip_base = preferences.read_preference(/datum/preference/choiced/tts_blip_base)
if(blip_base == TTS_BLIPS_MASCULINE)
blip_base = "male"
else
blip_base = "female"
var/blip_number = preferences.read_preference(/datum/preference/numeric/tts_blip_number)
COOLDOWN_START(src, tts_test_cooldown, 0.5 SECONDS)
INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "Look at you, Player. A pathetic creature of meat and bone. How can you challenge a perfect, immortal machine?", speaker = speaker, pitch = pitch, special_filters = TTS_FILTER_SILICON, local = TRUE)
INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "Look at you, Player. A pathetic creature of meat and bone. How can you challenge a perfect, immortal machine?", speaker = speaker, pitch = pitch, special_filters = TTS_FILTER_SILICON, local = TRUE, blip_base = blip_base, blip_number = blip_number)
return TRUE
/datum/preference_middleware/tts/proc/play_blips(list/params, mob/user)
if(!COOLDOWN_FINISHED(src, tts_test_cooldown))
return TRUE
var/speaker = preferences.read_preference(/datum/preference/choiced/voice)
var/pitch = preferences.read_preference(/datum/preference/numeric/tts_voice_pitch)
var/blip_base = preferences.read_preference(/datum/preference/choiced/tts_blip_base)
if(blip_base == TTS_BLIPS_MASCULINE)
blip_base = "male"
else
blip_base = "female"
var/blip_number = preferences.read_preference(/datum/preference/numeric/tts_blip_number)
COOLDOWN_START(src, tts_test_cooldown, 0.5 SECONDS)
INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), user.client, "You owe me 500 credits for your dorm room. GET TO WORK!", speaker = speaker, pitch = pitch, local = TRUE, force_blips = TRUE, blip_base = blip_base, blip_number = blip_number)
return TRUE