diff --git a/Content.Client/Backmen/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Backmen/Shipyard/UI/ShipyardConsoleMenu.xaml.cs index 56874ac92c2..5a3327e90be 100644 --- a/Content.Client/Backmen/Shipyard/UI/ShipyardConsoleMenu.xaml.cs +++ b/Content.Client/Backmen/Shipyard/UI/ShipyardConsoleMenu.xaml.cs @@ -21,6 +21,8 @@ public sealed partial class ShipyardConsoleMenu : FancyWindow private readonly List _categoryStrings = new(); private string? _category; + private List _allowedGroup = new(); + public ShipyardConsoleMenu(ShipyardConsoleBoundUserInterface owner) { RobustXamlLoader.Load(this); @@ -63,6 +65,14 @@ public void PopulateProducts() var search = SearchBar.Text.Trim().ToLowerInvariant(); foreach (var prototype in vessels) { + if (_allowedGroup.Count != 0 && !_allowedGroup.Contains(prototype.Group)) + { + continue; + } + if (_allowedGroup.Count == 0 && prototype.Private) + { + continue; + } // if no search or category // else if search // else if category and not search @@ -113,5 +123,7 @@ public void PopulateCategories() public void UpdateState(ShipyardConsoleInterfaceState state) { BankAccountLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", state.Balance.ToString())); + _allowedGroup = state.AllowedGroup; + PopulateProducts(); } } diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs index f5ae7d6c317..16d40215c41 100644 --- a/Content.Client/LateJoin/LateJoinGui.cs +++ b/Content.Client/LateJoin/LateJoinGui.cs @@ -65,7 +65,7 @@ public LateJoinGui() { var (station, jobId) = x; Logger.InfoS("latejoin", $"Late joining as ID: {jobId}"); - _consoleHost.ExecuteCommand($"joingame {CommandParsing.Escape(jobId)} {station}"); + _consoleHost.ExecuteCommand($"notice {CommandParsing.Escape(jobId)} {station}"); Close(); }; diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index c3bd0da642a..b51566ef32e 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -27,7 +27,7 @@ Margin="3 3 3 3" /> - diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml index 3fe8e83f57d..6ed48a6f580 100644 --- a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml +++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml @@ -7,7 +7,7 @@