diff --git a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs index b54dd8b701..1e8b524997 100644 --- a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs +++ b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs @@ -42,7 +42,7 @@ public sealed class GuidebookRichPrototypeLink : Control, IPrototypeLinkControl public void SetMessage(FormattedMessage message) { _message = message; - _richTextLabel.SetMessage(_message); + _richTextLabel.SetMessage(_message, tagsAllowed: null); } public IPrototype? LinkedPrototype { get; set; } diff --git a/Content.Client/Guidebook/DocumentParsingManager.static.cs b/Content.Client/Guidebook/DocumentParsingManager.static.cs index 3e37942381..c702ac97ad 100644 --- a/Content.Client/Guidebook/DocumentParsingManager.static.cs +++ b/Content.Client/Guidebook/DocumentParsingManager.static.cs @@ -82,7 +82,7 @@ public sealed partial class DocumentParsingManager } msg.Pop(); - rt.SetMessage(msg); + rt.SetMessage(msg, tagsAllowed: null); return rt; }, TextParser) diff --git a/Content.Client/Info/InfoSection.xaml.cs b/Content.Client/Info/InfoSection.xaml.cs index 9e10a4d7b4..95a74c72c7 100644 --- a/Content.Client/Info/InfoSection.xaml.cs +++ b/Content.Client/Info/InfoSection.xaml.cs @@ -18,7 +18,7 @@ public sealed partial class InfoSection : BoxContainer { TitleLabel.Text = title; if (markup) - Content.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim())); + Content.SetMessage(FormattedMessage.FromMarkupOrThrow(text.Trim()), tagsAllowed: null); else Content.SetMessage(text); } diff --git a/Content.Client/Info/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs index 901fc91337..a28a3d4a6e 100644 --- a/Content.Client/Info/ServerInfo.cs +++ b/Content.Client/Info/ServerInfo.cs @@ -24,7 +24,7 @@ namespace Content.Client.Info } public void SetInfoBlob(string markup) { - _richTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(markup)); + _richTextLabel.SetMessage(FormattedMessage.FromMarkupOrThrow(markup), tagsAllowed: null); } } } diff --git a/Content.Client/Research/ResearchSystem.cs b/Content.Client/Research/ResearchSystem.cs index 7086fc928b..55d9535272 100644 --- a/Content.Client/Research/ResearchSystem.cs +++ b/Content.Client/Research/ResearchSystem.cs @@ -1,5 +1,8 @@ -using Content.Shared.Research.Systems; +using Content.Shared.Research.Systems; namespace Content.Client.Research; -public sealed class ResearchSystem : SharedResearchSystem; +public sealed class ResearchSystem : SharedResearchSystem +{ + +} diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs index d5202eea5d..2895ada61f 100644 --- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs @@ -7,22 +7,23 @@ using Robust.Shared.Prototypes; namespace Content.Client.Research.UI; [UsedImplicitly] -public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) +public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface { [ViewVariables] private ResearchConsoleMenu? _consoleMenu; + public ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + } + protected override void Open() { base.Open(); - _consoleMenu = this.CreateWindow(); - _consoleMenu.SetEntity(Owner); + var owner = Owner; - _consoleMenu.OnTechnologyRediscoverPressed += () => - { - SendMessage(new ConsoleRediscoverTechnologyMessage()); - }; + _consoleMenu = this.CreateWindow(); + _consoleMenu.SetEntity(owner); _consoleMenu.OnTechnologyCardPressed += id => { @@ -55,7 +56,6 @@ public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKe if (state is not ResearchConsoleBoundInterfaceState castState) return; - _consoleMenu?.UpdatePanels(castState); _consoleMenu?.UpdateInformationPanel(castState); } diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml index 8e3a74f933..8de9827c0c 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml @@ -1,4 +1,4 @@ -