From e35098f7dd0b12bbad72663ecc40b7bb9178d5fb Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Wed, 26 Jun 2024 05:13:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D1=80=D0=B0=D1=81=D0=B8=D0=B2=D0=BE?= =?UTF-8?q?=D0=B5=20=D0=A3=D0=98=20=D1=82=D0=B5=D0=BB=D0=B5=D0=BF=D0=BE?= =?UTF-8?q?=D1=80=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=B7=D1=80=D0=B0=D0=BA=D0=B0=20(#378)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add: nice ghost teleport ui * fix: fix unused import * wtf * fuck you, search bar * fix-add: finally --- .../Access/UI/AccessLevelControl.xaml.cs | 4 +- Content.Client/Ghost/GhostSystem.cs | 2 - Content.Client/Stylesheets/StyleNano.cs | 60 ++- .../Ghost/Controls/GhostTargetWindow.xaml | 6 +- .../Ghost/Controls/GhostTargetWindow.xaml.cs | 341 +++++++++++++++--- .../Systems/Ghost/GhostUIController.cs | 8 +- .../GameTicking/Rules/NukeopsRuleSystem.cs | 2 + Content.Server/Ghost/GhostSystem.cs | 184 ++++------ .../Ninja/Systems/SpaceNinjaSystem.cs | 3 + .../StationEvents/Events/LoneOpsSpawnRule.cs | 4 + .../Zombies/ZombieSystem.Transform.cs | 2 + .../_White/Cult/GameRule/CultRuleSystem.cs | 2 + .../_White/Wizard/WizardRuleSystem.cs | 2 + Content.Shared/Ghost/SharedGhostSystem.cs | 141 +++++++- .../Mind/Components/MindContainerComponent.cs | 5 + Content.Shared/Roles/DepartmentPrototype.cs | 21 +- .../_White/Antag/AntagonistPrototype.cs | 29 ++ .../_White/Antag/GlobalAntagonistComponent.cs | 11 + .../ru-RU/_white/ui/ghostTeleportMenu.ftl | 34 ++ Resources/Locale/ru-RU/job/department.ftl | 2 +- .../Prototypes/Entities/Mobs/NPCs/animals.yml | 4 + .../Entities/Mobs/NPCs/regalrat.yml | 5 +- .../Entities/Mobs/NPCs/revenant.yml | 2 + .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 6 + .../Entities/Mobs/Player/dragon.yml | 2 + .../Prototypes/Roles/Jobs/departments.yml | 115 +++--- .../_White/Antag/globalAntagonists.yml | 77 ++++ 27 files changed, 835 insertions(+), 239 deletions(-) create mode 100644 Content.Shared/_White/Antag/AntagonistPrototype.cs create mode 100644 Content.Shared/_White/Antag/GlobalAntagonistComponent.cs create mode 100644 Resources/Locale/ru-RU/_white/ui/ghostTeleportMenu.ftl create mode 100644 Resources/Prototypes/_White/Antag/globalAntagonists.yml 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