From bb53a70d3f980f71c8c5c2930457ed0d87d9da7b Mon Sep 17 00:00:00 2001
From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 19:46:53 +0300
Subject: [PATCH 1/7] Roadmap (#307)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Окно, но не прототип

* Рабочий прототип роадмапа

* Контрол

* Потом доделаю

* Пустой Roadmap

* Готова

---------

Co-authored-by: BL02DL <164734444+BL02DL@users.noreply.github.com>
---
 Content.Client/Info/LinkBanner.cs             | 12 ++-
 Content.Client/Options/UI/EscapeMenu.xaml     |  1 +
 .../Systems/EscapeMenu/EscapeUIController.cs  |  9 +-
 .../_LostParadise/Roadmap/RoadmapControl.cs   | 96 +++++++++++++++++++
 .../_LostParadise/Roadmap/RoadmapUI.cs        | 81 ++++++++++++++++
 .../_LostParadise/Roadmap/RoadmapSystem.cs    | 34 +++++++
 .../_LostParadise/Roadmap/RoadmapComponent.cs | 18 ++++
 .../_LostParadise/Roadmap/RoadmapPrototype.cs | 26 +++++
 .../Roadmap/RoadmapUpdateEvent.cs             | 16 ++++
 .../ru-RU/_LostParadise/roadmap/roadmap.ftl   |  7 ++
 .../_LostParadise/Roadmap/roadmap.yml         | 27 ++++++
 11 files changed, 325 insertions(+), 2 deletions(-)
 create mode 100644 Content.Client/_LostParadise/Roadmap/RoadmapControl.cs
 create mode 100644 Content.Client/_LostParadise/Roadmap/RoadmapUI.cs
 create mode 100644 Content.Server/_LostParadise/Roadmap/RoadmapSystem.cs
 create mode 100644 Content.Shared/_LostParadise/Roadmap/RoadmapComponent.cs
 create mode 100644 Content.Shared/_LostParadise/Roadmap/RoadmapPrototype.cs
 create mode 100644 Content.Shared/_LostParadise/Roadmap/RoadmapUpdateEvent.cs
 create mode 100644 Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl
 create mode 100644 Resources/Prototypes/_LostParadise/Roadmap/roadmap.yml

diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs
index a30aa413761..f9c4a1ba76d 100644
--- a/Content.Client/Info/LinkBanner.cs
+++ b/Content.Client/Info/LinkBanner.cs
@@ -1,4 +1,6 @@
-using Content.Client.Changelog;
+using Content.Client._LostParadise.Roadmap;
+using Content.Client.Changelog;
+using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.EscapeMenu;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
@@ -47,6 +49,14 @@ public LinkBanner()
             changelogButton.OnPressed += args => UserInterfaceManager.GetUIController<ChangelogUIController>().ToggleWindow();
             buttons.AddChild(changelogButton);
 
+            var roadmapButton = new Button
+            {
+                Text = Loc.GetString("server-info-roadmap-button"),
+                StyleClasses = { StyleBase.ButtonCaution },
+            };
+            roadmapButton.OnPressed += _ => UserInterfaceManager.GetUIController<RoadmapUI>().ToggleRoadmap();
+            buttons.AddChild(roadmapButton);
+
             void AddInfoButton(string loc, CVarDef<string> cVar)
             {
                 var button = new Button { Text = Loc.GetString(loc) };
diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml
index c84954be649..5226be5f58c 100644
--- a/Content.Client/Options/UI/EscapeMenu.xaml
+++ b/Content.Client/Options/UI/EscapeMenu.xaml
@@ -6,6 +6,7 @@
             Resizable="False">
 
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="150">
+        <Button Access="Public" Name="RoadmapButton" Text="{Loc 'ui-roadmap'}" StyleClasses="Caution" />
         <changelog:ChangelogButton Access="Public" Name="ChangelogButton"/>
         <ui:VoteCallMenuButton />
         <Button Access="Public" Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
index 7d14dcb7b14..9051289871c 100644
--- a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
+++ b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
@@ -1,4 +1,5 @@
-using Content.Client.Gameplay;
+using Content.Client._LostParadise.Roadmap;
+using Content.Client.Gameplay;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Client.UserInterface.Systems.Info;
@@ -63,6 +64,12 @@ public void OnStateEntered(GameplayState state)
         _escapeWindow.OnClose += DeactivateButton;
         _escapeWindow.OnOpen += ActivateButton;
 
+        _escapeWindow.RoadmapButton.OnPressed += _ =>
+        {
+            CloseEscapeWindow();
+            UIManager.GetUIController<RoadmapUI>().ToggleRoadmap();
+        };
+
         _escapeWindow.ChangelogButton.OnPressed += _ =>
         {
             CloseEscapeWindow();
diff --git a/Content.Client/_LostParadise/Roadmap/RoadmapControl.cs b/Content.Client/_LostParadise/Roadmap/RoadmapControl.cs
new file mode 100644
index 00000000000..c436740452b
--- /dev/null
+++ b/Content.Client/_LostParadise/Roadmap/RoadmapControl.cs
@@ -0,0 +1,96 @@
+using Content.Shared._LostParadise.Roadmap;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface;
+using System.Numerics;
+
+namespace Content.Client._LostParadise.Roadmap
+{
+    public class RoadmapControl : Control
+    {
+        private readonly RoadmapPrototype _prototype;
+        private readonly ProgressBar _progressBar;
+
+        public RoadmapControl(RoadmapPrototype prototype)
+        {
+            _prototype = prototype;
+            _progressBar = new ProgressBar
+            {
+                MinValue = 0,
+                MaxValue = 100,
+                Value = _prototype.Progress,
+                HorizontalExpand = true
+            };
+
+            SetupUI();
+        }
+
+        private void SetupUI()
+        {
+            Margin = new Thickness(0, 20, 0, 0);
+
+            var vBox = new BoxContainer
+            {
+                Orientation = BoxContainer.LayoutOrientation.Vertical
+            };
+
+            var nameButton = new Button
+            {
+                Text = _prototype.Name,
+                StyleClasses = { "Caution" },
+                HorizontalExpand = true
+            };
+
+            vBox.AddChild(nameButton);
+
+            var descriptionLabel = new Label { Text = _prototype.Description, FontColorOverride = Color.LightGray };
+            var progressLabel = new Label
+            { 
+                Text = Loc.GetString("roadmap-progress") + $": {_prototype.Progress}%",
+                FontColorOverride = Color.White
+            };
+
+            var statusBox = new BoxContainer
+            {
+                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+                SeparationOverride = 5
+            };
+
+            var statusLabel = new Label
+            {
+                Text = Loc.GetString("roadmap-status") + $": {Loc.GetString(_prototype.Status)}",
+                FontColorOverride = GetStatusColor(),
+            };
+
+            statusBox.AddChild(statusLabel);
+            statusBox.AddChild(new Control { HorizontalExpand = true });
+
+            vBox.AddChild(descriptionLabel);
+            vBox.AddChild(progressLabel);
+            vBox.AddChild(_progressBar);
+            vBox.AddChild(statusBox);
+
+            var separator = new PanelContainer
+            {
+                Modulate = new Color(0.5f, 0.5f, 0.5f, 1f),
+                MinSize = new Vector2(0, 2),
+                HorizontalExpand = true
+            };
+            vBox.AddChild(separator);
+
+            AddChild(vBox);
+        }
+
+        private Color GetStatusColor()
+        {
+            string status = _prototype.Status;
+            return status switch
+            {
+                "roadmap-goal-completed" => new Color(0.0f, 1.0f, 0.0f),
+                "roadmap-goal-progress" => new Color(1.0f, 1.0f, 0.0f),
+                "roadmap-goal-waiting" => new Color(1.0f, 0.5f, 0.0f),
+                _ => Color.White
+            };
+        }
+    }
+}
diff --git a/Content.Client/_LostParadise/Roadmap/RoadmapUI.cs b/Content.Client/_LostParadise/Roadmap/RoadmapUI.cs
new file mode 100644
index 00000000000..12fbfcede69
--- /dev/null
+++ b/Content.Client/_LostParadise/Roadmap/RoadmapUI.cs
@@ -0,0 +1,81 @@
+using Content.Shared._LostParadise.Roadmap;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface;
+using Robust.Shared.IoC;
+using Robust.Shared.Prototypes;
+using System.Numerics;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.Controllers;
+using System.Linq;
+
+namespace Content.Client._LostParadise.Roadmap
+{
+    public sealed class RoadmapUI : UIController
+    {
+        private DefaultWindow _roadmapWindow;
+
+        public RoadmapUI()
+        {
+            _roadmapWindow = new DefaultWindow
+            {
+                Title = Loc.GetString("roadmap-plan-LLP"),
+                SetSize = new Vector2(600, 600),
+                Resizable = false
+            };
+
+            var panelContainer = new PanelContainer
+            {
+                MinSize = new Vector2(580, 580),
+                ModulateSelfOverride = Color.Transparent,
+                Margin = new Thickness(10)
+            };
+
+            var scrollContainer = new ScrollContainer
+            {
+                HorizontalExpand = true,
+                VerticalExpand = true,
+                Margin = new Thickness(0, 20, 0, 0)
+            };
+
+            var phaseList = new BoxContainer
+            {
+                Orientation = BoxContainer.LayoutOrientation.Vertical,
+                SeparationOverride = 10
+            };
+
+            scrollContainer.AddChild(phaseList);
+            panelContainer.AddChild(scrollContainer);
+            _roadmapWindow.AddChild(panelContainer);
+
+            RefreshUI(phaseList);
+        }
+
+        private void RefreshUI(BoxContainer phaseList)
+        {
+            phaseList.RemoveAllChildren();
+
+            var roadmapSystem = IoCManager.Resolve<IPrototypeManager>();
+
+            var roadmapPhases = roadmapSystem.EnumeratePrototypes<RoadmapPrototype>()
+                                            .OrderBy<RoadmapPrototype, int>(phase => phase.Order);
+
+            foreach (var phase in roadmapPhases)
+            {
+                var phaseControl = new RoadmapControl(phase);
+                phaseList.AddChild(phaseControl);
+            }
+        }
+
+        public void ToggleRoadmap()
+        {
+            if (_roadmapWindow.IsOpen)
+            {
+                _roadmapWindow.Close();
+            }
+            else
+            {
+                _roadmapWindow.OpenCentered();
+            }
+        }
+    }
+}
diff --git a/Content.Server/_LostParadise/Roadmap/RoadmapSystem.cs b/Content.Server/_LostParadise/Roadmap/RoadmapSystem.cs
new file mode 100644
index 00000000000..1c337b8a20c
--- /dev/null
+++ b/Content.Server/_LostParadise/Roadmap/RoadmapSystem.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared._LostParadise.Roadmap;
+using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Log;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._LostParadise.Roadmap
+{
+    public class RoadmapSystem : EntitySystem
+    {
+        [Dependency] private readonly IPrototypeManager _protoManager = default!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+            SubscribeLocalEvent<RoadmapComponent, RoadmapUpdateEvent>(OnPhaseUpdate);
+        }
+
+        private void OnPhaseUpdate(EntityUid uid, RoadmapComponent component, RoadmapUpdateEvent args)
+        {
+            if (!_protoManager.TryIndex<RoadmapPrototype>(args.RoadmapId, out var phase))
+            {
+                Logger.ErrorS("roadmap", $"Roadmap {args.RoadmapId} not found.");
+                return;
+            }
+
+            component.CurrentPhase = phase.ID;
+            component.Progress = args.NewProgress;
+
+            Dirty(uid, component);
+        }
+    }
+}
diff --git a/Content.Shared/_LostParadise/Roadmap/RoadmapComponent.cs b/Content.Shared/_LostParadise/Roadmap/RoadmapComponent.cs
new file mode 100644
index 00000000000..22672169e19
--- /dev/null
+++ b/Content.Shared/_LostParadise/Roadmap/RoadmapComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Shared._LostParadise.Roadmap
+{
+    [RegisterComponent]
+    public sealed partial class RoadmapComponent : Component
+    {
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("roadmap")]
+        public string CurrentPhase { get; set; } = string.Empty;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField("progress")]
+        public float Progress { get; set; } = 0.0f;
+    }
+}
diff --git a/Content.Shared/_LostParadise/Roadmap/RoadmapPrototype.cs b/Content.Shared/_LostParadise/Roadmap/RoadmapPrototype.cs
new file mode 100644
index 00000000000..f4ba5e409fd
--- /dev/null
+++ b/Content.Shared/_LostParadise/Roadmap/RoadmapPrototype.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.Manager.Attributes;
+
+namespace Content.Shared._LostParadise.Roadmap
+{
+    [Prototype("roadmap")]
+    public class RoadmapPrototype : IPrototype
+    {
+        [IdDataField]
+        public string ID { get; } = default!;
+
+        [DataField("name")]
+        public string Name { get; } = string.Empty;
+
+        [DataField("description")]
+        public string Description { get; } = string.Empty;
+
+        [DataField("progress")]
+        public float Progress { get; set; } = 0.0f;
+
+        [DataField("status")]
+        public string Status { get; set; } = "roadmap-goal-waiting";
+        [DataField("order")]
+        public int Order { get; set; }
+    }
+}
diff --git a/Content.Shared/_LostParadise/Roadmap/RoadmapUpdateEvent.cs b/Content.Shared/_LostParadise/Roadmap/RoadmapUpdateEvent.cs
new file mode 100644
index 00000000000..03596192224
--- /dev/null
+++ b/Content.Shared/_LostParadise/Roadmap/RoadmapUpdateEvent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameObjects;
+
+namespace Content.Shared._LostParadise.Roadmap
+{
+    public sealed class RoadmapUpdateEvent : EntityEventArgs
+    {
+        public string RoadmapId { get; }
+        public float NewProgress { get; }
+
+        public RoadmapUpdateEvent(string roadmapId, float newProgress)
+        {
+            RoadmapId = roadmapId;
+            NewProgress = newProgress;
+        }
+    }
+}
diff --git a/Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl b/Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl
new file mode 100644
index 00000000000..8f321ca0fb0
--- /dev/null
+++ b/Resources/Locale/ru-RU/_LostParadise/roadmap/roadmap.ftl
@@ -0,0 +1,7 @@
+ui-roadmap = План разработки
+roadmap-plan-LLP = План разработки Lost Paradise
+roadmap-goal-completed = Завершено
+roadmap-goal-progress = В процессе
+roadmap-goal-waiting = В ожидании
+roadmap-progress = Прогресс
+roadmap-status = Статус
\ No newline at end of file
diff --git a/Resources/Prototypes/_LostParadise/Roadmap/roadmap.yml b/Resources/Prototypes/_LostParadise/Roadmap/roadmap.yml
new file mode 100644
index 00000000000..5db256660d3
--- /dev/null
+++ b/Resources/Prototypes/_LostParadise/Roadmap/roadmap.yml
@@ -0,0 +1,27 @@
+# Короче, думаю тут всё понятно, однако в status 
+# пихайте: roadmap-goal-completed, roadmap-goal-progress, roadmap-goal-waiting
+# Order нужен, чтоб выставить в правильном порядке, так что вот, пользуйтесь
+
+- type: roadmap
+  id: "helloworld"
+  name: "Версия 2.0 - Дивный новый мир!"
+  description: "Новая сборка и механики!"
+  progress: 100
+  status: roadmap-goal-completed
+  order: 0
+
+- type: roadmap
+  id: "centcom"
+  name: "Обновление 2.1 - Центком важен!"
+  description: "Обновление Центкома!"
+  progress: 50
+  status: roadmap-goal-progress
+  order: 1
+
+- type: roadmap
+  id: "blusec"
+  name: "Обновление 2.2 - BLUSEC!"
+  description: "Перекрас СБ в новый модный цвет!"
+  progress: 37
+  status: roadmap-goal-progress
+  order: 2
\ No newline at end of file

From 89f5a7355163bacb8e4b4a000c7a39592a847722 Mon Sep 17 00:00:00 2001
From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com>
Date: Fri, 1 Nov 2024 19:47:09 +0300
Subject: [PATCH 2/7] Tet-a-tet (#313)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Tet-a-tet

* Фиксы тестов

* фиксы...
---
 Content.Client/Chat/Managers/ChatManager.cs   |  4 ++
 Content.Client/Chat/UI/SpeechBubble.cs        |  4 ++
 Content.Client/Input/ContentContexts.cs       |  1 +
 .../Options/UI/Tabs/KeyRebindTab.xaml.cs      |  1 +
 .../Systems/Chat/ChatUIController.cs          | 11 ++++
 .../Chat/Controls/ChannelFilterPopup.xaml.cs  |  1 +
 .../Chat/Controls/ChannelSelectorPopup.cs     |  1 +
 .../Chat/Commands/HiddenMeCommand.cs          | 44 +++++++++++++
 Content.Server/Chat/Systems/ChatSystem.cs     | 61 ++++++++++++++++++-
 Content.Shared/Chat/ChatChannel.cs            | 21 ++++---
 Content.Shared/Chat/ChatSelectChannel.cs      |  7 ++-
 Content.Shared/Chat/SharedChatSystem.cs       |  2 +
 Content.Shared/Input/ContentKeyFunctions.cs   |  1 +
 Resources/Locale/en-US/chat/ui/chat-box.ftl   |  2 +
 Resources/Locale/ru-RU/chat/ui/chat-box.ftl   |  2 +
 15 files changed, 153 insertions(+), 10 deletions(-)
 create mode 100644 Content.Server/Chat/Commands/HiddenMeCommand.cs

diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
index 18f03cd7db0..8f1261034c8 100644
--- a/Content.Client/Chat/Managers/ChatManager.cs
+++ b/Content.Client/Chat/Managers/ChatManager.cs
@@ -47,6 +47,10 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(str)}\"");
                     break;
 
+                case ChatSelectChannel.HiddenEmotes:
+                    _consoleHost.ExecuteCommand($"hme \"{CommandParsing.Escape(str)}\"");
+                    break;
+
                 case ChatSelectChannel.Dead:
                     if (_systems.GetEntitySystemOrNull<GhostSystem>() is {IsGhost: true})
                         goto case ChatSelectChannel.Local;
diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
index 68c937a7885..e1127307e30 100644
--- a/Content.Client/Chat/UI/SpeechBubble.cs
+++ b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -20,6 +20,7 @@ public abstract class SpeechBubble : Control
         public enum SpeechType : byte
         {
             Emote,
+            HiddenEmote,
             Say,
             Whisper,
             Looc
@@ -65,6 +66,9 @@ public static SpeechBubble CreateSpeechBubble(SpeechType type, ChatMessage messa
                 case SpeechType.Emote:
                     return new TextSpeechBubble(message, senderEntity, "emoteBox");
 
+                case SpeechType.HiddenEmote:
+                    return new TextSpeechBubble(message, senderEntity, "emoteBox", Color.FromHex("#ffd29e"));
+
                 case SpeechType.Say:
                     return new FancyTextSpeechBubble(message, senderEntity, "sayBox");
 
diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index 9a49c4e28c1..675330b0ebc 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -15,6 +15,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             common.AddFunction(ContentKeyFunctions.FocusChat);
             common.AddFunction(ContentKeyFunctions.FocusLocalChat);
             common.AddFunction(ContentKeyFunctions.FocusEmote);
+            common.AddFunction(ContentKeyFunctions.FocusHiddenEmote);
             common.AddFunction(ContentKeyFunctions.FocusWhisperChat);
             common.AddFunction(ContentKeyFunctions.FocusRadio);
             common.AddFunction(ContentKeyFunctions.FocusLOOC);
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index cb76a7d8912..165085657a9 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -232,6 +232,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.FocusChat);
             AddButton(ContentKeyFunctions.FocusLocalChat);
             AddButton(ContentKeyFunctions.FocusEmote);
+            AddButton(ContentKeyFunctions.FocusHiddenEmote);
             AddButton(ContentKeyFunctions.FocusWhisperChat);
             AddButton(ContentKeyFunctions.FocusRadio);
             AddButton(ContentKeyFunctions.FocusLOOC);
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index bc79283d76e..4ccb54cfbf0 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -78,6 +78,7 @@ public sealed class ChatUIController : UIController
         {SharedChatSystem.OOCPrefix, ChatSelectChannel.OOC},
         {SharedChatSystem.EmotesPrefix, ChatSelectChannel.Emotes},
         {SharedChatSystem.EmotesAltPrefix, ChatSelectChannel.Emotes},
+        {SharedChatSystem.HiddenEmotesPrefix, ChatSelectChannel.HiddenEmotes},
         {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin},
         {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio},
         {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead},
@@ -92,6 +93,7 @@ public sealed class ChatUIController : UIController
         {ChatSelectChannel.LOOC, SharedChatSystem.LOOCPrefix},
         {ChatSelectChannel.OOC, SharedChatSystem.OOCPrefix},
         {ChatSelectChannel.Emotes, SharedChatSystem.EmotesPrefix},
+        {ChatSelectChannel.HiddenEmotes, SharedChatSystem.HiddenEmotesPrefix},
         {ChatSelectChannel.Admin, SharedChatSystem.AdminPrefix},
         {ChatSelectChannel.Radio, SharedChatSystem.RadioCommonPrefix},
         {ChatSelectChannel.Dead, SharedChatSystem.DeadPrefix},
@@ -199,6 +201,9 @@ public override void Initialize()
         _input.SetInputCommand(ContentKeyFunctions.FocusEmote,
             InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Emotes)));
 
+        _input.SetInputCommand(ContentKeyFunctions.FocusHiddenEmote,
+            InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.HiddenEmotes)));
+
         _input.SetInputCommand(ContentKeyFunctions.FocusWhisperChat,
             InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Whisper)));
 
@@ -529,6 +534,7 @@ private void UpdateChannelPermissions()
             FilterableChannels |= ChatChannel.Whisper;
             FilterableChannels |= ChatChannel.Radio;
             FilterableChannels |= ChatChannel.Emotes;
+            FilterableChannels |= ChatChannel.HiddenEmotes;
             FilterableChannels |= ChatChannel.Notifications;
 
             // Can only send local / radio / emote when attached to a non-ghost entity.
@@ -539,6 +545,7 @@ private void UpdateChannelPermissions()
                 CanSendChannels |= ChatSelectChannel.Whisper;
                 CanSendChannels |= ChatSelectChannel.Radio;
                 CanSendChannels |= ChatSelectChannel.Emotes;
+                CanSendChannels |= ChatSelectChannel.HiddenEmotes;
             }
         }
 
@@ -875,6 +882,10 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
                 AddSpeechBubble(msg, SpeechBubble.SpeechType.Emote);
                 break;
 
+            case ChatChannel.HiddenEmotes:
+                AddSpeechBubble(msg, SpeechBubble.SpeechType.HiddenEmote);
+                break;
+
             case ChatChannel.LOOC:
                 if (_config.GetCVar(CCVars.LoocAboveHeadShow))
                     AddSpeechBubble(msg, SpeechBubble.SpeechType.Looc);
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
index 1d2a4314462..5e451260d19 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
@@ -15,6 +15,7 @@ public sealed partial class ChannelFilterPopup : Popup
         ChatChannel.Local,
         ChatChannel.Whisper,
         ChatChannel.Emotes,
+        ChatChannel.HiddenEmotes,
         ChatChannel.Radio,
         ChatChannel.Telepathic, //Nyano - Summary: adds telepathic chat to where it belongs in order in the chat.
         ChatChannel.Notifications,
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs
index c1f3559d793..74c35354459 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelSelectorPopup.cs
@@ -12,6 +12,7 @@ public sealed class ChannelSelectorPopup : Popup
         ChatSelectChannel.Local,
         ChatSelectChannel.Whisper,
         ChatSelectChannel.Emotes,
+        ChatSelectChannel.HiddenEmotes,
         ChatSelectChannel.Radio,
         ChatSelectChannel.Telepathic, //Nyano - Summary: determines the order in which telepathic shows. 
         ChatSelectChannel.LOOC,
diff --git a/Content.Server/Chat/Commands/HiddenMeCommand.cs b/Content.Server/Chat/Commands/HiddenMeCommand.cs
new file mode 100644
index 00000000000..43434a79b55
--- /dev/null
+++ b/Content.Server/Chat/Commands/HiddenMeCommand.cs
@@ -0,0 +1,44 @@
+using Content.Server.Chat.Systems;
+using Content.Shared.Administration;
+using Content.Shared.Chat;
+using Robust.Shared.Console;
+using Robust.Shared.Enums;
+
+namespace Content.Server.Chat.Commands
+{
+    [AnyCommand]
+    internal sealed class HiddenMeCommand : IConsoleCommand
+    {
+        public string Command => "hme";
+        public string Description => "Perform an action.";
+        public string Help => "hme <text>";
+
+    public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (shell.Player is not { } player)
+            {
+                shell.WriteError("This command cannot be run from the server.");
+                return;
+            }
+
+            if (player.Status != SessionStatus.InGame)
+                return;
+
+            if (player.AttachedEntity is not {} playerEntity)
+            {
+                shell.WriteError("You don't have an entity!");
+                return;
+            }
+
+            if (args.Length < 1)
+                return;
+
+            var message = string.Join(" ", args).Trim();
+            if (string.IsNullOrEmpty(message))
+                return;
+
+            IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>()
+                .TrySendInGameICMessage(playerEntity, message, InGameICChatType.HiddenEmote, ChatTransmitRange.GhostRangeLimit, false, shell, player);
+        }
+    }
+}
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 73490afd26d..3908bca7f2b 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -229,7 +229,7 @@ public void TrySendInGameICMessage(
 
         var language = languageOverride ?? _language.GetLanguage(source);
 
-        bool shouldCapitalize = (desiredType != InGameICChatType.Emote);
+        bool shouldCapitalize = (desiredType != InGameICChatType.Emote && desiredType != InGameICChatType.HiddenEmote);
         bool shouldPunctuate = _configurationManager.GetCVar(CCVars.ChatPunctuation);
         // Capitalizing the word I only happens in English, so we check language here
         bool shouldCapitalizeTheWordI = (!CultureInfo.CurrentCulture.IsNeutralCulture && CultureInfo.CurrentCulture.Parent.Name == "en")
@@ -273,6 +273,9 @@ public void TrySendInGameICMessage(
             case InGameICChatType.Emote:
                 SendEntityEmote(source, message, range, nameOverride, language, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
                 break;
+            case InGameICChatType.HiddenEmote:
+                SendHiddenEntityEmote(source, message, range, nameOverride, language, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
+                break;
             //Nyano - Summary: case adds the telepathic chat sending ability.
             case InGameICChatType.Telepathic:
                 _telepath.SendTelepathicChat(source, message, range == ChatTransmitRange.HideChat);
@@ -601,6 +604,62 @@ private void SendEntityEmote(
                 _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user}: {action}");
     }
 
+
+    private void SendHiddenEntityEmote(
+        EntityUid source,
+        string action,
+        ChatTransmitRange range,
+        string? nameOverride,
+        LanguagePrototype language,
+        bool hideLog = false,
+        bool checkEmote = true,
+        bool ignoreActionBlocker = false
+        )
+    {
+        if (!_actionBlocker.CanEmote(source) && !ignoreActionBlocker)
+            return;
+
+        var ent = Identity.Entity(source, EntityManager);
+        string name = FormattedMessage.EscapeText(nameOverride ?? Name(ent));
+
+        var coloredName = $"[color=#FFD29E]{name}[/color]";
+        var coloredAction = $"[color=#FFD29E]{FormattedMessage.RemoveMarkup(action)}[/color]";
+
+        string wrappedMessage = Loc.GetString("chat-manager-entity-me-wrap-message",
+                ("entityName", coloredName),
+                ("entity", ent),
+                ("message", coloredAction));
+
+
+        if (checkEmote)
+            TryEmoteChatInput(source, action);
+
+        float hiddenEmoteRange = 2;
+
+        foreach (var (session, data) in GetRecipients(source, hiddenEmoteRange))
+        {
+            if (session.AttachedEntity is not { Valid: true } listener)
+                continue;
+
+            if (Transform(session.AttachedEntity.Value).GridUid != Transform(source).GridUid
+                && !CheckAttachedGrids(source, session.AttachedEntity.Value))
+                continue;
+
+            if (data.Range <= hiddenEmoteRange)
+            {
+                _chatManager.ChatMessageToOne(ChatChannel.HiddenEmotes, action, wrappedMessage, source, false, session.Channel);
+            }
+        }
+
+        if (!hideLog)
+            if (name != Name(source))
+                _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Hidden emote from {ToPrettyString(source):user} as {name}: {action}");
+            else
+                _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Hidden emote from {ToPrettyString(source):user}: {action}");
+    }
+
+
+
     // ReSharper disable once InconsistentNaming
     private void SendLOOC(EntityUid source, ICommonSession player, string message, bool hideChat)
     {
diff --git a/Content.Shared/Chat/ChatChannel.cs b/Content.Shared/Chat/ChatChannel.cs
index e3810342b65..801f72130d3 100644
--- a/Content.Shared/Chat/ChatChannel.cs
+++ b/Content.Shared/Chat/ChatChannel.cs
@@ -4,7 +4,7 @@ namespace Content.Shared.Chat
     ///     Represents chat channels that the player can filter chat tabs by.
     /// </summary>
     [Flags, Serializable]
-    public enum ChatChannel : ushort
+    public enum ChatChannel : uint
     {
         None = 0,
 
@@ -60,40 +60,45 @@ public enum ChatChannel : ushort
         /// </summary>
         Emotes = 1 << 9,
 
+        /// <summary>
+        ///     HiddenEmotes
+        /// </summary>
+        HiddenEmotes = 1 << 10,
+
         /// <summary>
         ///     Deadchat
         /// </summary>
-        Dead = 1 << 10,
+        Dead = 1 << 11,
 
         /// <summary>
         ///     Misc admin messages
         /// </summary>
-        Admin = 1 << 11,
+        Admin = 1 << 12,
 
         /// <summary>
         ///     Admin alerts, messages likely of elevated importance to admins
         /// </summary>
-        AdminAlert = 1 << 12,
+        AdminAlert = 1 << 13,
 
         /// <summary>
         ///     Admin chat
         /// </summary>
-        AdminChat = 1 << 13,
+        AdminChat = 1 << 14,
 
         /// <summary>
         ///     Unspecified.
         /// </summary>
-        Unspecified = 1 << 14,
+        Unspecified = 1 << 15,
 
         /// <summary>
         ///     Nyano - Summary:: Telepathic channel for all psionic entities.
         /// </summary>
-        Telepathic = 1 << 15,
+        Telepathic = 1 << 16,
 
         /// <summary>
         ///     Channels considered to be IC.
         /// </summary>
-        IC = Local | Whisper | Radio | Dead | Emotes | Damage | Visual | Telepathic | Notifications, //Nyano - Summary: Adds telepathic as an 'IC' labelled chat..
+        IC = Local | Whisper | Radio | Dead | Emotes | HiddenEmotes | Damage | Visual | Telepathic | Notifications, //Nyano - Summary: Adds telepathic as an 'IC' labelled chat..
 
         AdminRelated = Admin | AdminAlert | AdminChat,
     }
diff --git a/Content.Shared/Chat/ChatSelectChannel.cs b/Content.Shared/Chat/ChatSelectChannel.cs
index 5104bbc3068..972d588598d 100644
--- a/Content.Shared/Chat/ChatSelectChannel.cs
+++ b/Content.Shared/Chat/ChatSelectChannel.cs
@@ -7,7 +7,7 @@
     ///     Maps to <see cref="ChatChannel"/>, giving better names.
     /// </remarks>
     [Flags]
-    public enum ChatSelectChannel : ushort
+    public enum ChatSelectChannel : uint
     {
         None = 0,
 
@@ -41,6 +41,11 @@ public enum ChatSelectChannel : ushort
         /// </summary>
         Emotes = ChatChannel.Emotes,
 
+        /// <summary>
+        ///     HiddenEmotes
+        /// </summary>
+        HiddenEmotes = ChatChannel.HiddenEmotes,
+
         /// <summary>
         ///     Deadchat
         /// </summary>
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 3ea02a30f7f..bb61f920ec6 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -20,6 +20,7 @@ public abstract class SharedChatSystem : EntitySystem
     public const char OOCPrefix = '[';
     public const char EmotesPrefix = '%'; // Corvax-Localization
     public const char EmotesAltPrefix = '*';
+    public const char HiddenEmotesPrefix = '+';
     public const char AdminPrefix = ']';
     public const char WhisperPrefix = ',';
     public const char TelepathicPrefix = '='; //Nyano - Summary: Adds the telepathic channel's prefix.
@@ -265,6 +266,7 @@ public enum InGameICChatType : byte
 {
     Speak,
     Emote,
+    HiddenEmote,
     Whisper,
     Telepathic
 }
diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs
index 79bc474189c..416fa900abc 100644
--- a/Content.Shared/Input/ContentKeyFunctions.cs
+++ b/Content.Shared/Input/ContentKeyFunctions.cs
@@ -14,6 +14,7 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction FocusChat = "FocusChatInputWindow";
         public static readonly BoundKeyFunction FocusLocalChat = "FocusLocalChatWindow";
         public static readonly BoundKeyFunction FocusEmote = "FocusEmote";
+        public static readonly BoundKeyFunction FocusHiddenEmote = "FocusHiddenEmote";
         public static readonly BoundKeyFunction FocusWhisperChat = "FocusWhisperChatWindow";
         public static readonly BoundKeyFunction FocusRadio = "FocusRadioWindow";
         public static readonly BoundKeyFunction FocusLOOC = "FocusLOOCWindow";
diff --git a/Resources/Locale/en-US/chat/ui/chat-box.ftl b/Resources/Locale/en-US/chat/ui/chat-box.ftl
index 720f0d15ab4..c2feb3e3a8e 100644
--- a/Resources/Locale/en-US/chat/ui/chat-box.ftl
+++ b/Resources/Locale/en-US/chat/ui/chat-box.ftl
@@ -8,6 +8,7 @@ hud-chatbox-select-channel-Admin = Admin
 hud-chatbox-select-channel-Console = Console
 hud-chatbox-select-channel-Dead = Dead
 hud-chatbox-select-channel-Emotes = Emotes
+hud-chatbox-select-channel-HiddenEmotes = Tet-a-tet
 hud-chatbox-select-channel-Local = Local
 hud-chatbox-select-channel-Whisper = Whisper
 hud-chatbox-select-channel-LOOC = LOOC
@@ -21,6 +22,7 @@ hud-chatbox-channel-AdminAlert = Admin Alert
 hud-chatbox-channel-AdminChat = Admin Chat
 hud-chatbox-channel-Dead = Dead
 hud-chatbox-channel-Emotes = Emotes
+hud-chatbox-channel-HiddenEmotes = Tet-a-tet
 hud-chatbox-channel-Local = Local
 hud-chatbox-channel-Whisper = Whisper
 hud-chatbox-channel-LOOC = LOOC
diff --git a/Resources/Locale/ru-RU/chat/ui/chat-box.ftl b/Resources/Locale/ru-RU/chat/ui/chat-box.ftl
index dda8ff1aec2..98028ab871d 100644
--- a/Resources/Locale/ru-RU/chat/ui/chat-box.ftl
+++ b/Resources/Locale/ru-RU/chat/ui/chat-box.ftl
@@ -7,6 +7,7 @@ hud-chatbox-select-channel-Admin = Админ
 hud-chatbox-select-channel-Console = Консоль
 hud-chatbox-select-channel-Dead = Мёртвые
 hud-chatbox-select-channel-Emotes = Эмоции
+hud-chatbox-select-channel-HiddenEmotes = Тет-а-тет
 hud-chatbox-select-channel-Local = Рядом
 hud-chatbox-select-channel-Whisper = Шёпот
 hud-chatbox-select-channel-LOOC = LOOC
@@ -19,6 +20,7 @@ hud-chatbox-channel-AdminAlert = Админ Уведомления
 hud-chatbox-channel-AdminChat = Админ Чат
 hud-chatbox-channel-Dead = Мёртвые
 hud-chatbox-channel-Emotes = Эмоции
+hud-chatbox-channel-HiddenEmotes = Тет-а-тет
 hud-chatbox-channel-Local = Рядом
 hud-chatbox-channel-Whisper = Шёпот
 hud-chatbox-channel-LOOC = LOOC

From f5115e425779c8ea954f113b9eaa0740fa24f857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CLost-Paradise-Bot=E2=80=9D?=
 <172407741+Lost-Paradise-Bot@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:48:14 +0000
Subject: [PATCH 3/7] Automatic changelog update

---
 Resources/Changelog/ChangelogLPP.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
index 43c80a11966..52a8516f74b 100644
--- a/Resources/Changelog/ChangelogLPP.yml
+++ b/Resources/Changelog/ChangelogLPP.yml
@@ -2526,3 +2526,25 @@
   id: 136
   time: '2024-10-31T23:54:32.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/310
+- author: Farrellka
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0447\u0430\u0442\
+      \ Tet-a-tet! \u042D\u0442\u043E\u0442 \u0447\u0430\u0442 \u0440\u0430\u0431\u043E\
+      \u0442\u0430\u0435\u0442 \u043A\u0430\u043A \u0447\u0430\u0442 \u044D\u043C\u043E\
+      \u0446\u0438\u0439, \u043D\u043E \u0435\u0433\u043E \u0441\u043B\u044B\u0448\
+      \u043D\u043E \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u0440\u0430\u0434\u0438\
+      \u0443\u0441\u0435 \u0434\u0432\u0443\u0445 \u0442\u0430\u0439\u043B\u043E\u0432\
+      ."
+    type: Add
+  id: 137
+  time: '2024-11-01T16:47:09.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/313
+- author: Farrellka
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u043B\u0430\u043D\
+      \ \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u043A\u0438 Lost-Paradise\
+      \ \u0432 \u043C\u0435\u043D\u044E \u0438\u0433\u0440\u044B!"
+    type: Add
+  id: 138
+  time: '2024-11-01T16:46:53.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/307

From 96fd52538c2454330a98ea6a20135e1047dd8506 Mon Sep 17 00:00:00 2001
From: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
Date: Fri, 1 Nov 2024 19:52:29 +0300
Subject: [PATCH 4/7] Update launcher-connecting.ftl

---
 Resources/Locale/ru-RU/launcher/launcher-connecting.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/ru-RU/launcher/launcher-connecting.ftl b/Resources/Locale/ru-RU/launcher/launcher-connecting.ftl
index 66505c2afd2..babd9fcd172 100644
--- a/Resources/Locale/ru-RU/launcher/launcher-connecting.ftl
+++ b/Resources/Locale/ru-RU/launcher/launcher-connecting.ftl
@@ -10,7 +10,7 @@ connecting-in-progress = Подключение к серверу...
 connecting-disconnected = Отключён от сервера:
 connecting-tip = Играй РП!
 connecting-window-tip = Совет { $numberTip }
-connecting-version = версия 2.0
+connecting-version = Версия 2.0.6
 connecting-fail-reason =
     Не удалось подключиться к серверу:
     { $reason }

From 1c3a00f70a5016e01e37853934fa9f895ba908e9 Mon Sep 17 00:00:00 2001
From: DarkSide <mrdarkside1988@gmail.com>
Date: Fri, 1 Nov 2024 19:57:25 +0300
Subject: [PATCH 5/7] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=BE=D0=B9=20=D1=80=D0=B5=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD=D1=81?=
 =?UTF-8?q?=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0=20Secret=20(#315)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Ребаланс секрета

* Update secret_weights.yml

---------

Co-authored-by: DarkSide-droids <MY_NAME@example.com>
Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
---
 Resources/Prototypes/secret_weights.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml
index d0f437cfedc..a54cbbda685 100644
--- a/Resources/Prototypes/secret_weights.yml
+++ b/Resources/Prototypes/secret_weights.yml
@@ -1,8 +1,8 @@
 - type: weightedRandom
   id: Secret
   weights:
-    Survival: 0.44
-    Nukeops: 0.14
-    Zombie: 0.03
-    Traitor: 0.39
-    #Pirates: 0.15 #ahoy me bucko
+    Survival: 0.15
+    Nukeops: 0.20
+    Revolutionary: 0.15
+    Zombie: 0.20
+    Traitor: 0.30

From 439919e6125d31e49faedf488d5cc5e87c76c220 Mon Sep 17 00:00:00 2001
From: DarkSide <mrdarkside1988@gmail.com>
Date: Fri, 1 Nov 2024 19:58:12 +0300
Subject: [PATCH 6/7] =?UTF-8?q?=D0=92=D0=BE=D0=B4=D0=BE=D0=BB=D0=B0=D0=B7?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=9E=D1=84=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B5=D1=80=20=D0=A1=D0=B8=D0=BD=D0=B8=D0=B9=20=D0=A9=D0=B8?=
 =?UTF-8?q?=D1=82=20(#312)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: DarkSide-droids <MY_NAME@example.com>
---
 .../entities/clothing/uniforms/misc_roles.ftl |   2 ++
 .../Loadouts/Jobs/Heads/headOfPersonnel.yml   |   1 +
 .../Entities/Clothing/Uniforms/misc_roles.yml |  11 +++++++
 .../Loadouts/Jobs/blueshield.yml              |  13 ++++++++-
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 1682 bytes
 .../blueshield_turtleneck.rsi/icon.png        | Bin 0 -> 513 bytes
 .../blueshield_turtleneck.rsi/inhand-left.png | Bin 0 -> 783 bytes
 .../inhand-right.png                          | Bin 0 -> 848 bytes
 .../blueshield_turtleneck.rsi/meta.json       |  27 ++++++++++++++++++
 9 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/icon.png
 create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/meta.json

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/misc_roles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/misc_roles.ftl
index 6d350a74916..a4669006583 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/misc_roles.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/uniforms/misc_roles.ftl
@@ -3,3 +3,5 @@ ent-LPPArbiterclothing = Костюм Арбитра
     .suffix = Личные вещи
 ent-LPPClothingUniformJumpsuitBlueshield = Костюм офицера "Синий Щит"
     .desc = Это костюм человека высокого ранга.
+ent-LPPClothingUniformSkirtleneckBlueshield = Водолазка офицера "Синий Щит"
+    .desc = Это костюм человека высокого ранга.
\ No newline at end of file
diff --git a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
index 7bb265dd7b1..723e0c1b39c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Heads/headOfPersonnel.yml
@@ -31,6 +31,7 @@
     - !type:CharacterJobRequirement
       jobs:
         - HeadOfPersonnel
+        - LPPBlueShieldOfficer
   items:
     - ClothingUniformJumpsuitBoatswain
 
diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml
index 0e751585d58..4ab71a0905a 100644
--- a/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml
+++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/Uniforms/misc_roles.yml
@@ -27,3 +27,14 @@
     sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi
   - type: Clothing
     sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_suit.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: LPPClothingUniformSkirtleneckBlueshield
+  name: blueshield's skirtleneck
+  description: This is the costume of a man of high rank.
+  components:
+  - type: Sprite
+    sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi
+  - type: Clothing
+    sprite: _LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi
diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml
index 81d74172117..fe91b16c6d9 100644
--- a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml
+++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml
@@ -84,4 +84,15 @@
       jobs:
         - LPPBlueShieldOfficer
   items:
-    - MagazineMagnum
\ No newline at end of file
+    - MagazineMagnum
+
+- type: loadout
+  id: LoadoutCommandBSSkirtleneck
+  category: JobsCommand
+  cost: 0
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - LPPBlueShieldOfficer
+  items:
+    - LPPClothingUniformSkirtleneckBlueshield
\ No newline at end of file
diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c3e4aeb62e04ea8c6e15ec62a44030ab90b6b26
GIT binary patch
literal 1682
zcmV;D25tF?P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkUL`g(JRCt{2TFY+ZHWWRSB}WfSasrP%wbL;$7<ADtx}QzIyal?M
zeHT-p0g5(L$Kxo0W66?8J=ujVjUS0)Dt^o(2M8FEG|$!1C3z)Y!a2vc4C&Yg92?I9
z9NU0n<5_@X8*pqq3vg@$j*V|#0C`g*A>`hA%d&W*(ZFyxB;9V8`@Rp)^X~7w2XwpL
zwdid)9Nx?SSfEEXbyyXkAohJ9tyT++F{rAF+uK_-8jX#H>;jAY=jZ3h^Bj^SVK5jx
z$iFiI+U+*)^?Gn86WGlr+{px(x7)T2*L7jrHm<I&;5g3CMJV}Q7xj7_k|dP^<av%b
zj_>7vOn{A3V3E8~7(gk);&ma$ydU4C2<>*8o2FS_pPik7QVLDe%5pRsRpNhi5iFEf
z6a}v90zl~j#a|&t(cbIz&~CSP@|IQbFOClYnx-w4Rr$Bt1(GB|k|gkbf2rPXHc>x0
zDX&-CcZDp=kmvd4@i~X@`(TVAilVK@-Y7uf`dOB3eRD;>Mx*g$FKD;h+%OD8QG_4}
zW|f>{JRUFg^E|KoKTT6)S%!AIy%qnXYXD;mj4?QlLpBXquh#(pj^hwnmUs4%A&MeI
zQMAVIc^)jw!gxG}EPuKUQT~k{Pz=1y)0d=ALlylO4Xc93_*ZYf3jf9)Rrhqy^T?uG
zR>dLscNPlgdA_TmHiFF;xHL`6x-?D8dQk`qP;7xkDM`{S4mbcz)5M!MZvX(6WdQ(m
zT?YWPS}iQb3fn>`6gGQ5@ua4psjCRn9ENTn2m|P{gh|MtWC^BM@Ano8%VwMBbsewH
zU#+!$7<_;fhe)T6P$(?q0fw$4k10rf7JTrS0su%|LmpEY^QW;dD2fUIph=FwwS)gI
z|Ha_i0ZsCyb`b~(a5tIYy#E>iz<d|MbPDFrqObG*Yup`RDzr{paBm!N7D7=}a2CS7
zanL$#RT@u7fYW)%tJXM9YBHu*@5xC`hFarG?fXRI^bD45K~Yq&n+u{SDlFSV<Mgc3
zctQdMVF&=Alr7a4*G2mwkR)uWtP0^Zpg<hQOXX_&mja<sEeJ!PcDMGVi|a#pfPXiJ
zw-OnyUW-6TfP}gTGX?^HWV677WE3RM5yk<MxLPo>HGje|9XoS=Hs@y`F)$s6m8OG`
z0Bk%U41nHz$&0xo<tb8@BAkr&{!K8QIwZv`9$2hT5{AUPCcwkrF&~0ZAoL|-r-9Jd
zh-U$gZNRbdEWoi1I5wUIIJN=D#<Kv&HsIJ0{%-v_=M`3oT%SEa^aq3xbh}-yD9Tz}
zuh+x7cklN40`d0kTYhzQwN{@b2>=Ll3%?8%H(#8}a?U{r0i_g|mzM{5d+PW5T+_6Y
z8vrP!NRmW2K|*K>G@DJXC<;u|gk@Rfw|QBXVVWlT{r=t;h<?Anlq*o!VVWisMM1OK
z6tY2h4bU_Vx~{|XJPZZ{*tQME7;3fJ(pmk!psFflSuQg|27>`S&x5Y(mG~<yg0d`Q
zG#a5;2UJxBV+@qiD#Hn(;3-a{6-B{lG^%_M`=ni9aemphEtHs06;Twyw(Waur~+XD
zD5Yx&3ZDbU<8dVq6!sg}b<13w#S>a!IY(e$Smh{eD3YW^AtZop+vs#UWp>8u8T=uR
z$X7Wm%R;BqDYM1K<1r=zM|71QS)qDSGWN97nO)eh>W$k%NB~)uF`Z6vc6N4eX&6Q&
zBSc^r#u~Tlx@9T48wm9t`ZZ+scR2az0H^_eh=yUor79q6xXo$+{uVMo6n^6zwH$CM
zz&XJ`A6x)+3_p0VJKw__eH0o`I26`8KX9cc!?0%2m|>sd=H?buwh&+Zc92lG^Ybs9
zO#{4m(L&(f0RWP~Ll9@6*BAQ>g#mzGUywMsgC7Ji?9&+u3laVG>%mS@uK)O*D9J2u
z(6CS82LXI<vUc;^pwc49l~1R@d3^W<@IG!utrmtqY2z;3&oGRGAEOzDzGOpHR0^PV
zl0r2MXqpC+9VR{QKAeygn7;rqHmx*9B@c*V20sYO(38YLCGw{rnR8Q0;RgYtic_(Y
z2jq~TP#;9fLFp93%Rdi(j6CD~krMzC4Utrw%^SDDhhQ{casUVpkQ1;Co?=fW0lp@D
c^IwJk2N(BA%X>b}SO5S307*qoM6N<$f+v~q`v3p{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8905221e8fb53164208defbb79cafb47d9a679c3
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkPvq?ljR9J=WmS1b5KorG)V_Kb>fKx~nGKE5=-~VIm2gt(~LS7R{
z0*x>=Mt7Zk$e-QxVS6nNrH})nqn9(sd%Opg_nxmr@TI$71Y87M1biC-N~x10NfK|Z
z^-3wMwLVD_|F%X7B}u{q;b=7S0M0pv!y#2wp|xhUS}_<50GQ2Y3P75$VhhqV^;wpo
zqli4u!F#mU0OWa&)|xEKNYk`awqHp%KfED8v0jrHbFyaNrG1?TL_UZFSZgWElA<U8
zNQ~KSx<_IRMNu4|TWck>fY5@bX=s`T=iJHt#2CUTI<DV7mq65k@p!DVEE9R_oMSqj
zipN0w5iS;s|B{AbD60FgfOm<4k5P$(=v?@;4zz81yzU}cEFijj^6+;A59c5VPDb)j
zCxtkQqq`>`h9OPw8WU^EUoHK(&ujTgd=;=RE3SVx)OF2vIT7(fM+^FKOj~bI;SB)3
z-s}X1H?;MJejIn9>n`ABz2^Sm5rE1S%zyq+mD{D?{lg<K|5)+q0=CPEy4~l$?s>NJ
zX9cjGKP%nawfoi>w#!MUkr8`!E_{zaqKklwfOFyx)H9<TW?{JY00000NkvXXu0mjf
Di#g*j

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d8709e453b4c4caf9024f2931e7a92294635ae1
GIT binary patch
literal 783
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|V1R
zPZ!6KiaBp*1@>QZ5NY*~7Rxws;piHn+Ic^mk`BpFXsLg<+wkL6iTOMkDpwOFv?Z!)
zBW|Zg3V5-vTl`s7g;!Vo`Mi64p3m7_TK><RaGSy0jv<fv&JTtiyakV$ADA8J<!`_t
zXzdd6I#^-pl7|I99(<iN<<pXIzvch(W;_2|ThcIPQj5TgvfcdWI2E<TgI~lp-D1oU
zlXty%E_+o=!O2IA-q{DzJ}$nvLZ`$=E_nU*+czcKzf|p&JNCG6<<^ziligw)HM$ad
z8m~!tPC6jLtf{&+N>@jWTVtt0%Z=Nz?O)iM8Fi<7pGn)iE37=ont>r={dES0WS&VX
zj?+>*9!q$wtbYFb)!gP={SJv{r;SRiWHpv9*xDAvHP??la@yV9>-z3lZrH?@vG!t)
z*~Dd<9UM*^0)m%JTsPlrxpu4To+ZaCE_TNT1&$_l{kUfg1y?f?<~~31dC#6_zuV2P
zN4;L0|Ilvl`TTg+(7&>)&U>*72(COSqSzYo|4gH)Kv2g7rxhnfKL6ZP^#9!@Yxb}Z
z>E2_a3`Yv33-28JRv7x?d+zOP+8up=y)Buv`xzLv$lL3;PD=M*sCN0&Ecy6*p?P;>
ztCqizS#>^&p<Y`&k~!uW`+?jBX?ce2jCnN-ci47(WGs+=fJbmS^Np>Kb(SvCy8ZDS
z+lGAUSdPF<>w6~|{+UeJ7`2u`#(wgH6ovzLeGWb2IhbIupl*M^mN948w&VI|_enA_
zOidS>!^5z_eDZ@Q$_d442Tw9ER2y@id&ir1PC#e>(x>0ozIJD5IQsi~Y;w=P<=@%5
zC7UdEGBO-F>1#PTp~rF+>zr5??yjAUK6hp7Sq0h>XXN*-d~@(7LziOLm&@)9+t<d+
oFdr~H$}Dz`;d)^e?}mf=r+fEm<O(Wj0#i7Hr>mdKI;Vst0Q03&M*si-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1e448fda2105bf03e29157c3ce6506dc8911449
GIT binary patch
literal 848
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|PUY
zr;B4q#hkaZ59Z%85NWS3Q&aGs+p<#o*1GO(&R0TLd{_Lq{JquNO}EY7-tv-NwAIPu
zvgkd&Tq7?bscVa-Z~3R9V!&4WFOmJqcdZVN^O7fZ5A<?2L^ntaGi+xtS7XRy%=2Nm
z!*pi`!w%LRhKvQ=1<6bg#2y@DIiP!hPw?)}R2Ij8AHjhFEFot1Qo?GlU-xo(YOTP*
z6yzm(Y-&(|*VMMlA@4rxvP{suS9<r*lhvzNN9Er#G5a~~9mDm~#7MDYj|=}TGT_NH
zkXUg4{q(lWB5sQV-`U9ZzqGqA{+fAOs$yTVOCZbn&jM|VOEb9`W}HpC5aq1NdU{jY
z!~Y3tlR29d7UXS@KD}Llfk8)%o54Zm_y-$)&q)Wi<z}pXZ*$*e+gDwg#+;%_Dg`p^
zQQ1JF)|$#3cbug1eV?ZK?O)U4m=|d{Ex&xQ#EMnWQIl2aP>Gf6^2?4QuDhcTGT*!w
zz9zh_ML@vmM05XqF@_0oKA)fO`lrp{@a1#2{rvM^^~65db11Uh)k`TbQPNb^(fs)Q
zmlT7*|6jM}pG^}_4c%}mzUkK!kx42!`SJ`2)xRgG<R4p_b0u71?HZp+EMf;9oj3Y!
zYhz=xt|~W_frVk)-R9iy8|v&&@`W*Le*Ri}fBmfZDi($X-+$SDjVoiklk@kDM$Eb3
zn1BBi<?j9wl$7c9m_O%Pzw!M|$^nuGf>Ty!A1FQuiWs6}u$MDo_Q_P$XAcW*>{`|t
zn#CS))#Tx>yw|^2!&ZtOc=hP8!5MKY8NQR7)`YbOM9JwZXV2Qvy2<dtvgHR#@4AWm
zu3jN}pz1OU!;;LdlPQy?UzmNzWMk(o>jh_hg=eoQ<;|$Rd_*m)o_ovA%p~Eh-HWTM
ztM`3=_rs=o&%Ks{Z*Mm*Y5On#uDNS*q0H+wnTytNI&RsrCg!)&jM`oQXQ}9Y{{5U`
z$&_nFJ7eA*C|oYmcR=k;Gyl(&_iv@wm?^5H-;dtOyp8LD<|px<8B^A`F`WMl%pwe)
Lu6{1-oD!M<a$9#~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/meta.json
new file mode 100644
index 00000000000..55fe0f42707
--- /dev/null
+++ b/Resources/Textures/_LostParadise/Clothing/Uniforms/Jumpsuit/blueshield_turtleneck.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by timxx7019 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+
+  "states": [
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

From babc9537d9bb1c282ad912e8acf773e70c618c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CLost-Paradise-Bot=E2=80=9D?=
 <172407741+Lost-Paradise-Bot@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:59:17 +0000
Subject: [PATCH 7/7] Automatic changelog update

---
 Resources/Changelog/ChangelogLPP.yml | 54 ++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml
index 52a8516f74b..40eda996b41 100644
--- a/Resources/Changelog/ChangelogLPP.yml
+++ b/Resources/Changelog/ChangelogLPP.yml
@@ -2548,3 +2548,57 @@
   id: 138
   time: '2024-11-01T16:46:53.0000000+00:00'
   url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/307
+- author: MrDarkSide
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0434\
+      \u043E\u043B\u0430\u0437\u043A\u0430 \u041E\u0444\u0438\u0446\u0435\u0440 \u0421\
+      \u0438\u043D\u0438\u0439 \u0429\u0438\u0442"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0434\
+      \u043E\u043B\u0430\u0437\u043A\u0430 \u041E\u0444\u0438\u0446\u0435\u0440 \u0421\
+      \u0438\u043D\u0438\u0439 \u0429\u0438\u0442 \u0432 \u043B\u043E\u0434\u0430\u0443\
+      \u0442\u0435 \u0441\u043D\u0430\u0440\u044F\u0436\u0435\u043D\u0438\u044F \u043A\
+      \u043E\u043C\u0430\u043D\u0434\u043E\u0432\u0430\u043D\u0438\u044F"
+    type: Add
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0432\u044B\u0434\u0430\
+      \u0447\u0430 \u0432\u043E\u0434\u043E\u043B\u0437\u0430\u043A\u0438 \u0431\u043E\
+      \u0446\u043C\u0430\u043D\u0430, \u0442\u0435\u043F\u0435\u0440\u044C \u043E\u043D\
+      \u0430 \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u0438 \u041E\u0444\u0438\
+      \u0446\u0435\u0440 \u0421\u0438\u043D\u0438\u0439 \u0429\u0438\u0442"
+    type: Tweak
+  id: 139
+  time: '2024-11-01T16:58:12.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/312
+- author: MrDarkSide
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0440\u0435\u0436\u0438\
+      \u043C \u0420\u0435\u0432\u043E\u043B\u044E\u0446\u0438\u0438 \u0432 \u043F\u0443\
+      \u043B\u043B \u0440\u0435\u0436\u0438\u043C\u043E\u0432 \u0421\u0435\u043A\u0440\
+      \u0435\u0442\u0430. \u0428\u0430\u043D\u0441 \u0432\u044B\u043F\u0430\u0434\u0435\
+      \u043D\u0438\u0435 \u0440\u0430\u0432\u0435\u043D 0.15"
+    type: Add
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0448\u0430\u043D\u0441\
+      \ \u0432\u044B\u043F\u0430\u0434\u0430 \u0440\u0435\u0436\u0438\u043C\u0430\
+      \ \u042F\u0434\u0435\u0440\u043D\u044B\u0435 \u041E\u043F\u0435\u0440\u0430\u0442\
+      \u0438\u0432\u043D\u0438\u043A\u0438 \u0432 \u0421\u0435\u043A\u0440\u0435\u0442\
+      \u0435 (0.14 - 0.20)"
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0448\u0430\u043D\u0441\
+      \ \u0432\u044B\u043F\u0430\u0434\u0430 \u0440\u0435\u0436\u0438\u043C\u0430\
+      \ \u0417\u043E\u043C\u0431\u0438 \u0430\u043F\u043E\u043A\u0430\u043B\u0438\u043F\
+      \u0441\u0438\u0441 \u0432 \u0421\u0435\u043A\u0440\u0435\u0442\u0435 (0.03 -\
+      \ 0.20)"
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0448\u0430\u043D\u0441\
+      \ \u0432\u044B\u043F\u0430\u0434\u0430 \u0440\u0435\u0436\u0438\u043C\u0430\
+      \ \u0412\u044B\u0436\u0438\u0432\u0430\u043D\u0438\u0435 \u0432 \u0421\u0435\
+      \u043A\u0440\u0435\u0442\u0435 (0.44 - 0.15)"
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0448\u0430\u043D\u0441\
+      \ \u0432\u044B\u043F\u0430\u0434\u0430 \u0440\u0435\u0436\u0438\u043C\u0430\
+      \ \u041F\u0440\u0435\u0434\u0430\u0442\u0435\u043B\u0438 \u0432 \u0421\u0435\
+      \u043A\u0440\u0435\u0442\u0435 (0.39 - 0.30)"
+    type: Tweak
+  id: 140
+  time: '2024-11-01T16:57:25.0000000+00:00'
+  url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/315