Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

3
Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
View File

@@ -2,6 +2,7 @@
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
namespace Content.Shared.Construction.Steps
{
@@ -16,7 +17,7 @@ namespace Content.Shared.Construction.Steps
if (string.IsNullOrEmpty(Name))
return;
examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
examinedEvent.Message.AddMessage(Basic.RenderMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name))));
}
public override ConstructionGuideEntry GenerateGuideEntry()

17
Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
View File

@@ -2,6 +2,7 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility.Markup;
namespace Content.Shared.Construction.Steps
{
@@ -23,13 +24,15 @@ namespace Content.Shared.Construction.Steps
public override void DoExamine(ExaminedEvent examinedEvent)
{
examinedEvent.Message.AddMarkup(string.IsNullOrEmpty(Name)
? Loc.GetString(
"construction-insert-entity-with-component",
("componentName", Component))// Terrible.
: Loc.GetString(
"construction-insert-exact-entity",
("entityName", Name)));
examinedEvent.Message.AddMessage(
Basic.RenderMarkup(string.IsNullOrEmpty(Name)
? Loc.GetString(
"construction-insert-entity-with-component",
("componentName", Component))// Terrible.
: Loc.GetString(
"construction-insert-exact-entity",
("entityName", Name))
));
}
}
}

3
Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
View File

@@ -7,6 +7,7 @@ using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Utility.Markup;
namespace Content.Shared.Construction.Steps
{
@@ -24,7 +25,7 @@ namespace Content.Shared.Construction.Steps
{
var material = IoCManager.Resolve<IPrototypeManager>().Index<StackPrototype>(MaterialPrototypeId);
examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", material.Name)));
examinedEvent.Message.AddMessage(Basic.RenderMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", material.Name))));
}
public override bool EntityValid(EntityUid uid, IEntityManager entityManager)

6
Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
View File

@@ -2,6 +2,7 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility.Markup;
namespace Content.Shared.Construction.Steps
{
@@ -17,7 +18,8 @@ namespace Content.Shared.Construction.Steps
public override void DoExamine(ExaminedEvent examinedEvent)
{
examinedEvent.Message.AddMarkup(string.IsNullOrEmpty(Name)
var nb = new Basic();
nb.AddMarkup(string.IsNullOrEmpty(Name)
? Loc.GetString(
"construction-insert-prototype-no-name",
("prototypeName", Prototype) // Terrible.
@@ -26,6 +28,8 @@ namespace Content.Shared.Construction.Steps
"construction-insert-prototype",
("entityName", Name)
));
examinedEvent.Message.AddMessage(nb.Render());
}
}
}