Skip to content

Commit 3f65307

Browse files
committed
Screaming
1 parent cce3929 commit 3f65307

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

Content.Server/Radio/EntitySystems/RadioSystem.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,11 +476,15 @@ private string WrapRadioMessage(
476476
if ((language.Speech.ObfuscationFont ?? false) && !obfuscated)
477477
fonttype = speech.FontId;
478478

479-
return Loc.GetString(loudMode ? "chat-radio-message-wrap-command" :speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap", // starlight edit: loud mode
479+
bool isYelling = false;
480+
if (speech.ID == "DefaultExclamationStrong")
481+
isYelling = true;
482+
483+
return Loc.GetString(loudMode ? "chat-radio-message-wrap-command" : speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap", // starlight edit: loud mode
480484
("color", channel.Color),
481485
("languageColor", languageColor),
482486
("fontType", fonttype),
483-
("fontSize", language.Speech.FontSize ?? speech.FontSize),
487+
("fontSize", isYelling ? speech.FontSize : language.Speech.FontSize ?? speech.FontSize),
484488
("verb", Loc.GetString(verbId)),
485489
("channel", $"\\[{channel.LocalizedName}\\]"),
486490
("name", namestring),
@@ -514,11 +518,15 @@ private string WrapCustomRadioMessage(
514518
if ((language.Speech.ObfuscationFont ?? false) && !obfuscated)
515519
fonttype = speech.FontId;
516520

521+
bool isYelling = false;
522+
if (speech.ID == "DefaultExclamationStrong")
523+
isYelling = true;
524+
517525
return Loc.GetString(loudMode ? "chat-radio-message-wrap-command" : speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap",
518526
("color", channel.Color),
519527
("languageColor", languageColor),
520528
("fontType", fonttype),
521-
("fontSize", language.Speech.FontSize ?? speech.FontSize),
529+
("fontSize", isYelling ? speech.FontSize : language.Speech.FontSize ?? speech.FontSize),
522530
("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
523531
("channel", $"\\[{channel.LocalizedName}\\]"),
524532
("name", namestring),

Resources/Locale/en-US/headset/headset-component.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ chat-radio-message-wrap = [color={$color}]{$channel} [bold]{$name}[/bold] {$verb
66
# Starlight-edit: Languages
77
chat-radio-message-wrap-bold = [color={$color}]{$channel} [bold]{$name}[/bold] {$verb}, "[/color][font="{$fontType}" size={$fontSize}][color={$languageColor}][bold]{$message}[/bold][/font][/color][color={$color}]"[/color]
88
# Starlight-edit: command
9-
chat-radio-message-wrap-command = [color={$color}]{$channel} [bold]{$name}[/bold] {$verb}, "[/color][font="{$fontType}" size={$fontSize}][color={$languageColor}][head=2][bold]{$message}[/bold][/head][/font][/color][color={$color}]"[/color]
9+
chat-radio-message-wrap-command = [color={$color}]{$channel} [bold]{$name}[/bold] {$verb}, "[/color][font="{$fontType}" size={$fontSize}][color={$languageColor}][head=2]{$message}[/head][/font][/color][color={$color}]"[/color]
1010
1111
# Starlight-edit: inactive/active
1212
headset-loud-mode-examine-active = The headset's loudmode speaker is [color=green]ACTIVE[/color].

Resources/Prototypes/Voice/speech_verbs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
speechVerbStrings:
3636
- chat-speech-verb-exclamation-strong
3737
priority: 10
38+
fontSize: 14 #starlight, yelling
3839

3940
- type: speechVerb
4041
id: Arachnid

0 commit comments

Comments
 (0)