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

Everything: Rich text redux (#5625)

Browse Source 
* lord save me

* UI/ChatBox: Use the new `defStyle` param for `RenderMarkup`

The previous iteration didn't work because `AddMessage` can't inherit
its color from the PushColor (since we're not doing actual tag stacks
anymore).

* rebase touchup
This commit is contained in:
E F R
2021-12-13 02:25:42 +00:00
committed by GitHub
parent 7c31964613
commit b2da936848
61 changed files with 305 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -25,6 +25,7 @@ using Robust.Shared.Log;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
using static Content.Server.Chat.Managers.IChatManager;
namespace Content.Server.Chat.Managers
@@ -192,7 +193,7 @@ namespace Content.Server.Chat.Managers
var listeners = EntitySystem.Get<ListeningSystem>();
listeners.PingListeners(source, message);
message = FormattedMessage.EscapeText(message);
message = Basic.EscapeText(message);
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Local;
@@ -223,7 +224,7 @@ namespace Content.Server.Chat.Managers
return;
}
action = FormattedMessage.EscapeText(action);
action = Basic.EscapeText(action);
var clients = Filter.Empty()
.AddInRange(_entManager.GetComponent<TransformComponent>(source).MapPosition, VoiceRange)
@@ -260,7 +261,7 @@ namespace Content.Server.Chat.Managers
return;
}
message = FormattedMessage.EscapeText(message);
message = Basic.EscapeText(message);
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.OOC;
@@ -292,7 +293,7 @@ namespace Content.Server.Chat.Managers
return;
}
message = FormattedMessage.EscapeText(message);
message = Basic.EscapeText(message);
var clients = GetDeadChatClients();
@@ -319,7 +320,7 @@ namespace Content.Server.Chat.Managers
return;
}
message = FormattedMessage.EscapeText(message);
message = Basic.EscapeText(message);
var clients = GetDeadChatClients();
@@ -350,7 +351,7 @@ namespace Content.Server.Chat.Managers
return;
}
message = FormattedMessage.EscapeText(message);
message = Basic.EscapeText(message);
var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient);
@@ -368,7 +369,7 @@ namespace Content.Server.Chat.Managers
{
var clients = _adminManager.ActiveAdmins.Select(p => p.ConnectedClient);
message = FormattedMessage.EscapeText(message);
message = Basic.EscapeText(message);
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
@@ -382,7 +383,7 @@ namespace Content.Server.Chat.Managers
public void SendHookOOC(string sender, string message)
{
message = FormattedMessage.EscapeText(message);
message = Basic.EscapeText(message);
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.OOC;