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.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
View File

@@ -14,6 +14,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
namespace Content.Server.Weapon.Ranged.Ammunition.Components
{
@@ -214,7 +215,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
return TryUse(eventArgs.User);
}
public void Examine(FormattedMessage message, bool inDetailsRange)
public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
{
message.AddMarkup("\n" + Loc.GetString("ammo-box-component-on-examine-caliber-description", ("caliber", _caliber)));
message.AddMarkup("\n" + Loc.GetString("ammo-box-component-on-examine-remaining-ammo-description", ("ammoLeft",AmmoLeft),("capacity", _capacity)));

3
Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
View File

@@ -13,6 +13,7 @@ using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
namespace Content.Server.Weapon.Ranged.Ammunition.Components
{
@@ -156,7 +157,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
EntitySystem.Get<EffectSystem>().CreateParticle(message);
}
public void Examine(FormattedMessage message, bool inDetailsRange)
public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
{
var text = Loc.GetString("ammo-component-on-examine",("caliber", Caliber));
message.AddMarkup(text);

3
Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
View File

@@ -14,6 +14,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
namespace Content.Server.Weapon.Ranged.Ammunition.Components
{
@@ -168,7 +169,7 @@ namespace Content.Server.Weapon.Ranged.Ammunition.Components
return true;
}
public void Examine(FormattedMessage message, bool inDetailsRange)
public void Examine(FormattedMessage.Builder message, bool inDetailsRange)
{
var text = Loc.GetString("ranged-magazine-component-on-examine", ("magazineType", MagazineType),("caliber", Caliber));
message.AddMarkup(text);

3
Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
View File

@@ -16,6 +16,7 @@ using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
using Robust.Shared.ViewVariables;
namespace Content.Server.Weapon.Ranged.Barrels.Components
@@ -328,7 +329,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return false;
}
public override void Examine(FormattedMessage message, bool inDetailsRange)
public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
{
base.Examine(message, inDetailsRange);

3
Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
View File

@@ -16,6 +16,7 @@ using Robust.Shared.Player;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
using Robust.Shared.ViewVariables;
namespace Content.Server.Weapon.Ranged.Barrels.Components
@@ -237,7 +238,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return TryInsertBullet(eventArgs);
}
public override void Examine(FormattedMessage message, bool inDetailsRange)
public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
{
base.Examine(message, inDetailsRange);

3
Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
View File

@@ -20,6 +20,7 @@ using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
using Robust.Shared.ViewVariables;
namespace Content.Server.Weapon.Ranged.Barrels.Components
@@ -430,7 +431,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
return false;
}
public override void Examine(FormattedMessage message, bool inDetailsRange)
public override void Examine(FormattedMessage.Builder message, bool inDetailsRange)
{
base.Examine(message, inDetailsRange);

3
Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
View File

@@ -27,6 +27,7 @@ using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Robust.Shared.Utility.Markup;
namespace Content.Server.Weapon.Ranged.Barrels.Components
{
@@ -407,7 +408,7 @@ namespace Content.Server.Weapon.Ranged.Barrels.Components
}
#endregion
public virtual void Examine(FormattedMessage message, bool inDetailsRange)
public virtual void Examine(FormattedMessage.Builder message, bool inDetailsRange)
{
var fireRateMessage = Loc.GetString(FireRateSelector switch
{