Merge branch 'master' into translatefr

ss220club · Jan 31, 2025 · 5187c0d · 5187c0d
2 parents 93dd10d + 8675c3e
commit 5187c0d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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("<B>[user]</B> 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/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)))
 

diff --git 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",