From a84d249234d7bef4c40bb259d52f42b44c836b9d Mon Sep 17 00:00:00 2001 From: Alexsey Bezyuk <41479614+PhantornRU@users.noreply.github.com> Date: Sat, 1 Feb 2025 00:01:01 +1000 Subject: [PATCH 1/2] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=83=D1=80?= =?UTF-8?q?=D0=BE=D0=BD=D0=B0=20=D0=B7=D0=B0=20=D0=B1=D1=80=D0=B5=D0=B9?= =?UTF-8?q?=D0=BD=D1=80=D0=BE=D1=82=20(#23)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # About the pull request фикс урона за брейнрот # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: фикс урона за брейнрот /:cl: --- modular/speech_filter/code/speech_filter.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular/speech_filter/code/speech_filter.dm b/modular/speech_filter/code/speech_filter.dm index f3ec4978753b..f2e530027d7f 100644 --- a/modular/speech_filter/code/speech_filter.dm +++ b/modular/speech_filter/code/speech_filter.dm @@ -34,9 +34,9 @@ if(ishuman(user)) var/mob/living/L = user - L.apply_stamina_damage(300) - L.adjustOxyLoss(40) - L.adjustBrainLoss(3) + L.apply_stamina_damage(80) + L.adjustOxyLoss(30) + L.adjustBrainLoss(1) L.emote("drool") to_chat(L, SPAN_PSYTALK(pick(brainrot_notifications))) From 8675c3e89757367702638920456f0c80391cf2c4 Mon Sep 17 00:00:00 2001 From: Alexsey Bezyuk <41479614+PhantornRU@users.noreply.github.com> Date: Sat, 1 Feb 2025 00:54:32 +1000 Subject: [PATCH 2/2] TTS fixes + Megaphone (#24) # About the pull request TTS fixes + Megaphone # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: fix: TTS fixes + Megaphone /:cl: ## Summary by Sourcery Reduce stamina, oxygen, and brain damage from speech filter, and add TTS to megaphone broadcasts. New Features: - Added TTS support for megaphone broadcasts. Bug Fixes: - Fixed an issue where the speech filter caused excessive stamina, oxygen, and brain damage. --- code/game/objects/items/devices/megaphone.dm | 1 + modular/text_to_speech/code/hear.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index e0227939280e..e12532e7f264 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -49,6 +49,7 @@ if(!ishumansynth_strict(listener) && !isobserver(listener)) listener.show_message("[user] says something on the microphone, but you can't understand it.") continue + user.cast_tts(listener, message, user, TRUE, 4) // SS220 ADD - TTS listener.show_message("[user] broadcasts, [FONT_SIZE_LARGE("\"[message]\"")]", SHOW_MESSAGE_AUDIBLE) // 2 stands for hearable message langchat_long_listeners += listener playsound(loc, 'sound/items/megaphone.ogg', 100, FALSE, TRUE) diff --git a/modular/text_to_speech/code/hear.dm b/modular/text_to_speech/code/hear.dm index 20004ff91ecb..060067dea0da 100644 --- a/modular/text_to_speech/code/hear.dm +++ b/modular/text_to_speech/code/hear.dm @@ -11,7 +11,7 @@ return if(!say_understands(speaker, language)) return - speaker.cast_tts(src, message, src, FALSE, null, null) + speaker.cast_tts(src, message) /mob/hear_radio( message, verb="says",