From 8095f70bbfaba30c49a51d71cb886879612b9d9a Mon Sep 17 00:00:00 2001 From: Exp Date: Sat, 19 Sep 2020 23:36:48 +0200 Subject: [PATCH] Solution Examine Code Cleanup + PressureVent Ignore (#2112) --- Content.Client/IgnoredComponents.cs | 1 + .../Chemistry/SolutionContainerComponent.cs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/IgnoredComponents.cs index c0fd55dfb4..15022f8874 100644 --- a/Content.Client/IgnoredComponents.cs +++ b/Content.Client/IgnoredComponents.cs @@ -165,6 +165,7 @@ "AMEShield", "DebugPump", "PressurePump", + "PressureVent", "VolumePump", "DebugVent", "DebugSiphon", diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs index fba1fcaf3b..16a1917edc 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs @@ -266,10 +266,10 @@ namespace Content.Server.GameObjects.Components.Chemistry if (_prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype proto)) { - var colorStr = $" [color={proto.GetSubstanceTextColor().ToHexNoAlpha()}]"; - message.AddText(Loc.GetString("It contains a")); - message.AddMarkup(colorStr + Loc.GetString(proto.PhysicalDescription) + "[/color] "); - message.AddText(Loc.GetString("substance.")); + message.AddMarkup( + Loc.GetString("It contains a [color={0}]{1}[/color] substance.", + proto.GetSubstanceTextColor().ToHexNoAlpha(), + Loc.GetString(proto.PhysicalDescription))); } } else @@ -278,10 +278,10 @@ namespace Content.Server.GameObjects.Components.Chemistry if (_prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype proto)) { - var colorStr = $" [color={SubstanceColor.ToHexNoAlpha()}]"; - message.AddText(Loc.GetString("It contains a")); - message.AddMarkup(colorStr + Loc.GetString(proto.PhysicalDescription) + "[/color] "); - message.AddText(Loc.GetString("mixture of substances.")); + message.AddMarkup( + Loc.GetString("It contains a [color={0}]{1}[/color] mixture of substances.", + SubstanceColor.ToHexNoAlpha(), + Loc.GetString(proto.PhysicalDescription))); } } }