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

Solution Examine Code Cleanup + PressureVent Ignore (#2112)

Browse Source
This commit is contained in:
Exp
2020-09-19 23:36:48 +02:00
committed by GitHub
parent cb43970188
commit 8095f70bbf
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/IgnoredComponents.cs
View File

@@ -165,6 +165,7 @@
"AMEShield", "AMEShield",
"DebugPump", "DebugPump",
"PressurePump", "PressurePump",
"PressureVent",
"VolumePump", "VolumePump",
"DebugVent", "DebugVent",
"DebugSiphon", "DebugSiphon",

16
Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs
View File

@@ -266,10 +266,10 @@ namespace Content.Server.GameObjects.Components.Chemistry
if (_prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype proto)) if (_prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype proto))
{ {
var colorStr = $" [color={proto.GetSubstanceTextColor().ToHexNoAlpha()}]"; message.AddMarkup(
message.AddText(Loc.GetString("It contains a")); Loc.GetString("It contains a [color={0}]{1}[/color] substance.",
message.AddMarkup(colorStr + Loc.GetString(proto.PhysicalDescription) + "[/color] "); proto.GetSubstanceTextColor().ToHexNoAlpha(),
message.AddText(Loc.GetString("substance.")); Loc.GetString(proto.PhysicalDescription)));
} }
} }
else else
@@ -278,10 +278,10 @@ namespace Content.Server.GameObjects.Components.Chemistry
if (_prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype proto)) if (_prototypeManager.TryIndex(reagent.ReagentId, out ReagentPrototype proto))
{ {
var colorStr = $" [color={SubstanceColor.ToHexNoAlpha()}]"; message.AddMarkup(
message.AddText(Loc.GetString("It contains a")); Loc.GetString("It contains a [color={0}]{1}[/color] mixture of substances.",
message.AddMarkup(colorStr + Loc.GetString(proto.PhysicalDescription) + "[/color] "); SubstanceColor.ToHexNoAlpha(),
message.AddText(Loc.GetString("mixture of substances.")); Loc.GetString(proto.PhysicalDescription)));
} }
} }
} }