Merge remote-tracking branch 'sunrise/master'

# Conflicts:
#	Resources/Locale/en-US/_strings/_sunrise/job/job-desc.ftl
#	Resources/Locale/en-US/_strings/_sunrise/job/job-names.ftl
#	Resources/manifest.yml
#	Resources/migration.yml
#	Tools/_sunrise/Schemas/ignore_list.yml

.github/ISSUE_TEMPLATE/issue_report.md

@@ -1,7 +1,7 @@
 ---
 name: Сообщить о баге
 about: Сообщить о баге разработчикам для решения проблемы.
-title: "[Баг]"
+title: ''
 labels: ''
 assignees: VigersRay
 

.github/ISSUE_TEMPLATE/toolshed-feature-request.md

@@ -1,7 +1,7 @@
 ---
 name: Предложить новое
 about: Запросить у разработчиков добавить что-то новое.
-title: "[Предложение]"
+title: ''
 labels: ''
 assignees: VigersRay
 

.github/ISSUE_TEMPLATE/поставить-задачу.md

@@ -2,7 +2,7 @@
 name: Поставить задачу
 about: Создать задачу для себя чтобы о ней знали другие, а так же запросить у спрайтеров
   спрайты.
-title: "[Задача]"
+title: ''
 labels: ''
 assignees: VigersRay
 

.github/workflows/publish-testing.yml

@@ -0,0 +1,45 @@
+name: Publish Testing
+
+concurrency:
+  group: publish-testing
+
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '0 10 * * *'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/[email protected]
+      with:
+        submodules: 'recursive'
+    - name: Setup .NET Core
+      uses: actions/[email protected]
+      with:
+        dotnet-version: 9.0.x
+
+    - name: Get Engine Tag
+      run: |
+        cd RobustToolbox
+        git fetch --depth=1
+
+    - name: Install dependencies
+      run: dotnet restore
+
+    - name: Build Packaging
+      run: dotnet build Content.Packaging --configuration Release --no-restore /m
+
+    - name: Package server
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
+
+    - name: Publish version
+      run: Tools/publish_multi_request.py --fork-id wizards-testing
+      env:
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}

Content.Benchmarks/MapLoadBenchmark.cs

@@ -46,7 +46,7 @@ public async Task Cleanup()
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog", "Convex"};
+    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Convex"};
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;

Content.Client/Actions/ActionsSystem.cs

@@ -155,6 +155,7 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             component.Priority = state.Priority;
             component.AttachedEntity = EnsureEntity<T>(state.AttachedEntity, uid);
             component.RaiseOnUser = state.RaiseOnUser;
+            component.RaiseOnAction = state.RaiseOnAction;
             component.AutoPopulate = state.AutoPopulate;
             component.Temporary = state.Temporary;
             component.ItemIconStyle = state.ItemIconStyle;

Content.Client/Atmos/UI/SpaceHeaterWindow.xaml

@@ -1,6 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-               MinSize="280 160" Title="Temperature Control Unit">
+               MinSize="280 160" Title="{Loc comp-space-heater-ui-title}">
 
     <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
 

Content.Client/Clickable/ClickMapManager.cs

@@ -20,7 +20,7 @@ internal sealed class ClickMapManager : IClickMapManager, IPostInjectInit
             "/Textures/Logo",
         };
 
-        private const float Threshold = 0.25f;
+        private const float Threshold = 0.1f;
         private const int ClickRadius = 2;
 
         [Dependency] private readonly IResourceCache _resourceCache = default!;

Content.Client/Ghost/GhostSystem.cs

@@ -15,6 +15,7 @@ public sealed class GhostSystem : SharedGhostSystem
         [Dependency] private readonly IClientConsoleHost _console = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
+        [Dependency] private readonly PointLightSystem _pointLightSystem = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
         [Dependency] private readonly AudioSystem _audioSystem = default!;
 
@@ -82,8 +83,27 @@ private void OnToggleLighting(EntityUid uid, EyeComponent component, ToggleLight
             if (args.Handled)
                 return;
 
-            Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-lighting-manager-popup"), args.Performer);
-            _contentEye.RequestToggleLight(uid, component);
+            TryComp<PointLightComponent>(uid, out var light);
+
+            if (!component.DrawLight)
+            {
+                // normal lighting
+                Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-lighting-manager-popup-normal"), args.Performer);
+                _contentEye.RequestEye(component.DrawFov, true);
+            }
+            else if (!light?.Enabled ?? false) // skip this option if we have no PointLightComponent
+            {
+                // enable personal light
+                Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-lighting-manager-popup-personal-light"), args.Performer);
+                _pointLightSystem.SetEnabled(uid, true, light);
+            }
+            else
+            {
+                // fullbright mode
+                Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-lighting-manager-popup-fullbright"), args.Performer);
+                _contentEye.RequestEye(component.DrawFov, false);
+                _pointLightSystem.SetEnabled(uid, false, light);
+            }
             args.Handled = true;
         }
 

Content.Client/ItemRecall/ItemRecallSystem.cs

@@ -0,0 +1,11 @@
+using Content.Shared.ItemRecall;
+
+namespace Content.Client.ItemRecall;
+
+/// <summary>
+/// System for handling the ItemRecall ability for wizards.
+/// </summary>
+public sealed partial class ItemRecallSystem : SharedItemRecallSystem
+{
+
+}

Content.Client/Labels/UI/HandLabelerWindow.xaml.cs

@@ -33,8 +33,13 @@ public HandLabelerWindow()
                 _focused = false;
                 LabelLineEdit.Text = _label;
             };
+        }
 
-            // Give the editor keybard focus, since that's the only
+        protected override void Opened()
+        {
+            base.Opened();
+
+            // Give the editor keyboard focus, since that's the only
             // thing the user will want to be doing with this UI
             LabelLineEdit.GrabKeyboardFocus();
         }

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -64,7 +64,7 @@ public void SetEntity(EntityUid uid)
 
         if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComponent))
         {
-            if (!latheComponent.DynamicRecipes.Any())
+            if (!latheComponent.DynamicPacks.Any())
             {
                 ServerListButton.Visible = false;
             }

Content.Client/Mech/MechSystem.cs

@@ -28,12 +28,12 @@ private void OnAppearanceChanged(EntityUid uid, MechComponent component, ref App
 
         UpdateAppearance(uid, component, args.Sprite);
     }
-    
+
     private void OnUpdateAppearanceEvent(EntityUid uid, MechComponent component, ref UpdateAppearanceEvent args)
     {
         if (!TryComp<SpriteComponent>(uid, out var sprite))
             return;
-        
+
         UpdateAppearance(uid, component, sprite);
     }
 
@@ -45,15 +45,15 @@ private void UpdateAppearance(EntityUid uid, MechComponent component, SpriteComp
         var state = component.BaseState;
         var drawDepth = DrawDepth.Mobs;
 
-        if (component.BrokenState != null 
-            && _appearance.TryGetData<bool>(uid, MechVisuals.Broken, out var broken) 
+        if (component.BrokenState != null
+            && _appearance.TryGetData<bool>(uid, MechVisuals.Broken, out var broken)
             && broken)
         {
             state = component.BrokenState;
             drawDepth = DrawDepth.SmallMobs;
         }
-        else if (component.OpenState != null 
-                 && _appearance.TryGetData<bool>(uid, MechVisuals.Open, out var open) 
+        else if (component.OpenState != null
+                 && _appearance.TryGetData<bool>(uid, MechVisuals.Open, out var open)
                  && open)
         {
             state = component.OpenState;

Content.Client/StatusIcon/StatusIconSystem.cs

@@ -4,6 +4,7 @@
 using Content.Shared.StatusIcon.Components;
 using Content.Shared.Stealth.Components;
 using Content.Shared.Whitelist;
+using Robust.Client.GameObjects;
 using Content.Shared.Administration.Managers; // Sunrise-Edit
 using Content.Shared.Administration; // Sunrise-Edit
 using Robust.Client.Graphics;
@@ -94,6 +95,9 @@ public bool IsVisible(Entity<MetaDataComponent> ent, StatusIconData data)
         if (data.HideOnStealth && TryComp<StealthComponent>(ent, out var stealth) && stealth.Enabled)
             return false;
 
+        if (TryComp<SpriteComponent>(ent, out var sprite) && !sprite.Visible)
+            return false;
+
         if (data.ShowTo != null && !_entityWhitelist.IsValid(data.ShowTo, viewer))
             return false;
 

Content.Client/SubFloor/SubFloorHideSystem.cs

@@ -1,3 +1,4 @@
+using Content.Shared.Atmos.Components;
 using Content.Shared.DrawDepth;
 using Content.Shared.SubFloor;
 using Robust.Client.GameObjects;
@@ -9,6 +10,7 @@ public sealed class SubFloorHideSystem : SharedSubFloorHideSystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     private bool _showAll;
+    private bool _showVentPipe; // Sunrise-edit
 
     [ViewVariables(VVAccess.ReadWrite)]
     public bool ShowAll
@@ -23,6 +25,21 @@ public bool ShowAll
         }
     }
 
+    // Sunrise-start
+    [ViewVariables(VVAccess.ReadWrite)]
+    public bool ShowVentPipe
+    {
+        get => _showVentPipe;
+        set
+        {
+            if (_showVentPipe == value) return;
+            _showVentPipe = value;
+
+            UpdateAll();
+        }
+    }
+    // Sunrise-end
+
     public override void Initialize()
     {
         base.Initialize();
@@ -40,7 +57,15 @@ private void OnAppearanceChanged(EntityUid uid, SubFloorHideComponent component,
 
         scannerRevealed &= !ShowAll; // no transparency for show-subfloor mode.
 
-        var revealed = !covered || ShowAll || scannerRevealed;
+        // Sunrise-start
+        var showVentPipe = false;
+        if (HasComp<PipeAppearanceComponent>(uid))
+        {
+            showVentPipe = ShowVentPipe;
+        }
+
+        var revealed = !covered || ShowAll || scannerRevealed || showVentPipe;
+        // Sunrise-end
 
         // set visibility & color of each layer
         foreach (var layer in args.Sprite.AllLayers)

Content.Client/UserInterface/Controls/DialogWindow.xaml.cs

@@ -87,9 +87,6 @@ public DialogWindow(string title, List<QuickDialogEntry> entries, bool ok = true
             Prompts.AddChild(box);
         }
 
-        // Grab keyboard focus for the first dialog entry
-        _promptLines[0].Item2.GrabKeyboardFocus();
-
         OkButton.OnPressed += _ => Confirm();
 
         CancelButton.OnPressed += _ =>
@@ -110,6 +107,14 @@ public DialogWindow(string title, List<QuickDialogEntry> entries, bool ok = true
         OpenCentered();
     }
 
+    protected override void Opened()
+    {
+        base.Opened();
+
+        // Grab keyboard focus for the first dialog entry
+        _promptLines[0].Item2.GrabKeyboardFocus();
+    }
+
     private void Confirm()
     {
         var results = new Dictionary<string, string>();

Content.Client/UserInterface/Systems/Storage/StorageUIController.cs

@@ -38,11 +38,6 @@ public sealed class StorageUIController : UIController, IOnSystemChanged<Storage
     [Dependency] private readonly IPlayerManager _player = default!;
     [UISystemDependency] private readonly StorageSystem _storage = default!;
 
-    /// <summary>
-    /// Cached positions for opening nested storage.
-    /// </summary>
-    private readonly Dictionary<EntityUid, Vector2> _reservedStorage = new();
-
     private readonly DragDropHelper<ItemGridPiece> _menuDragHelper;
 
     public ItemGridPiece? DraggingGhost => _menuDragHelper.Dragged;
@@ -133,11 +128,6 @@ public StorageWindow CreateStorageWindow(EntityUid uid)
         else
         {
             window.OpenCenteredLeft();
-
-            if (_reservedStorage.Remove(uid, out var pos))
-            {
-                LayoutContainer.SetPosition(window, pos);
-            }
         }
 
         return window;

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -170,7 +170,7 @@ protected override bool InRange(EntityUid user, EntityUid target, float range, I
         var targetCoordinates = xform.Coordinates;
         var targetLocalAngle = xform.LocalRotation;
 
-        return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range);
+        return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range, overlapCheck: false);
     }
 
     protected override void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform)

Content.Client/_Sunrise/VentCraw/VentCrawVisionSystem.cs

@@ -0,0 +1,30 @@
+using Content.Client.SubFloor;
+using Content.Shared._Sunrise.VentCraw;
+using Robust.Client.Player;
+using Robust.Shared.Timing;
+
+namespace Content.Client._Sunrise.VentCraw;
+
+public sealed class VentCrawSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly SubFloorHideSystem _subFloorHideSystem = default!;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        var player = _player.LocalPlayer?.ControlledEntity;
+
+        var ventCraslerQuery = GetEntityQuery<VentCrawlerComponent>();
+
+        if (!ventCraslerQuery.TryGetComponent(player, out var playerVentCrawlerComponent))
+            return;
+
+        _subFloorHideSystem.ShowVentPipe = playerVentCrawlerComponent.InTube;
+    }
+}