Merge branch 'master' into 2025-01-31-uncloneable-text

Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs

@@ -9,7 +9,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
-using static Content.Shared.Shipyard.Components.ShuttleDeedComponent;
+using Content.Shared._NF.Shipyard.Components; // Frontier
 
 namespace Content.Client.Access.UI
 {
@@ -243,7 +243,7 @@ private void EnsureValidShuttleName()
             var suffix = ShipSuffixLineEdit.Text;
 
             // We skip suffix validation because it's immutable and is ignored by the server
-            var valid = name.Length <= MaxNameLength
+            var valid = name.Length <= ShuttleDeedComponent.MaxNameLength
                 && name.Trim().Length >= 3; // Arbitrary client-side number, should hopefully be long enough.
 
             ShipNameSaveButton.Disabled = !_interfaceEnabled || !valid;

Content.Client/Ghost/GhostSystem.cs

@@ -11,7 +11,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Timing;
 using Robust.Shared.Player;
-using Content.Server.Corvax.Respawn;
+using Content.Client._Corvax.Respawn; // Frontier
 
 namespace Content.Client.Ghost
 {

Content.Client/Input/ContentContexts.cs

@@ -56,6 +56,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(EngineKeyFunctions.MoveRight);
             human.AddFunction(EngineKeyFunctions.Walk);
             human.AddFunction(ContentKeyFunctions.SwapHands);
+            human.AddFunction(ContentKeyFunctions.SwapHandsPrevious); // Frontier
             human.AddFunction(ContentKeyFunctions.Drop);
             human.AddFunction(ContentKeyFunctions.UseItemInHand);
             human.AddFunction(ContentKeyFunctions.AltUseItemInHand);
@@ -100,6 +101,7 @@ public static void SetupContexts(IInputContextContainer contexts)
             aghost.AddFunction(EngineKeyFunctions.MoveRight);
             aghost.AddFunction(EngineKeyFunctions.Walk);
             aghost.AddFunction(ContentKeyFunctions.SwapHands);
+            aghost.AddFunction(ContentKeyFunctions.SwapHandsPrevious); // Frontier
             aghost.AddFunction(ContentKeyFunctions.Drop);
             aghost.AddFunction(ContentKeyFunctions.UseItemInHand);
             aghost.AddFunction(ContentKeyFunctions.AltUseItemInHand);

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -181,6 +181,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.Drop);
             AddButton(ContentKeyFunctions.ExamineEntity);
             AddButton(ContentKeyFunctions.SwapHands);
+            AddButton(ContentKeyFunctions.SwapHandsPrevious); // Frontier
             AddButton(ContentKeyFunctions.MoveStoredItem);
             AddButton(ContentKeyFunctions.RotateStoredItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);

Content.Client/StationRecords/JobRow.xaml.cs

@@ -1,5 +1,3 @@
-using Content.Shared.Shipyard;
-using Content.Shared.Shipyard.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;

Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs

@@ -12,7 +12,7 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Timing;
-using Content.Server.Corvax.Respawn;
+using Content.Client._Corvax.Respawn; // Frontier
 
 namespace Content.Client.UserInterface.Systems.Ghost;
 

Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs

@@ -1,12 +1,11 @@
-using Content.Client.CryoSleep;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Ghost.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
 using Robust.Shared.Configuration;
-using Content.Shared._NF.CCVar; // Frontier
+using Content.Client._NF.CryoSleep; // Frontier
 
 namespace Content.Client.UserInterface.Systems.Ghost.Widgets;
 
@@ -33,7 +32,7 @@ public GhostGui()
 
         TargetWindow = new GhostTargetWindow();
         RulesWindow = new GhostRespawnRulesWindow();
-        CryosleepWakeupWindow = new CryosleepWakeupWindow();
+        CryosleepWakeupWindow = new CryosleepWakeupWindow(); // Frontier
         RulesWindow.RespawnButton.OnPressed += _ => GhostRespawnPressed?.Invoke();
 
         MouseFilter = MouseFilterMode.Ignore;

Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs

@@ -1,7 +1,7 @@
 using Content.Client.UserInterface.Controls;
 using Content.Client.VendingMachines.UI;
 using Content.Shared.VendingMachines;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components; // Frontier
 using Robust.Client.UserInterface;
 using Robust.Shared.Input;
 using System.Linq;

Content.Client/Corvax/Respawn/RespawnSystem.cs → Content.Client/_Corvax/Respawn/RespawnSystem.cs

@@ -1,6 +1,6 @@
-using Content.Shared.Corvax.Respawn;
+using Content.Shared._Corvax.Respawn;
 
-namespace Content.Server.Corvax.Respawn;
+namespace Content.Client._Corvax.Respawn;
 
 public sealed class RespawnSystem : EntitySystem
 {

Content.Client/Bank/BUI/BankATMMenuBoundUserInterface.cs → Content.Client/_NF/Bank/BUI/BankATMMenuBoundUserInterface.cs

@@ -1,7 +1,6 @@
-using Content.Client.Bank.UI;
-using Content.Shared.Bank.BUI;
-using Content.Shared.Bank.Events;
-using Robust.Client.GameObjects;
+using Content.Client._NF.Bank.UI;
+using Content.Shared._NF.Bank.BUI;
+using Content.Shared._NF.Bank.Events;
 
 namespace Content.Client.Cargo.BUI;
 

Content.Client/Bank/BUI/StationBankATMMenuBoundUserInterface.cs → Content.Client/_NF/Bank/BUI/StationBankATMMenuBoundUserInterface.cs

@@ -1,8 +1,7 @@
-using Content.Client.Bank.UI;
-using Content.Shared.Bank.BUI;
-using Content.Shared.Bank.Events;
+using Content.Shared._NF.Bank.BUI;
+using Content.Shared._NF.Bank.Events;
 
-namespace Content.Client.Cargo.BUI;
+namespace Content.Client._NF.Bank.UI;
 
 public sealed class StationBankATMMenuBoundUserInterface : BoundUserInterface
 {

Content.Client/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs → Content.Client/_NF/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs

@@ -1,8 +1,7 @@
-using Content.Client.Bank.UI;
-using Content.Shared.Bank.BUI;
-using Content.Shared.Bank.Events;
+using Content.Shared._NF.Bank.BUI;
+using Content.Shared._NF.Bank.Events;
 
-namespace Content.Client.Cargo.BUI;
+namespace Content.Client._NF.Bank.UI;
 
 public sealed class WithdrawBankATMMenuBoundUserInterface : BoundUserInterface
 {

Content.Client/_NF/Bank/BankSystem.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Bank;
+using Content.Shared._NF.Bank;
 
 namespace Content.Client.Bank;
 

Content.Client/Bank/UI/BankATMMenu.xaml.cs → Content.Client/_NF/Bank/UI/BankATMMenu.xaml.cs

@@ -1,15 +1,10 @@
-/*
- * New Frontiers - This file is licensed under AGPLv3
- * Copyright (c) 2024 New Frontiers Contributors
- * See AGPLv3.txt for details.
- */
 using Content.Client.UserInterface.Controls;
 using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Bank.UI;
+namespace Content.Client._NF.Bank.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class BankATMMenu : FancyWindow

Content.Client/Bank/UI/StationBankATMMenu.xaml.cs → Content.Client/_NF/Bank/UI/StationBankATMMenu.xaml.cs

@@ -1,15 +1,10 @@
-/*
- * New Frontiers - This file is licensed under AGPLv3
- * Copyright (c) 2024 New Frontiers Contributors
- * See AGPLv3.txt for details.
- */
 using Content.Client.UserInterface.Controls;
 using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Bank.UI;
+namespace Content.Client._NF.Bank.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class StationBankATMMenu : FancyWindow

Content.Client/Bank/UI/WithdrawBankATMMenu.cs → Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.cs

@@ -1,15 +1,10 @@
-/*
- * New Frontiers - This file is licensed under AGPLv3
- * Copyright (c) 2024 New Frontiers Contributors
- * See AGPLv3.txt for details.
- */
 using Content.Client.UserInterface.Controls;
 using Content.Shared._NF.Bank;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Bank.UI;
+namespace Content.Client._NF.Bank.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class WithdrawBankATMMenu : FancyWindow

Content.Client/_NF/CartridgeLoader/Cartridges/LedgerTab.xaml.cs

@@ -1,6 +1,6 @@
 using Content.Shared._NF.Bank;
 using Content.Shared._NF.Bank.BUI;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;

Content.Client/_NF/CartridgeLoader/Cartridges/LedgerUiFragment.xaml.cs

@@ -1,5 +1,5 @@
 using Content.Shared._NF.Bank.BUI;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;

Content.Client/CryoSleep/AcceptCryoWindow.cs → Content.Client/_NF/CryoSleep/AcceptCryoWindow.cs

@@ -4,7 +4,7 @@
 using Robust.Shared.Localization;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
-namespace Content.Client.CryoSleep;
+namespace Content.Client._NF.CryoSleep;
 public sealed class AcceptCryoWindow : DefaultWindow
 {
     public readonly Button DenyButton;

Content.Client/CryoSleep/CryoSleepEui.cs → Content.Client/_NF/CryoSleep/CryoSleepEui.cs

@@ -1,9 +1,9 @@
 using Content.Client.Eui;
-using Content.Shared.CryoSleep;
+using Content.Shared._NF.CryoSleep;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 
-namespace Content.Client.CryoSleep;
+namespace Content.Client._NF.CryoSleep;
 
 [UsedImplicitly]
 public sealed class CryoSleepEui : BaseEui

Content.Client/CryoSleep/CryosleepWakeupWindow.cs → Content.Client/_NF/CryoSleep/CryosleepWakeupWindow.cs

@@ -2,9 +2,9 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Configuration;
-using static Content.Shared.CryoSleep.SharedCryoSleepSystem;
+using static Content.Shared._NF.CryoSleep.SharedCryoSleepSystem;
 
-namespace Content.Client.CryoSleep;
+namespace Content.Client._NF.CryoSleep;
 
 public sealed class CryosleepWakeupWindow : DefaultWindow, IEntityEventSubscriber
 {

Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs → Content.Client/_NF/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs

@@ -1,13 +1,10 @@
-using Content.Client.Shipyard.UI;
+using Content.Client._NF.Shipyard.UI;
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Shipyard;
-using Content.Shared.Shipyard.BUI;
-using Content.Shared.Shipyard.Events;
-using Robust.Client.GameObjects;
-using Robust.Shared.Utility;
+using Content.Shared._NF.Shipyard.BUI;
+using Content.Shared._NF.Shipyard.Events;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.Shipyard.BUI;
+namespace Content.Client._NF.Shipyard.BUI;
 
 public sealed class ShipyardConsoleBoundUserInterface : BoundUserInterface
 {

Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs → Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml.cs

@@ -1,16 +1,16 @@
 using System.Linq;
 using Content.Client.UserInterface.Controls;
-using Content.Client.Shipyard.BUI;
+using Content.Client._NF.Shipyard.BUI;
 using Content.Shared._NF.Bank;
-using Content.Shared.Shipyard.BUI;
-using Content.Shared.Shipyard.Prototypes;
+using Content.Shared._NF.Shipyard.BUI;
+using Content.Shared._NF.Shipyard.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.Shipyard.UI;
+namespace Content.Client._NF.Shipyard.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class ShipyardConsoleMenu : FancyWindow

Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml.cs → Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml.cs

@@ -1,11 +1,11 @@
 using Content.Client.UserInterface.Controls;
-using Content.Client.Shipyard.BUI;
+using Content.Client._NF.Shipyard.BUI;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 using Content.Client.UserInterface.Systems.Actions.Controls;
 
-namespace Content.Client.Shipyard.UI
+namespace Content.Client._NF.Shipyard.UI
 {
     [GenerateTypedNameReferences]
     sealed partial class ShipyardRulesPopup : FancyWindow

Content.Client/Shipyard/UI/VesselRow.xaml.cs → Content.Client/_NF/Shipyard/UI/VesselRow.xaml.cs

@@ -1,13 +1,12 @@
-using Content.Shared.Shipyard;
 using Content.Shared.Guidebook;
-using Content.Shared.Shipyard.Prototypes;
+using Content.Shared._NF.Shipyard.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Content.Client.Guidebook;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.Shipyard.UI;
+namespace Content.Client._NF.Shipyard.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class VesselRow : PanelContainer

Content.IntegrationTests/Tests/_NF/ShipyardTests.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using Content.Server.Cargo.Systems;
-using Content.Shared.Shipyard.Prototypes;
+using Content.Shared._NF.Shipyard.Prototypes;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;

Content.Server/Access/Systems/IdCardConsoleSystem.cs

@@ -11,10 +11,10 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using System.Linq;
-using Content.Server.Shipyard.Systems;
-using Content.Shared.Shipyard.Components;
+using Content.Server._NF.Shipyard.Systems; // Frontier
+using Content.Shared._NF.Shipyard.Components; // Frontier
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
-using static Content.Shared.Shipyard.Components.ShuttleDeedComponent;
+using static Content.Shared._NF.Shipyard.Components.ShuttleDeedComponent; // Frontier
 using Content.Shared.Access;
 
 namespace Content.Server.Access.Systems;

Content.Server/Cargo/Systems/CargoSystem.Orders.cs

@@ -2,7 +2,7 @@
 using Content.Server._NF.Bank; // Frontier
 using Content.Server.Cargo.Components;
 using Content.Server.Labels.Components;
-using Content.Shared.Bank.Components; // Frontier
+using Content.Shared._NF.Bank.Components; // Frontier
 using Content.Server.Station.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.BUI;

Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

@@ -1,6 +1,6 @@
 using Content.Server.Cargo.Components;
 using Content.Shared.Stacks;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components; // Frontier
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Components;

Content.Server/Cloning/CloningSystem.cs

@@ -38,9 +38,10 @@
 using Content.Shared.Emag.Systems;
 using Content.Server.Popups;
 using Content.Server.Traits.Assorted;
-using Content.Shared._NF.Cloning;
-using Content.Shared.Bank.Components;
 using Robust.Shared.Serialization.Manager;
+using Content.Shared._NF.Cloning; // Frontier
+using Content.Shared._NF.Bank.Components; // Frontier
+using Content.Server._NF.Traits.Assorted; // Frontier
 
 namespace Content.Server.Cloning
 {

Content.Server/Forensics/Systems/ForensicScannerSystem.cs

@@ -27,7 +27,7 @@
 using Robust.Shared.Configuration; // Frontier
 using Content.Shared._NF.CCVar; // Frontier
 using Content.Shared._NF.Bank; // Frontier
-using Content.Shared.Bank.Components; // Frontier
+using Content.Shared._NF.Bank.Components; // Frontier
 using Content.Server._NF.Bank; // Frontier
 using Content.Shared._NF.Bank.BUI; // Frontier
 

Content.Server/GameTicking/GameTicker.Spawning.cs

@@ -21,7 +21,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
-using Content.Server.Corvax.Respawn; // Frontier
+using Content.Server._Corvax.Respawn; // Frontier
 
 namespace Content.Server.GameTicking
 {

Content.Server/PDA/PdaSystem.cs

@@ -23,9 +23,9 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
-using Content.Shared.Bank.Components; // Frontier
-using Content.Shared.Shipyard.Components; // Frontier
-using Content.Server.Shipyard.Systems; // Frontier
+using Content.Shared._NF.Bank.Components; // Frontier
+using Content.Shared._NF.Shipyard.Components; // Frontier
+using Content.Server._NF.Shipyard.Systems; // Frontier
 using Content.Server._NF.SectorServices; // Frontier
 
 namespace Content.Server.PDA