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

Revert Rich text (#5848)

Browse Source
This commit is contained in:
Paul Ritter
2021-12-20 12:42:42 +01:00
committed by GitHub
parent e3a1b2b37b
commit cc57d1380c
60 changed files with 212 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Actions/UI/ActionSlot.cs
View File

@@ -16,7 +16,6 @@ using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Actions.UI
@@ -479,10 +478,10 @@ namespace Content.Client.Actions.UI
private FormattedMessage SlotNumberLabel()
{
if (SlotNumber > 10) return FormattedMessage.Empty;
if (SlotNumber > 10) return FormattedMessage.FromMarkup("");
var number = Loc.GetString(SlotNumber == 10 ? "0" : SlotNumber.ToString());
var color = (ActionEnabled || !HasAssignment) ? EnabledColor : DisabledColor;
return Basic.RenderMarkup("[color=" + color + "]" + number + "[/color]");
return FormattedMessage.FromMarkup("[color=" + color + "]" + number + "[/color]");
}
private void UpdateIcons()