Upstream

.github/workflows/build-map-renderer.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.100
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/build-test-debug.yml

@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 8.0.100
 
     - name: Get Engine Tag
       run: |

.github/workflows/test-packaging.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.100
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/yaml-linter.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.100
       - name: Install dependencies
         run: dotnet restore
       - name: Build

Content.Benchmarks/SpawnEquipDeleteBenchmark.cs

@@ -58,7 +58,7 @@ await _pair.Server.WaitPost(() =>
             for (var i = 0; i < N; i++)
             {
                 _entity = server.EntMan.SpawnAttachedTo(Mob, _coords);
-                _spawnSys.EquipStartingGear(_entity, _gear, null);
+                _spawnSys.EquipStartingGear(_entity, _gear);
                 server.EntMan.DeleteEntity(_entity);
             }
         });

Content.Client/Content.Client.csproj

@@ -26,6 +26,9 @@
   <ItemGroup>
     <Folder Include="Spawners\" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="Lobby\UI\LobbyCharacterPreviewPanel.cs" />
+  </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
 </Project>

Content.Client/DeltaV/Shipyard/ShipyardConsoleSystem.cs

@@ -0,0 +1,5 @@
+using Content.Shared.Shipyard;
+
+namespace Content.Client.Shipyard;
+
+public sealed class ShipyardConsoleSystem : SharedShipyardConsoleSystem;

Content.Client/DeltaV/Shipyard/UI/ShipyardBoundUserInterface.cs

@@ -0,0 +1,56 @@
+using Content.Shared.Access.Systems;
+using Content.Shared.Shipyard;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.DeltaV.Shipyard.UI;
+
+public sealed class ShipyardConsoleBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+
+    private readonly AccessReaderSystem _access;
+
+    [ViewVariables]
+    private ShipyardConsoleMenu? _menu;
+
+    public ShipyardConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+        _access = EntMan.System<AccessReaderSystem>();
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _menu = new ShipyardConsoleMenu(Owner, _proto, EntMan, _player, _access);
+        _menu.OpenCentered();
+        _menu.OnClose += Close;
+        _menu.OnPurchased += Purchase;
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (state is not ShipyardConsoleState cast)
+            return;
+
+        _menu?.UpdateState(cast);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+
+        if (disposing)
+            _menu?.Dispose();
+    }
+
+    private void Purchase(string id)
+    {
+        SendMessage(new ShipyardConsolePurchaseMessage(id));
+    }
+}

Content.Client/DeltaV/Shipyard/UI/ShipyardConsoleMenu.xaml

@@ -0,0 +1,29 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                           xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                           SetSize="500 360"
+                           MinSize="460 280"
+                           Title="{Loc 'shipyard-console-menu-title'}">
+    <BoxContainer Orientation="Vertical" Margin="5 0 5 0">
+        <Label Name="BankAccountLabel" />
+        <BoxContainer Orientation="Horizontal">
+            <OptionButton Name="Categories"
+                          Prefix="{Loc 'cargo-console-menu-categories-label'}"
+                          HorizontalExpand="True" />
+            <LineEdit Name="SearchBar"
+                      PlaceHolder="{Loc 'cargo-console-menu-search-bar-placeholder'}"
+                      HorizontalExpand="True" />
+        </BoxContainer>
+        <ScrollContainer HorizontalExpand="True"
+                         VerticalExpand="True"
+                         SizeFlagsStretchRatio="6">
+            <BoxContainer Name="Vessels"
+                          Orientation="Vertical"
+                          HorizontalExpand="True"
+                          VerticalExpand="True">
+                <!-- Vessels get added here by code -->
+            </BoxContainer>
+        </ScrollContainer>
+        <TextureButton VerticalExpand="True" />
+    </BoxContainer>
+</controls:FancyWindow>

Content.Client/DeltaV/Shipyard/UI/ShipyardConsoleMenu.xaml.cs

@@ -0,0 +1,110 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Access.Systems;
+using Content.Shared.Shipyard;
+using Content.Shared.Shipyard.Prototypes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client.DeltaV.Shipyard.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ShipyardConsoleMenu : FancyWindow
+{
+    private readonly AccessReaderSystem _access;
+    private readonly IPlayerManager _player;
+
+    public event Action<string>? OnPurchased;
+
+    private readonly List<VesselPrototype> _vessels = new();
+    private readonly List<string> _categories = new();
+
+    public Entity<ShipyardConsoleComponent> Console;
+    private string? _category;
+
+    public ShipyardConsoleMenu(EntityUid console, IPrototypeManager proto, IEntityManager entMan, IPlayerManager player, AccessReaderSystem access)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        Console = (console, entMan.GetComponent<ShipyardConsoleComponent>(console));
+        _access = access;
+        _player = player;
+
+        // don't include ships that aren't allowed by whitelist, server won't accept them anyway
+        foreach (var vessel in proto.EnumeratePrototypes<VesselPrototype>())
+        {
+            if (vessel.Whitelist?.IsValid(console, entMan) != false)
+                _vessels.Add(vessel);
+        }
+        _vessels.Sort((x, y) => string.Compare(x.Name, y.Name, StringComparison.CurrentCultureIgnoreCase));
+
+        // only list categories in said ships
+        foreach (var vessel in _vessels)
+        {
+            foreach (var category in vessel.Categories)
+            {
+                if (!_categories.Contains(category))
+                    _categories.Add(category);
+            }
+        }
+
+        _categories.Sort();
+        // inserting here and not adding at the start so it doesn't get affected by sort
+        _categories.Insert(0, Loc.GetString("cargo-console-menu-populate-categories-all-text"));
+        PopulateCategories();
+
+        SearchBar.OnTextChanged += _ => PopulateProducts();
+        Categories.OnItemSelected += args =>
+        {
+            _category = args.Id == 0 ? null : _categories[args.Id];
+            Categories.SelectId(args.Id);
+            PopulateProducts();
+        };
+    }
+
+    /// <summary>
+    ///     Populates the list of products that will actually be shown, using the current filters.
+    /// </summary>
+    private void PopulateProducts()
+    {
+        Vessels.RemoveAllChildren();
+
+        var access = _player.LocalSession?.AttachedEntity is {} player
+            && _access.IsAllowed(player, Console);
+
+        var search = SearchBar.Text.Trim().ToLowerInvariant();
+        foreach (var vessel in _vessels)
+        {
+            if (search.Length != 0 && !vessel.Name.ToLowerInvariant().Contains(search))
+                continue;
+            if (_category != null && !vessel.Categories.Contains(_category))
+                continue;
+
+            var vesselEntry = new VesselRow(vessel, access);
+            vesselEntry.OnPurchasePressed += () => OnPurchased?.Invoke(vessel.ID);
+            Vessels.AddChild(vesselEntry);
+        }
+    }
+
+    /// <summary>
+    ///     Populates the list categories that will actually be shown, using the current filters.
+    /// </summary>
+    private void PopulateCategories()
+    {
+        Categories.Clear();
+        foreach (var category in _categories)
+        {
+            Categories.AddItem(category);
+        }
+    }
+
+    public void UpdateState(ShipyardConsoleState state)
+    {
+        BankAccountLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", state.Balance.ToString()));
+        PopulateProducts();
+    }
+}

Content.Client/DeltaV/Shipyard/UI/VesselRow.xaml

@@ -0,0 +1,16 @@
+<PanelContainer xmlns="https://spacestation14.io"
+                xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                HorizontalExpand="True">
+    <BoxContainer Orientation="Horizontal"
+                  HorizontalExpand="True">
+        <Button Name="Purchase" Text="{Loc 'purchase'}" StyleClasses="LabelSubText" />
+        <Label Name="VesselName" HorizontalExpand="True" />
+        <PanelContainer>
+            <PanelContainer.PanelOverride>
+                <gfx:StyleBoxFlat BackgroundColor="#25252A" />
+            </PanelContainer.PanelOverride>
+
+            <Label Name="Price" MinSize="52 32" Align="Right" />
+        </PanelContainer>
+    </BoxContainer>
+</PanelContainer>

Content.Client/DeltaV/Shipyard/UI/VesselRow.xaml.cs

@@ -0,0 +1,29 @@
+using Content.Shared.Shipyard.Prototypes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.DeltaV.Shipyard.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class VesselRow : PanelContainer
+{
+    public event Action? OnPurchasePressed;
+
+    public VesselRow(VesselPrototype vessel, bool access)
+    {
+        RobustXamlLoader.Load(this);
+
+        VesselName.Text = vessel.Name;
+
+        var tooltip = new Tooltip();
+        tooltip.SetMessage(FormattedMessage.FromMarkup(vessel.Description));
+        Purchase.TooltipSupplier = _ => tooltip;
+        Purchase.Disabled = !access;
+        Purchase.OnPressed += _ => OnPurchasePressed?.Invoke();
+
+        Price.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", vessel.Price));
+    }
+}

Content.Client/IoC/ClientContentIoC.cs

@@ -21,6 +21,7 @@
 using Content.Client.Guidebook;
 using Content.Client.Replay;
 using Content.Shared.Administration.Managers;
+using Content.Shared.Players.PlayTimeTracking;
 
 
 namespace Content.Client.IoC
@@ -29,26 +30,29 @@ internal static class ClientContentIoC
     {
         public static void Register()
         {
-            IoCManager.Register<IParallaxManager, ParallaxManager>();
-            IoCManager.Register<IChatManager, ChatManager>();
-            IoCManager.Register<IClientPreferencesManager, ClientPreferencesManager>();
-            IoCManager.Register<IStylesheetManager, StylesheetManager>();
-            IoCManager.Register<IScreenshotHook, ScreenshotHook>();
-            IoCManager.Register<FullscreenHook, FullscreenHook>();
-            IoCManager.Register<IClickMapManager, ClickMapManager>();
-            IoCManager.Register<IClientAdminManager, ClientAdminManager>();
-            IoCManager.Register<ISharedAdminManager, ClientAdminManager>();
-            IoCManager.Register<EuiManager, EuiManager>();
-            IoCManager.Register<IVoteManager, VoteManager>();
-            IoCManager.Register<ChangelogManager, ChangelogManager>();
-            IoCManager.Register<RulesManager, RulesManager>();
-            IoCManager.Register<ViewportManager, ViewportManager>();
-            IoCManager.Register<ISharedAdminLogManager, SharedAdminLogManager>();
-            IoCManager.Register<GhostKickManager>();
-            IoCManager.Register<ExtendedDisconnectInformationManager>();
-            IoCManager.Register<JobRequirementsManager>();
-            IoCManager.Register<DocumentParsingManager>();
-            IoCManager.Register<ContentReplayPlaybackManager, ContentReplayPlaybackManager>();
+            var collection = IoCManager.Instance!;
+
+            collection.Register<IParallaxManager, ParallaxManager>();
+            collection.Register<IChatManager, ChatManager>();
+            collection.Register<IClientPreferencesManager, ClientPreferencesManager>();
+            collection.Register<IStylesheetManager, StylesheetManager>();
+            collection.Register<IScreenshotHook, ScreenshotHook>();
+            collection.Register<FullscreenHook, FullscreenHook>();
+            collection.Register<IClickMapManager, ClickMapManager>();
+            collection.Register<IClientAdminManager, ClientAdminManager>();
+            collection.Register<ISharedAdminManager, ClientAdminManager>();
+            collection.Register<EuiManager, EuiManager>();
+            collection.Register<IVoteManager, VoteManager>();
+            collection.Register<ChangelogManager, ChangelogManager>();
+            collection.Register<RulesManager, RulesManager>();
+            collection.Register<ViewportManager, ViewportManager>();
+            collection.Register<ISharedAdminLogManager, SharedAdminLogManager>();
+            collection.Register<GhostKickManager>();
+            collection.Register<ExtendedDisconnectInformationManager>();
+            collection.Register<JobRequirementsManager>();
+            collection.Register<DocumentParsingManager>();
+            collection.Register<ContentReplayPlaybackManager, ContentReplayPlaybackManager>();
+            collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
         }
     }
 }