Upstream sync

.github/workflows/publish.yml

@@ -48,10 +48,17 @@ jobs:
         cd RobustToolbox
         git fetch --depth=1
 
-    - name: Package all
-      run: |
-        Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-        Tools/package_client_build.py
+    - 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: Update Build Info
       env:

.github/workflows/test-packaging.yml

@@ -70,11 +70,15 @@ jobs:
       - name: Install dependencies
         run: dotnet restore
 
-      - name: Package client
-        run: |
-          Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-          Tools/package_client_build.py
+      - 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: Update Build Info
         env:
           FORK_ID: ${{ vars.FORK_ID }}

Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs

@@ -60,7 +60,7 @@ private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? d
             }
             else if (args.Event.Function == EngineKeyFunctions.UseSecondary && selectedPlayer.NetEntity != null)
             {
-                _uiManager.GetUIController<VerbMenuUIController>().OpenVerbMenu(_entManager.GetEntity(selectedPlayer.NetEntity.Value));
+                _uiManager.GetUIController<VerbMenuUIController>().OpenVerbMenu(selectedPlayer.NetEntity.Value, true);
             }
         }
 

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

@@ -14,11 +14,13 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
     [GenerateTypedNameReferences]
     public sealed partial class PlayerTab : Control
     {
+        [Dependency] private readonly IEntityManager _entManager = default!;
+        [Dependency] private readonly IPlayerManager _playerMan = default!;
+
         private const string ArrowUp = "↑";
         private const string ArrowDown = "↓";
         private readonly Color _altColor = Color.FromHex("#292B38");
         private readonly Color _defaultColor = Color.FromHex("#2F2F3B");
-        private IEntityManager _entManager;
         private readonly AdminSystem _adminSystem;
         private IReadOnlyList<PlayerInfo> _players = new List<PlayerInfo>();
 
@@ -30,7 +32,7 @@ public sealed partial class PlayerTab : Control
 
         public PlayerTab()
         {
-            _entManager = IoCManager.Resolve<IEntityManager>();
+            IoCManager.InjectDependencies(this);
             _adminSystem = _entManager.System<AdminSystem>();
             RobustXamlLoader.Load(this);
             RefreshPlayerList(_adminSystem.PlayerList);
@@ -95,13 +97,11 @@ private void RefreshPlayerList(IReadOnlyList<PlayerInfo> players)
             foreach (var child in PlayerList.Children.ToArray())
             {
                 if (child is PlayerTabEntry)
-                    child.Orphan();
+                    child.Dispose();
             }
 
             _players = players;
-
-            var playerManager = IoCManager.Resolve<IPlayerManager>();
-            PlayerCount.Text = $"Players: {playerManager.PlayerCount}";
+            PlayerCount.Text = $"Players: {_playerMan.PlayerCount}";
 
             var sortedPlayers = new List<PlayerInfo>(players);
             sortedPlayers.Sort(Compare);

Content.Client/Construction/UI/ConstructionMenuPresenter.cs

@@ -1,9 +1,11 @@
 using System.Linq;
 using Content.Client.UserInterface.Systems.MenuBar.Widgets;
 using Content.Shared.Construction.Prototypes;
+using Content.Shared.Tag;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Placement;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.Utility;
@@ -25,6 +27,7 @@ internal sealed class ConstructionMenuPresenter : IDisposable
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IPlacementManager _placementManager = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
 
         private readonly IConstructionMenuView _constructionView;
 
@@ -152,6 +155,11 @@ private void OnViewPopulateRecipes(object? sender, (string search, string catago
                 if (recipe.Hide)
                     continue;
 
+                if (_playerManager.LocalSession == null
+                || _playerManager.LocalEntity == null
+                || (recipe.EntityWhitelist != null && !recipe.EntityWhitelist.IsValid(_playerManager.LocalEntity.Value)))
+                    continue;
+
                 if (!string.IsNullOrEmpty(search))
                 {
                     if (!recipe.Name.ToLowerInvariant().Contains(search.Trim().ToLowerInvariant()))

Content.Client/Overlays/ShowSyndicateIconsSystem.cs

@@ -0,0 +1,43 @@
+using Content.Shared.Overlays;
+using Content.Shared.StatusIcon.Components;
+using Content.Shared.NukeOps;
+using Content.Shared.StatusIcon;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.Overlays;
+public sealed class ShowSyndicateIconsSystem : EquipmentHudSystem<ShowSyndicateIconsComponent>
+{
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NukeOperativeComponent, GetStatusIconsEvent>(OnGetStatusIconsEvent);
+    }
+
+    private void OnGetStatusIconsEvent(EntityUid uid, NukeOperativeComponent nukeOperativeComponent, ref GetStatusIconsEvent args)
+    {
+        if (!IsActive || args.InContainer)
+        {
+            return;
+        }
+
+        var healthIcons = SyndicateIcon(uid, nukeOperativeComponent);
+
+        args.StatusIcons.AddRange(healthIcons);
+    }
+
+    private IReadOnlyList<StatusIconPrototype> SyndicateIcon(EntityUid uid, NukeOperativeComponent nukeOperativeComponent)
+    {
+        var result = new List<StatusIconPrototype>();
+
+        if (_prototype.TryIndex<StatusIconPrototype>(nukeOperativeComponent.SyndStatusIcon, out var syndicateicon))
+        {
+            result.Add(syndicateicon);
+        }
+
+        return result;
+    }
+}
+

Content.Client/PowerCell/PowerCellSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.PowerCell;
+using Content.Shared.PowerCell.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
@@ -15,6 +16,29 @@ public override void Initialize()
         SubscribeLocalEvent<PowerCellVisualsComponent, AppearanceChangeEvent>(OnPowerCellVisualsChange);
     }
 
+    /// <inheritdoc/>
+    public override bool HasActivatableCharge(EntityUid uid, PowerCellDrawComponent? battery = null, PowerCellSlotComponent? cell = null,
+        EntityUid? user = null)
+    {
+        if (!Resolve(uid, ref battery, ref cell, false))
+            return true;
+
+        return battery.CanUse;
+    }
+
+    /// <inheritdoc/>
+    public override bool HasDrawCharge(
+        EntityUid uid,
+        PowerCellDrawComponent? battery = null,
+        PowerCellSlotComponent? cell = null,
+        EntityUid? user = null)
+    {
+        if (!Resolve(uid, ref battery, ref cell, false))
+            return true;
+
+        return battery.CanDraw;
+    }
+
     private void OnPowerCellVisualsChange(EntityUid uid, PowerCellVisualsComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)

Content.Client/Roles/RoleSystem.cs

@@ -1,5 +1,7 @@
-namespace Content.Client.Roles;
+using Content.Shared.Roles;
 
-public sealed class RoleSystem : EntitySystem
+namespace Content.Client.Roles;
+
+public sealed class RoleSystem : SharedRoleSystem
 {
 }

Content.Client/Storage/UI/StorageWindow.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Client.Items.Systems;
 using Content.Client.Message;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
@@ -23,6 +24,7 @@ public sealed class StorageWindow : FancyWindow
         private readonly IEntityManager _entityManager;
 
         private readonly SharedStorageSystem _storage;
+        private readonly ItemSystem _item;
 
         private readonly RichTextLabel _information;
         public readonly ContainerButton StorageContainerButton;
@@ -34,6 +36,7 @@ public StorageWindow(IEntityManager entityManager)
         {
             _entityManager = entityManager;
             _storage = _entityManager.System<SharedStorageSystem>();
+            _item = _entityManager.System<ItemSystem>();
             SetSize = new Vector2(240, 320);
             Title = Loc.GetString("comp-storage-window-title");
             RectClipContent = true;
@@ -69,7 +72,7 @@ public StorageWindow(IEntityManager entityManager)
             _information.SetMessage(Loc.GetString("comp-storage-window-weight",
                 ("weight", 0),
                 ("maxWeight", 0),
-                ("size", SharedItemSystem.GetItemSizeLocale(ItemSize.Normal))));
+                ("size", _item.GetItemSizeLocale(SharedStorageSystem.DefaultStorageMaxItemSize))));
 
             vBox.AddChild(_information);
 
@@ -117,14 +120,14 @@ private void SetStorageInformation(Entity<StorageComponent> uid)
                 _information.SetMarkup(Loc.GetString("comp-storage-window-weight",
                     ("weight", _storage.GetCumulativeItemSizes(uid, uid.Comp)),
                     ("maxWeight", uid.Comp.MaxTotalWeight),
-                    ("size", SharedItemSystem.GetItemSizeLocale(_storage.GetMaxItemSize((uid, uid.Comp))))));
+                    ("size", _item.GetItemSizeLocale(_storage.GetMaxItemSize((uid, uid.Comp))))));
             }
             else
             {
                 _information.SetMarkup(Loc.GetString("comp-storage-window-slots",
                     ("itemCount", uid.Comp.Container.ContainedEntities.Count),
                     ("maxCount", uid.Comp.MaxSlots),
-                    ("size", SharedItemSystem.GetItemSizeLocale(_storage.GetMaxItemSize((uid, uid.Comp))))));
+                    ("size", _item.GetItemSizeLocale(_storage.GetMaxItemSize((uid, uid.Comp))))));
             }
         }
 
@@ -167,7 +170,7 @@ public void GenerateButton(ListData data, ListContainerButton button)
                         {
                             Align = Label.AlignMode.Right,
                             Text = item?.Size != null
-                                ? $"{SharedItemSystem.GetItemSizeWeight(item.Size)}"
+                                ? $"{_item.GetItemSizeWeight(item.Size)}"
                                 : Loc.GetString("comp-storage-no-item-size")
                         }
                     }

Content.Client/UserInterface/Systems/Admin/AdminUIController.cs

@@ -187,7 +187,7 @@ private void PlayerTabEntryPressed(ButtonEventArgs args)
         if (function == EngineKeyFunctions.UIClick)
             _conHost.ExecuteCommand($"vv {entity}");
         else if (function == EngineKeyFunctions.UseSecondary)
-            _verb.OpenVerbMenu(EntityManager.GetEntity(entity), true);
+            _verb.OpenVerbMenu(entity, true);
         else
             return;
 

Content.Client/Verbs/UI/VerbMenuUIController.cs

@@ -9,6 +9,7 @@
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Shared.Input;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Verbs.UI
 {
@@ -29,7 +30,7 @@ public sealed class VerbMenuUIController : UIController, IOnStateEntered<Gamepla
         [UISystemDependency] private readonly CombatModeSystem _combatMode = default!;
         [UISystemDependency] private readonly VerbSystem _verbSystem = default!;
 
-        public EntityUid CurrentTarget;
+        public NetEntity CurrentTarget;
         public SortedSet<Verb> CurrentVerbs = new();
 
         /// <summary>
@@ -64,8 +65,25 @@ public void OnStateExited(GameplayState state)
         /// </param>
         public void OpenVerbMenu(EntityUid target, bool force = false, ContextMenuPopup? popup=null)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} user ||
-                _combatMode.IsInCombatMode(user))
+            DebugTools.Assert(target.IsValid());
+            OpenVerbMenu(EntityManager.GetNetEntity(target), force, popup);
+        }
+
+        /// <summary>
+        ///     Open a verb menu and fill it with verbs applicable to the given target entity.
+        /// </summary>
+        /// <param name="target">Entity to get verbs on.</param>
+        /// <param name="force">Used to force showing all verbs. Only works on networked entities if the user is an admin.</param>
+        /// <param name="popup">
+        ///     If this is not null, verbs will be placed into the given popup instead.
+        /// </param>
+        public void OpenVerbMenu(NetEntity target, bool force = false, ContextMenuPopup? popup=null)
+        {
+            DebugTools.Assert(target.IsValid());
+            if (_playerManager.LocalEntity is not {Valid: true} user)
+                return;
+
+            if (!force && _combatMode.IsInCombatMode(user))
                 return;
 
             Close();
@@ -82,7 +100,7 @@ public void OpenVerbMenu(EntityUid target, bool force = false, ContextMenuPopup?
 
             // Add indicator that some verbs may be missing.
             // I long for the day when verbs will all be predicted and this becomes unnecessary.
-            if (!EntityManager.IsClientSide(target))
+            if (!target.IsClientSide())
             {
                 _context.AddElement(menu, new ContextMenuElement(Loc.GetString("verb-system-waiting-on-server-text")));
             }
@@ -248,7 +266,7 @@ private void Close()
 
         private void HandleVerbsResponse(VerbsResponseEvent msg)
         {
-            if (OpenMenu == null || !OpenMenu.Visible || CurrentTarget != EntityManager.GetEntity(msg.Entity))
+            if (OpenMenu == null || !OpenMenu.Visible || CurrentTarget != msg.Entity)
                 return;
 
             AddServerVerbs(msg.Verbs, OpenMenu);