tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes ghosts completely lacking speech (#22157)

Browse Source
This commit is contained in:
deathride58
2023-12-05 16:40:03 -05:00
committed by GitHub
parent 5937d0ca77
commit f0c76348bc
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Chat/UI/SpeechBubble.cs
View File

@@ -187,6 +187,8 @@ namespace Content.Client.Chat.UI
var rawmsg = message.WrappedMessage; var rawmsg = message.WrappedMessage;
var tagStart = rawmsg.IndexOf($"[{tag}]"); var tagStart = rawmsg.IndexOf($"[{tag}]");
var tagEnd = rawmsg.IndexOf($"[/{tag}]"); var tagEnd = rawmsg.IndexOf($"[/{tag}]");
if (tagStart <= 0 || tagEnd <= 0) //the above return -1 if the tag's not found, which in turn will cause the below to throw an exception. a blank speech bubble is far more noticeably broken than the bubble not appearing at all -bhijn
return "";
tagStart += tag.Length + 2; tagStart += tag.Length + 2;
return rawmsg.Substring(tagStart, tagEnd - tagStart); return rawmsg.Substring(tagStart, tagEnd - tagStart);
} }

4
Resources/Locale/en-US/chat/managers/chat-manager.ftl
View File

@@ -37,8 +37,8 @@ chat-manager-entity-looc-wrap-message = LOOC: [bold]{$entityName}:[/bold] {$mess
chat-manager-send-ooc-wrap-message = OOC: [bold]{$playerName}:[/bold] {$message} chat-manager-send-ooc-wrap-message = OOC: [bold]{$playerName}:[/bold] {$message}
chat-manager-send-ooc-patron-wrap-message = OOC: [bold][color={$patronColor}]{$playerName}[/color]:[/bold] {$message} chat-manager-send-ooc-patron-wrap-message = OOC: [bold][color={$patronColor}]{$playerName}[/color]:[/bold] {$message}
chat-manager-send-dead-chat-wrap-message = {$deadChannelName}: [bold]{$playerName}:[/bold] {$message} chat-manager-send-dead-chat-wrap-message = {$deadChannelName}: [bold][BubbleHeader]{$playerName}[/BubbleHeader]:[/bold] [BubbleContent]{$message}[/BubbleContent]
chat-manager-send-admin-dead-chat-wrap-message = {$adminChannelName}: [bold]({$userName}):[/bold] {$message} chat-manager-send-admin-dead-chat-wrap-message = {$adminChannelName}: [bold]([BubbleHeader]{$userName}[/BubbleHeader]):[/bold] [BubbleContent]{$message}[/BubbleContent]
chat-manager-send-admin-chat-wrap-message = {$adminChannelName}: [bold]{$playerName}:[/bold] {$message} chat-manager-send-admin-chat-wrap-message = {$adminChannelName}: [bold]{$playerName}:[/bold] {$message}
chat-manager-send-admin-announcement-wrap-message = [bold]{$adminChannelName}: {$message}[/bold] chat-manager-send-admin-announcement-wrap-message = [bold]{$adminChannelName}: {$message}[/bold]