diff --git a/code/datums/langchat/langchat.dm b/code/datums/langchat/langchat.dm
index 5f7d91ff629..18db069546e 100644
--- a/code/datums/langchat/langchat.dm
+++ b/code/datums/langchat/langchat.dm
@@ -154,11 +154,16 @@
if(length(text_to_display) > LANGCHAT_LONGEST_TEXT)
text_to_display = copytext_char(text_to_display, 1, LANGCHAT_LONGEST_TEXT + 1) + "..."
- if(styles.Find("emote"))
+ if("emote" in styles)
styles.Remove("emote")
use_mob_style = FALSE
var/image/r_icon = image('icons/mob/chat_icons.dmi', icon_state = "emote")
text_to_display = "\icon[r_icon]&zwsp;[text_to_display]"
+ if("radio" in styles)
+ styles.Remove("radio")
+ use_mob_style = FALSE
+ var/image/r_icon = image('icons/mob/chat_icons.dmi', icon_state = "radio")
+ text_to_display = "\icon[r_icon]&zwsp;[text_to_display]"
return "[text_to_display]"
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index f8f7cc6f495..28ce6e3d0d3 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -47,12 +47,12 @@
return
if(emagged)
if(insults)
- user.audible_message("[user] broadcasts, \"[pick(insultmsg)]\"", "[user] speaks into \the [src].", 14)
+ speak(pick(insultmsg), user)
insults--
else
to_chat(user, SPAN_WARNING("*BZZZZzzzzzt*"))
else
- user.audible_message("[user] broadcasts, \"[message]\"", "[user] speaks into \the [src].", 14)
+ speak(message, user)
if(activation_sound)
playsound(loc, activation_sound, 100, 0, 1)
for (var/mob/living/carbon/human/C in range(user, 2) - user)
@@ -63,6 +63,9 @@
spamcheck = world.time + 50
return
+/obj/item/megaphone/proc/speak(var/msg, var/mob/living/user)
+ user.say(msg, user.get_default_language(), "broadcasts")
+
/obj/item/megaphone/emag_act(var/remaining_charges, var/mob/user)
if(!emagged)
to_chat(user, SPAN_WARNING("You overload \the [src]'s voice synthesizer."))
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index 3ab0ab85093..a887ccd86dd 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -24,7 +24,7 @@
var/list/exclaim_verb = list("exclaims")
/// Used when a sentence ends in !!
- var/list/shout_verb = list("shouts", "yells", "screams")
+ var/list/shout_verb = list("shouts", "yells", "screams", "broadcasts")
/// Optional. When not specified speech_verb + quietly/softly is used instead.
var/list/whisper_verb = null
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 1f2fa8a625e..478ca87483e 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -241,7 +241,8 @@ var/list/channel_to_radio_key = new
to_chat(src, SPAN_WARNING("You try to speak, but nothing comes out!"))
return
- var/message_mode = parse_message_mode(text, "headset")
+ var/is_broadcast = verb == "broadcasts"
+ var/message_mode = is_broadcast ? null : parse_message_mode(text, "headset")
var/regex/emote = regex("^(\[\\*^\])\[^*\]+$")
@@ -325,7 +326,7 @@ var/list/channel_to_radio_key = new
msg.speech_sound = handle_v[1]
msg.sound_vol = handle_v[2]
msg.italics = handle_v[3]
- msg.font_size = get_font_size_modifier()
+ msg.font_size = is_broadcast ? FONT_SIZE_HUGE : get_font_size_modifier()
//speaking into radios
if(length(used_radios))
@@ -384,6 +385,8 @@ var/list/channel_to_radio_key = new
langchat_styles = list("langchat_italic")
if(is_shouting)
langchat_styles = list("langchat_yell")
+ if(is_broadcast)
+ langchat_styles += "radio"
langchat_say_message(msg, get_hearers_in_view(msg.message_range, src), additional_styles = langchat_styles)
diff --git a/html/changelogs/Banditoz-megaphone-runechat.yml b/html/changelogs/Banditoz-megaphone-runechat.yml
new file mode 100644
index 00000000000..4b0bc0da6fd
--- /dev/null
+++ b/html/changelogs/Banditoz-megaphone-runechat.yml
@@ -0,0 +1,4 @@
+author: Banditoz
+delete-after: True
+changes:
+ - rscadd: "Megaphones now use your accent, language, and create floating text when used."