diff --git a/Content.Client/Access/UI/AccessLevelControl.xaml.cs b/Content.Client/Access/UI/AccessLevelControl.xaml.cs index 3ce1c7d1f2..8feb47f8f6 100644 --- a/Content.Client/Access/UI/AccessLevelControl.xaml.cs +++ b/Content.Client/Access/UI/AccessLevelControl.xaml.cs @@ -48,9 +48,9 @@ public sealed partial class AccessLevelControl : GridContainer "ButtonColorSecurityDepartment", "ButtonColorMedicalDepartment", "ButtonColorEngineeringDepartment", - "ButtonColorResearchingDepartment", + "ButtonColorScienceDepartment", "ButtonColorCargoDepartment", - "ButtonColorServiceDepartment" + "ButtonColorCivilianDepartment" }; var currentColorIndex = 0; diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs index 774eae3f02..f8f0d0206a 100644 --- a/Content.Client/Ghost/GhostSystem.cs +++ b/Content.Client/Ghost/GhostSystem.cs @@ -148,9 +148,7 @@ namespace Content.Client.Ghost private void OnGhostWarpsResponse(GhostWarpsResponseEvent msg) { if (!IsGhost) - { return; - } GhostWarpsResponse?.Invoke(msg); } diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index 28861b848a..d58019b29e 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -165,8 +165,11 @@ namespace Content.Client.Stylesheets public static readonly Color ButtonColorMedical = Color.FromHex("#4494C8"); public static readonly Color ButtonColorEngineering = Color.FromHex("#FDA55E"); public static readonly Color ButtonColorCargo = Color.FromHex("#9E6A34"); - public static readonly Color ButtonColorResearching = Color.FromHex("#984EB4"); - public static readonly Color ButtonColorService = Color.FromHex("#40A166"); + public static readonly Color ButtonColorScience = Color.FromHex("#984EB4"); + public static readonly Color ButtonColorCivilian = Color.FromHex("#40A166"); + public static readonly Color ButtonColorJustice = Color.FromHex("#8E3D3D"); + public static readonly Color ButtonColorSpecific = Color.FromHex("#969696"); + public static readonly Color ButtonColorAntagonist = Color.FromHex("#7F4141"); public override Stylesheet Stylesheet { get; } @@ -1383,14 +1386,14 @@ namespace Content.Client.Stylesheets new SelectorElement(typeof(MenuButton), new[] {MenuButton.StyleClassRedTopButton}, null, new[] {Button.StylePseudoClassNormal}), new[] { - new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorService), + new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorCivilian), }), new StyleRule( new SelectorElement(typeof(MenuButton), new[] {MenuButton.StyleClassRedTopButton}, null, new[] {Button.StylePseudoClassNormal}), new[] { - new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorResearching), + new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorScience), }), new StyleRule( new SelectorElement(typeof(MenuButton), new[] {MenuButton.StyleClassRedTopButton}, null, new[] {Button.StylePseudoClassNormal}), @@ -1398,6 +1401,24 @@ namespace Content.Client.Stylesheets { new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorCargo), }), + new StyleRule( + new SelectorElement(typeof(MenuButton), new[] {MenuButton.StyleClassRedTopButton}, null, new[] {Button.StylePseudoClassNormal}), + new[] + { + new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorJustice), + }), + new StyleRule( + new SelectorElement(typeof(MenuButton), new[] {MenuButton.StyleClassRedTopButton}, null, new[] {Button.StylePseudoClassNormal}), + new[] + { + new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorSpecific), + }), + new StyleRule( + new SelectorElement(typeof(MenuButton), new[] {MenuButton.StyleClassRedTopButton}, null, new[] {Button.StylePseudoClassNormal}), + new[] + { + new StyleProperty(Button.StylePropertyModulateSelf, ButtonColorAntagonist), + }), // NanoHeading @@ -1657,20 +1678,35 @@ namespace Content.Client.Stylesheets Element