Merge branch 'master' into blueshield

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,19 +20,15 @@
 
 **Changelog**
 <!--
-Введите игроков в курс дела, кратко опишите всё что было изменено в этом PR.
--->
-
-<!--
-Перед выкладыванием/запросом о рассмотрении PR, напишите Changelog вне коментария.
-Для добавления чейнжлога в Resources/Changelog/ChangelogSunrise.yml используйте скрипт manual_changelog.py который находится в директории Tools. Нужен установленый python.
-Пример команды:
-python .\Tools\manual_changelog.py
-Далее указываете чейнжлог по данному шаблону:
+Если вы хотите чтобы о ваших изменениях узнали игроки напишите что вы изменили вне коментария используя шаблон. 
+Если вы делаете слишком мелкий фикс, не стоит его указывать.
+Так же не стоил делать его слишком длинним указывая все детали, пишите кратко и по существу.
+Шаблон:
 :cl: VigersRay
 - add: Добавлено веселье!
 - remove: Удалено веселье!
 - tweak: Изменено веселье!
 - fix: Исправлено веселье!
-После чего закройте скрипт комбинацией CTRL + C.
+
+Не изменяйте файл чейнжлога сами.
 -->

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs

@@ -1,6 +1,7 @@
 using Content.Client.Station;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
@@ -14,6 +15,7 @@ public sealed partial class ObjectsTab : Control
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IClientConsoleHost _console = default!;
 
     private readonly List<ObjectsTabEntry> _objects = new();
     private readonly List<ObjectsTabSelection> _selections = new();
@@ -27,6 +29,9 @@ public sealed partial class ObjectsTab : Control
     private readonly TimeSpan _updateFrequency = TimeSpan.FromSeconds(2);
     private TimeSpan _nextUpdate;
 
+    private Action<NetEntity>? TeleportToObjAction { get; set; }
+    private Action<NetEntity>? DeleteObjAction { get; set; }
+
     public ObjectsTab()
     {
         RobustXamlLoader.Load(this);
@@ -57,6 +62,19 @@ public ObjectsTab()
 
         // Initialize the next update time
         _nextUpdate = TimeSpan.Zero;
+
+        TeleportToObjAction += TeleportToObj;
+        DeleteObjAction += DeleteObj;
+    }
+
+    private void TeleportToObj(NetEntity nent)
+    {
+        _console.ExecuteCommand($"tpto {nent}");
+    }
+
+    private void DeleteObj(NetEntity nent)
+    {
+        _console.ExecuteCommand($"delete {nent}");
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
@@ -129,7 +147,7 @@ private void GenerateButton(ListData data, ListContainerButton button)
         if (data is not ObjectsListData { Info: var info, BackgroundColor: var backgroundColor })
             return;
 
-        var entry = new ObjectsTabEntry(info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor });
+        var entry = new ObjectsTabEntry(info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor }, TeleportToObjAction, DeleteObjAction);
         button.ToolTip = $"{info.Name}, {info.Entity}";
 
         button.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(args, data);

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml

@@ -13,5 +13,17 @@
                SizeFlagsStretchRatio="3"
                HorizontalExpand="True"
                ClipText="True"/>
+        <customControls:VSeparator/>
+        <Button Name="TeleportButton"
+                Text="{Loc object-tab-entity-teleport}"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"
+               ClipText="True"/>
+        <customControls:VSeparator/>
+        <Button Name="DeleteButton"
+                Text="{Loc object-tab-entity-delete}"
+                SizeFlagsStretchRatio="3"
+                HorizontalExpand="True"
+                ClipText="True"/>
     </BoxContainer>
 </PanelContainer>

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs

@@ -10,12 +10,16 @@ public sealed partial class ObjectsTabEntry : PanelContainer
 {
     public NetEntity AssocEntity;
 
-    public ObjectsTabEntry(string name, NetEntity nent, StyleBox styleBox)
+    public ObjectsTabEntry(string name, NetEntity nent, StyleBox styleBox, Action<NetEntity>? teleportToObj, Action<NetEntity>? deleteObj)
     {
         RobustXamlLoader.Load(this);
+
         AssocEntity = nent;
         EIDLabel.Text = nent.ToString();
         NameLabel.Text = name;
         BackgroundColorPanel.PanelOverride = styleBox;
+
+        TeleportButton.OnPressed += _ => teleportToObj?.Invoke(nent);
+        DeleteButton.OnPressed += _ => deleteObj?.Invoke(nent);
     }
 }

Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml

@@ -17,5 +17,11 @@
                ClipText="True"
                Text="{Loc object-tab-entity-id}"
                MouseFilter="Pass"/>
+        <Label Name="EntityTeleportLabel"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"/>
+        <Label Name="EntityDeleteLabel"
+               SizeFlagsStretchRatio="3"
+               HorizontalExpand="True"/>
     </BoxContainer>
 </Control>

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs

@@ -389,6 +389,7 @@ public HumanoidProfileEditor(
             {
                 PreferenceUnavailableButton.SelectId(args.Id);
                 Profile = Profile?.WithPreferenceUnavailable((PreferenceUnavailableMode) args.Id);
+                SetDirty();
             };
 
             _jobCategories = new Dictionary<string, BoxContainer>();

Content.Client/_Sunrise/Pacificator/PacificatorBoundUserInterface.cs

@@ -0,0 +1,54 @@
+using Content.Shared._Sunrise.Pacificator;
+using JetBrains.Annotations;
+
+namespace Content.Client._Sunrise.Pacificator
+{
+    [UsedImplicitly]
+    public sealed class PacificatorBoundUserInterface : BoundUserInterface
+    {
+        [ViewVariables]
+        private PacificatorWindow? _window;
+
+        public PacificatorBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+
+            _window = new PacificatorWindow(this);
+
+            /*
+            _window.Switch.OnPressed += _ =>
+            {
+                SendMessage(new SharedPacificatorComponent.SwitchGeneratorMessage(!IsOn));
+            };
+            */
+
+            _window.OpenCentered();
+            _window.OnClose += Close;
+        }
+
+        protected override void UpdateState(BoundUserInterfaceState state)
+        {
+            base.UpdateState(state);
+
+            var castState = (GeneratorState) state;
+            _window?.UpdateState(castState);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing) return;
+
+            _window?.Dispose();
+        }
+
+        public void SetPowerSwitch(bool on)
+        {
+            SendMessage(new SwitchGeneratorMessage(on));
+        }
+    }
+}

Content.Client/_Sunrise/Pacificator/PacificatorWindow.xaml

@@ -0,0 +1,35 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                Title="Генератор пацифизма"
+                MinSize="270 130"
+                SetSize="360 180">
+    <BoxContainer Margin="4 0" Orientation="Horizontal">
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+            <GridContainer Margin="2 0 0 0" Columns="2">
+                <!-- Power -->
+                <Label Text="{Loc 'gravity-generator-window-power'}" HorizontalExpand="True" StyleClasses="StatusFieldTitle" />
+                <BoxContainer Orientation="Horizontal" MinWidth="120">
+                    <Button Name="OnButton" Text="{Loc 'gravity-generator-window-power-on'}" StyleClasses="OpenRight" />
+                    <Button Name="OffButton" Text="{Loc 'gravity-generator-window-power-off'}" StyleClasses="OpenLeft" />
+                </BoxContainer>
+                <Control /> <!-- Empty control to act as a spacer in the grid. -->
+                <Label Name="PowerLabel" Text="0 / 0 W" />
+                <!-- Status -->
+                <Label Text="{Loc 'gravity-generator-window-status'}"  StyleClasses="StatusFieldTitle" />
+                <Label Name="StatusLabel" Text="{Loc 'gravity-generator-window-status-fully-charged'}" />
+                <!-- ETA -->
+                <Label Text="{Loc 'gravity-generator-window-eta'}" StyleClasses="StatusFieldTitle" />
+                <Label Name="EtaLabel" Text="N/A" />
+                <!-- Charge -->
+                <Label Text="{Loc 'gravity-generator-window-charge'}" StyleClasses="StatusFieldTitle" />
+                <ProgressBar Name="ChargeBar" MaxValue="255">
+                    <Label Name="ChargeText" Margin="4 0" Text="0 %" />
+                </ProgressBar>
+            </GridContainer>
+        </BoxContainer>
+        <PanelContainer Margin="12 0 0 0" StyleClasses="Inset" VerticalAlignment="Center">
+            <SpriteView Name="EntityView" SetSize="96 96" OverrideDirection="South" />
+        </PanelContainer>
+    </BoxContainer>
+
+</controls:FancyWindow>

Content.Client/_Sunrise/Pacificator/PacificatorWindow.xaml.cs

@@ -0,0 +1,73 @@
+using Content.Shared._Sunrise.Pacificator;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+
+namespace Content.Client._Sunrise.Pacificator
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class PacificatorWindow : FancyWindow
+    {
+        private readonly ButtonGroup _buttonGroup = new();
+
+        private readonly PacificatorBoundUserInterface _owner;
+
+        public PacificatorWindow(PacificatorBoundUserInterface owner)
+        {
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            _owner = owner;
+
+            OnButton.Group = _buttonGroup;
+            OffButton.Group = _buttonGroup;
+
+            OnButton.OnPressed += _ => _owner.SetPowerSwitch(true);
+            OffButton.OnPressed += _ => _owner.SetPowerSwitch(false);
+
+            EntityView.SetEntity(owner.Owner);
+        }
+
+        public void UpdateState(GeneratorState state)
+        {
+            if (state.On)
+                OnButton.Pressed = true;
+            else
+                OffButton.Pressed = true;
+
+            PowerLabel.Text = Loc.GetString(
+                "gravity-generator-window-power-label",
+                ("draw", state.PowerDraw),
+                ("max", state.PowerDrawMax));
+
+            PowerLabel.SetOnlyStyleClass(MathHelper.CloseTo(state.PowerDraw, state.PowerDrawMax) ? "Good" : "Caution");
+
+            ChargeBar.Value = state.Charge;
+            ChargeText.Text = (state.Charge / 255f).ToString("P0");
+            StatusLabel.Text = Loc.GetString(state.PowerStatus switch
+            {
+                PacificatorPowerStatus.Off => "gravity-generator-window-status-off",
+                PacificatorPowerStatus.Discharging => "gravity-generator-window-status-discharging",
+                PacificatorPowerStatus.Charging => "gravity-generator-window-status-charging",
+                PacificatorPowerStatus.FullyCharged => "gravity-generator-window-status-fully-charged",
+                _ => throw new ArgumentOutOfRangeException()
+            });
+
+            StatusLabel.SetOnlyStyleClass(state.PowerStatus switch
+            {
+                PacificatorPowerStatus.Off => "Danger",
+                PacificatorPowerStatus.Discharging => "Caution",
+                PacificatorPowerStatus.Charging => "Caution",
+                PacificatorPowerStatus.FullyCharged => "Good",
+                _ => throw new ArgumentOutOfRangeException()
+            });
+
+            EtaLabel.Text = state.EtaSeconds >= 0
+                ? Loc.GetString("gravity-generator-window-eta-value", ("left", TimeSpan.FromSeconds(state.EtaSeconds)))
+                : Loc.GetString("gravity-generator-window-eta-none");
+
+            EtaLabel.SetOnlyStyleClass(state.EtaSeconds >= 0 ? "Caution" : "Disabled");
+        }
+    }
+}

Content.Server/GameTicking/GameTicker.Spawning.cs

@@ -229,15 +229,21 @@ private void SpawnPlayer(ICommonSession player,
 
             _playTimeTrackings.PlayerRolesChanged(player);
 
-            var arrivals = true;
-
+            // Все появляются в прибытии в начале раунда. Зачем? А мне нравится эта бегающаа орящая толпа.
+            EntityUid? mobMaybe = null;
+            var spawnPointType = SpawnPointType.Arrivals;
             if (jobPrototype.AlwaysUseSpawner)
             {
                 lateJoin = false;
-                arrivals = false;
+                spawnPointType = SpawnPointType.Job;
+            }
+            else
+            {
+                mobMaybe = _arrivals.SpawnPlayersOnArrivals(station, job, character);
             }
 
-            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(station, job, character, arrivals: arrivals);
+            if (mobMaybe == null)
+                mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(station, job, character, spawnPointType: spawnPointType);
 
             DebugTools.AssertNotNull(mobMaybe);
             var mob = mobMaybe!.Value;

Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs

@@ -49,7 +49,7 @@ private void OnBeforeSpawn(PlayerBeforeSpawnEvent ev)
             var newMind = _mind.CreateMind(ev.Player.UserId, ev.Profile.Name);
             _mind.SetUserId(newMind, ev.Player.UserId);
 
-            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(ev.Station, null, ev.Profile, arrivals: false);
+            var mobMaybe = _stationSpawning.SpawnPlayerCharacterOnStation(ev.Station, null, ev.Profile);
             DebugTools.AssertNotNull(mobMaybe);
             var mob = mobMaybe!.Value;