Fix Frontier files into frontier namespace (#2797)

* Move Systems

* Fix

* More fixes

* More Fixes

* Cleanup

* More fix

* More fix

* Fix up

* Update BluespaceErrorRule.cs

* migrate upgradeable power components/systems to NF

* Move ChargingComponent (original PR closed)

* Small handful of include fixes

* Another handful of include fixes

* More include fixes

* Fix missing references to Stinky, Uncloneable comp

* fix bank refs (dear lord) and shipyard tests

* Minor comment cleanup, includes

* Fix MindComponent ref

---------

Co-authored-by: Whatstone <whatston3@gmail.com>
Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

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

@@ -9,7 +9,7 @@ using Robust.Client.UserInterface.CustomControls;
 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 @@ namespace Content.Client.Access.UI
             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.Client.UserInterface;
 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/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.IoC;
 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,4 +1,3 @@
-using Content.Client.CryoSleep;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Ghost.Controls;
 using Robust.Client.AutoGenerated;
@@ -6,7 +5,7 @@ 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 sealed partial class GhostGui : UIWidget
 
         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

@@ -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/_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/_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/_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/_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/_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/_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/_NF/CryoSleep/AcceptCryoWindow.cs

@@ -4,7 +4,7 @@ using Robust.Client.UserInterface.CustomControls;
 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/_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/_NF/CryoSleep/CryosleepWakeupWindow.cs

@@ -2,9 +2,9 @@ using Robust.Client.UserInterface;
 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/_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/_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/_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/_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.Server.GameObjects;
 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 System.Diagnostics.CodeAnalysis;
 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 Robust.Shared.Random;
 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 Content.Shared.FixedPoint; // Frontier
 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.Player;
 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.Server.GameObjects;
 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

Content.Server/Power/Components/ChargingComponent.cs

@@ -1,19 +0,0 @@
-using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Power;
-
-namespace Content.Server.Power.Components
-{
-    [RegisterComponent]
-    public sealed partial class ChargingComponent : Component // Frontier: Upstream - #28984
-    {
-        ///<summary>
-        ///References the entity of the charger that is currently powering this battery
-        ///</summary>
-        public EntityUid ChargerUid;
-
-        ///<summary>
-        ///References the component of the charger that is currently powering this battery
-        ///</summary>
-        public ChargerComponent ChargerComponent;
-    }
-}

Content.Server/Power/Components/UpgradeBatteryComponent.cs

@@ -1,28 +0,0 @@
-using Content.Shared.Construction.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Power.Components
-{
-
-    [RegisterComponent]
-    public sealed partial class UpgradeBatteryComponent : Component
-    {
-        /// <summary>
-        ///     The machine part that affects the power capacity.
-        /// </summary>
-        [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
-        public string MachinePartPowerCapacity = "PowerCell";
-
-        /// <summary>
-        ///     The machine part rating is raised to this power when calculating power gain
-        /// </summary>
-        [DataField("maxChargeMultiplier")]
-        public float MaxChargeMultiplier = 2f;
-
-        /// <summary>
-        ///     Power gain scaling
-        /// </summary>
-        [DataField("baseMaxCharge")]
-        public float BaseMaxCharge = 8000000;
-    }
-}

Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs

@@ -1,38 +0,0 @@
-using Content.Server.Construction.Components;
-using Content.Shared.Construction.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Power.Components
-{
-
-    [RegisterComponent]
-    public sealed partial class UpgradePowerSupplyRampingComponent : Component
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float BaseRampRate;
-
-        /// <summary>
-        ///     The machine part that affects the power supply ramping
-        /// </summary>
-        [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
-        public string MachinePartRampRate = "Capacitor";
-
-        /// <summary>
-        ///     The multiplier used for scaling the power supply ramping
-        /// </summary>
-        [DataField("supplyRampingMultiplier")]
-        public float SupplyRampingMultiplier = 1f;
-
-        /// <summary>
-        ///     What type of scaling is being used?
-        /// </summary>
-        [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)]
-        public MachineUpgradeScalingType Scaling;
-
-        /// <summary>
-        ///     The current value that the power supply is being scaled by
-        /// </summary>
-        [DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)]
-        public float ActualScalar = 1f;
-    }
-}

Content.Server/Power/EntitySystems/BatterySystem.cs

@@ -8,6 +8,7 @@ using Content.Shared.Timing;
 using JetBrains.Annotations;
 using Robust.Shared.Utility;
 using Robust.Shared.Timing;
+using Content.Server._NF.Power.Components; // Frontier
 
 namespace Content.Server.Power.EntitySystems
 {

Content.Server/Power/EntitySystems/ChargerSystem.cs

@@ -11,6 +11,7 @@ using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Storage.Components;
 using Robust.Server.Containers;
 using Content.Shared.Whitelist;
+using Content.Server._NF.Power.Components; // Frontier
 
 namespace Content.Server.Power.EntitySystems;
 

Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs

@@ -1,39 +0,0 @@
-using Content.Server.Construction;
-using Content.Server.Power.Components;
-using JetBrains.Annotations;
-
-namespace Content.Server.Power.EntitySystems
-{
-    [UsedImplicitly]
-    public sealed class UpgradeBatterySystem : EntitySystem
-    {
-        [Dependency] private readonly BatterySystem _batterySystem = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<UpgradeBatteryComponent, RefreshPartsEvent>(OnRefreshParts);
-            SubscribeLocalEvent<UpgradeBatteryComponent, UpgradeExamineEvent>(OnUpgradeExamine);
-        }
-
-        public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args)
-        {
-            var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity];
-
-            if (TryComp<BatteryComponent>(uid, out var batteryComp))
-            {
-                _batterySystem.SetMaxCharge(uid, MathF.Pow(component.MaxChargeMultiplier, powerCellRating - 1) * component.BaseMaxCharge, batteryComp);
-            }
-        }
-
-        private void OnUpgradeExamine(EntityUid uid, UpgradeBatteryComponent component, UpgradeExamineEvent args)
-        {
-            // UpgradeBatteryComponent.MaxChargeMultiplier is not the actual multiplier, so we have to do this.
-            if (TryComp<BatteryComponent>(uid, out var batteryComp))
-            {
-                args.AddPercentageUpgrade("upgrade-max-charge", batteryComp.MaxCharge / component.BaseMaxCharge);
-            }
-        }
-    }
-}

Content.Server/Power/Generator/GeneratorSystem.cs

@@ -12,6 +12,7 @@ using Robust.Server.GameObjects;
 using Content.Shared.Radiation.Components; // Frontier
 using Content.Shared.Audio; // Frontier
 using Content.Shared.Materials; // Frontier
+using Content.Server._NF.Power.Components; // Frontier
 
 namespace Content.Server.Power.Generator;
 
@@ -28,14 +29,14 @@ public sealed class GeneratorSystem : SharedGeneratorSystem
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly PuddleSystem _puddle = default!;
 
-    [Dependency] private readonly PointLightSystem _pointLight = default!; // Frontier - Rads glow
-    [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; // Frontier - Rads sound
+    [Dependency] private readonly PointLightSystem _pointLight = default!; // Frontier: Rads glow
+    [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; // Frontier: Rads sound
 
-    private EntityQuery<UpgradePowerSupplierComponent> _upgradeQuery;
+    private EntityQuery<UpgradePowerSupplierComponent> _upgradeQuery; // Frontier: keeping upgradeable power supplies
 
     public override void Initialize()
     {
-        _upgradeQuery = GetEntityQuery<UpgradePowerSupplierComponent>();
+        _upgradeQuery = GetEntityQuery<UpgradePowerSupplierComponent>(); // Frontier: keeping upgradeable power supplies
 
         UpdatesBefore.Add(typeof(PowerNetSystem));
 

Content.Server/Species/Systems/NymphSystem.cs

@@ -1,6 +1,6 @@
 using Content.Server.Cargo.Components;
 using Content.Server.Mind;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components; // Frontier
 using Content.Shared.Species.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Zombies;
@@ -48,14 +48,12 @@ public sealed partial class NymphSystem : EntitySystem
             _mindSystem.TransferTo(mindId, nymph, mind: mind);
 
 
-            // Frontier
+            // Frontier: bank account transfer, mob setup
             EnsureComp<CargoSellBlacklistComponent>(nymph);
 
-            // Frontier: bank account transfer
             if (HasComp<BankAccountComponent>(args.OldBody))
-            {
                 EnsureComp<BankAccountComponent>(nymph);
-            }
+            // End Frontier
         }
 
         // Delete the old organ

Content.Server/Station/Systems/StationSpawningSystem.cs

@@ -28,7 +28,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using Content.Server.Spawners.Components;
-using Content.Shared.Bank.Components; // DeltaV
+using Content.Shared._NF.Bank.Components; // DeltaV
 using Content.Server._NF.Bank; // Frontier
 using Content.Server.Preferences.Managers; // Frontier
 using System.Linq; // Frontier

Content.Server/VendingMachines/VendingMachineSystem.cs

@@ -13,7 +13,7 @@ using Content.Server.Station.Systems;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Actions;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components; // Frontier
 using Content.Shared.Damage;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;

Content.Server/_Corvax/Respawn/RespawnSystem.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 using Content.Server.Ghost.Roles.Components;
-using Content.Shared.Corvax.Respawn;
+using Content.Shared._Corvax.Respawn;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
@@ -9,14 +9,14 @@ using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Content.Shared._NF.CCVar; // Frontier
 using Robust.Shared.Configuration; // Frontier
-using Content.Server.CryoSleep; // Frontier
+using Content.Server._NF.CryoSleep; // Frontier
 using Robust.Shared.Player; // Frontier
 using Content.Shared.Ghost; // Frontier
 using Content.Server.Administration.Managers; // Frontier
 using Content.Server.Administration; // Frontier
 using Content.Shared.GameTicking; // Frontier
 
-namespace Content.Server.Corvax.Respawn;
+namespace Content.Server._Corvax.Respawn;
 
 public sealed class RespawnSystem : EntitySystem
 {

Content.Server/_DV/Mail/EntitySystems/MailSystem.cs

@@ -48,7 +48,7 @@ using Content.Server._NF.Bank; // Frontier
 using Content.Server._NF.SectorServices; // Frontier
 using Content.Server.Station.Components; // Frontier
 using Robust.Shared.Enums; // Frontier
-using Content.Shared.Bank.Components; // Frontier
+using Content.Shared._NF.Bank.Components; // Frontier
 using Content.Shared._NF.Bank.BUI; // Frontier
 
 namespace Content.Server._DV.Mail.EntitySystems

Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs

@@ -17,7 +17,7 @@ using Content.Shared._NF.Atmos.Systems;
 using Content.Shared._NF.Atmos.Visuals;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Piping.Binary.Components;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 using Content.Shared.Database;
 using Content.Shared.Power;
 using Robust.Server.Audio;

Content.Server/_NF/Bank/ATMSystem.cs

@@ -5,9 +5,9 @@
  */
 using Content.Server.Popups;
 using Content.Server.Stack;
-using Content.Shared.Bank.BUI;
-using Content.Shared.Bank.Components;
-using Content.Shared.Bank.Events;
+using Content.Shared._NF.Bank.BUI;
+using Content.Shared._NF.Bank.Components;
+using Content.Shared._NF.Bank.Events;
 using Content.Shared.Coordinates;
 using Content.Shared.Stacks;
 using Content.Shared.UserInterface;

Content.Server/_NF/Bank/BankSystem.Ledger.cs

@@ -1,8 +1,8 @@
 using System.Text;
 using Content.Shared._NF.Bank;
 using Content.Shared._NF.Bank.BUI;
-using Content.Shared.Bank;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank;
+using Content.Shared._NF.Bank.Components;
 
 namespace Content.Server._NF.Bank;
 

Content.Server/_NF/Bank/BankSystem.Sector.cs

@@ -1,8 +1,8 @@
 using System.Runtime.InteropServices;
 using Content.Server._NF.SectorServices;
 using Content.Shared._NF.Bank.BUI;
-using Content.Shared.Bank;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank;
+using Content.Shared._NF.Bank.Components;
 using JetBrains.Annotations;
 
 namespace Content.Server._NF.Bank;

Content.Server/_NF/Bank/BankSystem.cs

@@ -1,8 +1,8 @@
 using System.Threading;
 using Content.Server.Preferences.Managers;
 using Content.Server.GameTicking;
-using Content.Shared.Bank;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank;
+using Content.Shared._NF.Bank.Components;
 using Content.Shared.Preferences;
 using Robust.Shared.Player;
 using System.Diagnostics.CodeAnalysis;

Content.Server/_NF/Bank/SectorBankComponent.cs

@@ -1,5 +1,5 @@
 using Content.Shared._NF.Bank.BUI;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 
 namespace Content.Server._NF.Bank;
 

Content.Server/_NF/Bank/StationATMSystem.cs

@@ -3,14 +3,14 @@
  * Copyright (c) 2024 New Frontiers Contributors
  * See AGPLv3.txt for details.
  */
-using Content.Shared.Bank;
-using Content.Shared.Bank.Components;
-using Content.Shared.Bank.Events;
+using Content.Shared._NF.Bank;
+using Content.Shared._NF.Bank.Components;
+using Content.Shared._NF.Bank.Events;
 using Content.Shared.Coordinates;
 using Content.Shared.Stacks;
 using Content.Server.Station.Systems;
 using Content.Server.Cargo.Systems;
-using Content.Shared.Bank.BUI;
+using Content.Shared._NF.Bank.BUI;
 using Content.Shared.Access.Systems;
 using Content.Shared.Database;
 using Robust.Shared.Containers;

Content.Server/_NF/Commands/GhostRespawnCommand.cs

@@ -1,4 +1,4 @@
-using Content.Server.Corvax.Respawn;
+using Content.Server._Corvax.Respawn;
 using Content.Server.GameTicking;
 using Content.Server.Mind;
 using Content.Shared.Administration;
@@ -13,7 +13,7 @@ using Robust.Shared.Console;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
-namespace Content.Server.NF14.Commands;
+namespace Content.Server._NF.Commands;
 
 [AnyCommand()]
 public sealed class GhostRespawnCommand : IConsoleCommand

Content.Server/_NF/Commands/SpawnRefundCommand.cs

@@ -11,7 +11,7 @@ using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Server.NF14.Commands;
+namespace Content.Server._NF.Commands;
 
 [AdminCommand(AdminFlags.Admin)]
 public sealed class SpawnRefundCommand : IConsoleCommand

Content.Server/_NF/CryoSleep/CryoSleepComponent.cs

@@ -2,7 +2,7 @@ using Content.Shared.DoAfter;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 
-namespace Content.Server.CryoSleep;
+namespace Content.Server._NF.CryoSleep;
 [RegisterComponent]
 public sealed partial class CryoSleepComponent : Component
 {

Content.Server/_NF/CryoSleep/CryoSleepEui.cs

@@ -1,8 +1,8 @@
 using Content.Server.EUI;
-using Content.Shared.CryoSleep;
+using Content.Shared._NF.CryoSleep;
 using Content.Shared.Eui;
 
-namespace Content.Server.CryoSleep;
+namespace Content.Server._NF.CryoSleep;
 
 public sealed class CryoSleepEui : BaseEui
 {

Content.Server/_NF/CryoSleep/CryoSleepFallbackComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.CryoSleep;
+namespace Content.Server._NF.CryoSleep;
 
 // In the case a user's body cannot be revived in a cryopod, this component denotes an entity as being
 // a fallback to revive them at.

Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs

@@ -11,7 +11,7 @@ using Content.Shared.Players;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 
-namespace Content.Server.CryoSleep;
+namespace Content.Server._NF.CryoSleep;
 
 public sealed partial class CryoSleepSystem
 {

Content.Server/_NF/CryoSleep/CryoSleepSystem.cs

@@ -5,10 +5,10 @@ using Content.Server.GameTicking;
 using Content.Server.Interaction;
 using Content.Server.Mind;
 using Content.Server.Popups;
-using Content.Server.Shipyard.Systems;
+using Content.Server._NF.Shipyard.Systems;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Climbing.Systems;
-using Content.Shared.CryoSleep;
+using Content.Shared._NF.CryoSleep;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.DragDrop;
@@ -30,7 +30,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Content.Server.Ghost;
 
-namespace Content.Server.CryoSleep;
+namespace Content.Server._NF.CryoSleep;
 
 public sealed partial class CryoSleepSystem : SharedCryoSleepSystem
 {

Content.Server/_NF/CryoSleep/CryosleepEvents.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.Network;
 
-namespace Content.Server.CryoSleep;
+namespace Content.Server._NF.CryoSleep;
 
 public abstract class BaseCryosleepEvent : EntityEventArgs
 {

Content.Server/_NF/GameRule/PointOfInterestSystem.cs

@@ -11,6 +11,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Content.Server._NF.Station.Systems;
 
 namespace Content.Server._NF.GameRule;
 

Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs

@@ -4,7 +4,7 @@ using Content.Server._NF.Market.Extensions;
 using Content.Shared._NF.Market;
 using Content.Shared._NF.Market.Components;
 using Content.Shared._NF.Market.Events;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
 using Content.Shared._NF.CrateMachine.Components;

Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs

@@ -6,7 +6,7 @@ using Content.Server.Storage.Components;
 using Content.Shared._NF.Market;
 using Content.Shared._NF.Market.BUI;
 using Content.Shared._NF.Market.Events;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Power;
 using Content.Shared.Stacks;

Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 using Robust.Shared.Audio;
 
 namespace Content.Server._NF.Medical;

Content.Server/_NF/Medical/MedicalBountySystem.cs

@@ -7,7 +7,6 @@ using Content.Server.Body.Systems;
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Stack;
-using Content.Server.Traits.Assorted;
 using Content.Shared._NF.Bank.BUI;
 using Content.Shared._NF.Medical;
 using Content.Shared._NF.Medical.Prototypes;
@@ -18,13 +17,13 @@ using Content.Shared.Damage.Prototypes;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Power;
-using Content.Shared.Stacks;
 using Content.Shared.UserInterface;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Content.Server._NF.Traits.Assorted;
 
 namespace Content.Server._NF.Medical;
 

Content.Server/_NF/Power/Components/ChargingComponent.cs

@@ -0,0 +1,17 @@
+using Content.Server.Power.Components;
+
+namespace Content.Server._NF.Power.Components;
+
+[RegisterComponent]
+public sealed partial class ChargingComponent : Component // Frontier: Upstream - #28984
+{
+    ///<summary>
+    ///References the entity of the charger that is currently powering this battery
+    ///</summary>
+    public EntityUid ChargerUid;
+
+    ///<summary>
+    ///References the component of the charger that is currently powering this battery
+    ///</summary>
+    public ChargerComponent ChargerComponent;
+}

Content.Server/_NF/Power/Components/UpgradeBatteryComponent.cs

@@ -0,0 +1,26 @@
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server._NF.Power.Components;
+
+[RegisterComponent]
+public sealed partial class UpgradeBatteryComponent : Component
+{
+    /// <summary>
+    ///     The machine part that affects the power capacity.
+    /// </summary>
+    [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+    public string MachinePartPowerCapacity = "PowerCell";
+
+    /// <summary>
+    ///     The machine part rating is raised to this power when calculating power gain
+    /// </summary>
+    [DataField("maxChargeMultiplier")]
+    public float MaxChargeMultiplier = 2f;
+
+    /// <summary>
+    ///     Power gain scaling
+    /// </summary>
+    [DataField("baseMaxCharge")]
+    public float BaseMaxCharge = 8000000;
+}

Content.Server/_NF/Power/Components/UpgradePowerDrawComponent.cs

@@ -2,7 +2,7 @@
 using Content.Shared.Construction.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Power.Components;
+namespace Content.Server._NF.Power.Components;
 
 /// <summary>
 /// This is used for machines whose power draw
@@ -37,5 +37,3 @@ public sealed partial class UpgradePowerDrawComponent : Component
     [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)]
     public MachineUpgradeScalingType Scaling;
 }
-
-

Content.Server/_NF/Power/Components/UpgradePowerSupplierComponent.cs

@@ -2,7 +2,7 @@
 using Content.Shared.Construction.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Power.Components;
+namespace Content.Server._NF.Power.Components;
 
 [RegisterComponent]
 public sealed partial class UpgradePowerSupplierComponent : Component

Content.Server/_NF/Power/Components/UpgradePowerSupplyRampingComponent.cs

@@ -0,0 +1,36 @@
+using Content.Server.Construction.Components;
+using Content.Shared.Construction.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server._NF.Power.Components;
+
+[RegisterComponent]
+public sealed partial class UpgradePowerSupplyRampingComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float BaseRampRate;
+
+    /// <summary>
+    ///     The machine part that affects the power supply ramping
+    /// </summary>
+    [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer<MachinePartPrototype>))]
+    public string MachinePartRampRate = "Capacitor";
+
+    /// <summary>
+    ///     The multiplier used for scaling the power supply ramping
+    /// </summary>
+    [DataField("supplyRampingMultiplier")]
+    public float SupplyRampingMultiplier = 1f;
+
+    /// <summary>
+    ///     What type of scaling is being used?
+    /// </summary>
+    [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)]
+    public MachineUpgradeScalingType Scaling;
+
+    /// <summary>
+    ///     The current value that the power supply is being scaled by
+    /// </summary>
+    [DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)]
+    public float ActualScalar = 1f;
+}

Content.Server/_NF/Power/EntitySystems/UpgradeBatterySystem.cs

@@ -0,0 +1,40 @@
+using Content.Server.Construction;
+using Content.Server.Power.Components;
+using JetBrains.Annotations;
+using Content.Server._NF.Power.Components;
+using Content.Server.Power.EntitySystems;
+
+namespace Content.Server._NF.Power.EntitySystems;
+
+[UsedImplicitly]
+public sealed class UpgradeBatterySystem : EntitySystem
+{
+    [Dependency] private readonly BatterySystem _batterySystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<UpgradeBatteryComponent, RefreshPartsEvent>(OnRefreshParts);
+        SubscribeLocalEvent<UpgradeBatteryComponent, UpgradeExamineEvent>(OnUpgradeExamine);
+    }
+
+    public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args)
+    {
+        var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity];
+
+        if (TryComp<BatteryComponent>(uid, out var batteryComp))
+        {
+            _batterySystem.SetMaxCharge(uid, MathF.Pow(component.MaxChargeMultiplier, powerCellRating - 1) * component.BaseMaxCharge, batteryComp);
+        }
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, UpgradeBatteryComponent component, UpgradeExamineEvent args)
+    {
+        // UpgradeBatteryComponent.MaxChargeMultiplier is not the actual multiplier, so we have to do this.
+        if (TryComp<BatteryComponent>(uid, out var batteryComp))
+        {
+            args.AddPercentageUpgrade("upgrade-max-charge", batteryComp.MaxCharge / component.BaseMaxCharge);
+        }
+    }
+}

Content.Server/_NF/Power/EntitySystems/UpgradePowerSystem.cs

@@ -1,8 +1,9 @@
 using Content.Server.Construction;
 using Content.Server.Construction.Components;
 using Content.Server.Power.Components;
+using Content.Server._NF.Power.Components;
 
-namespace Content.Server.Power.EntitySystems;
+namespace Content.Server._NF.Power.EntitySystems;
 
 /// <summary>
 /// This handles using upgraded machine parts

Content.Server/_NF/PublicTransit/PublicTransitSystem.cs

@@ -13,8 +13,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
-using Content.Server.Warps;
-using Content.Server.Station.Systems;
+using Content.Server._NF.Station.Systems;
 
 namespace Content.Server._NF.PublicTransit;
 

Content.Server/_NF/Shipyard/Commands/PurchaseShuttleCommand.cs

@@ -1,10 +1,9 @@
 using Content.Server.Administration;
-using Content.Server.Maps;
-using Content.Server.Shipyard.Systems;
+using Content.Server._NF.Shipyard.Systems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
-namespace Content.Server.Shipyard.Commands;
+namespace Content.Server._NF.Shipyard.Commands;
 
 /// <summary>
 /// Purchases a shuttle and docks it to a station.

Content.Server/_NF/Shipyard/Components/ShipyardVoucherComponent.cs

@@ -1,8 +1,8 @@
 using Content.Shared.Access;
-using Content.Shared.Shipyard;
+using Content.Shared._NF.Shipyard;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Shipyard.Components;
+namespace Content.Server._NF.Shipyard.Components;
 
 [RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class ShipyardVoucherComponent : Component

Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs

@@ -2,15 +2,15 @@ using Content.Server.Access.Systems;
 using Content.Server.Popups;
 using Content.Server.Radio.EntitySystems;
 using Content.Server._NF.Bank;
-using Content.Server.Shipyard.Components;
-using Content.Shared.Bank.Components;
-using Content.Shared.Shipyard.Events;
-using Content.Shared.Shipyard.BUI;
-using Content.Shared.Shipyard.Prototypes;
-using Content.Shared.Shipyard.Components;
+using Content.Server._NF.Shipyard.Components;
+using Content.Shared._NF.Bank.Components;
+using Content.Shared._NF.Shipyard.Events;
+using Content.Shared._NF.Shipyard.BUI;
+using Content.Shared._NF.Shipyard.Prototypes;
+using Content.Shared._NF.Shipyard.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Access.Components;
-using Content.Shared.Shipyard;
+using Content.Shared._NF.Shipyard;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
@@ -29,9 +29,9 @@ using Content.Server.StationRecords;
 using Content.Server.StationRecords.Systems;
 using Content.Shared.Database;
 using Content.Shared.Preferences;
-using static Content.Shared.Shipyard.Components.ShuttleDeedComponent;
+using static Content.Shared._NF.Shipyard.Components.ShuttleDeedComponent;
 using Content.Server.Shuttles.Components;
-using Content.Server.Station.Components;
+using Content.Server._NF.Station.Components;
 using System.Text.RegularExpressions;
 using Content.Server._NF.ShuttleRecords;
 using Content.Shared.UserInterface;
@@ -42,7 +42,7 @@ using Content.Shared._NF.ShuttleRecords;
 using Content.Server.StationEvents.Components;
 using Content.Shared._NF.Bank.BUI;
 
-namespace Content.Server.Shipyard.Systems;
+namespace Content.Server._NF.Shipyard.Systems;
 
 public sealed partial class ShipyardSystem : SharedShipyardSystem
 {

Content.Server/_NF/Shipyard/Systems/ShipyardSystem.cs

@@ -3,26 +3,24 @@ using Content.Server.Shuttles.Components;
 using Content.Server.Station.Components;
 using Content.Server.Cargo.Systems;
 using Content.Server.Station.Systems;
-using Content.Shared.Shipyard.Components;
-using Content.Shared.Shipyard;
+using Content.Shared._NF.Shipyard.Components;
+using Content.Shared._NF.Shipyard;
 using Content.Shared.GameTicking;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Map;
-using Content.Shared.CCVar;
 using Content.Shared._NF.CCVar;
 using Robust.Shared.Configuration;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Shared.Coordinates;
-using Content.Shared.Shipyard.Events;
+using Content.Shared._NF.Shipyard.Events;
 using Content.Shared.Mobs.Components;
 using Robust.Shared.Containers;
-using Content.Server._NF.Smuggling.Components;
 using Robust.Shared.Map.Components;
+using Content.Server._NF.Station.Components;
 
-namespace Content.Server.Shipyard.Systems;
+namespace Content.Server._NF.Shipyard.Systems;
 
 public sealed partial class ShipyardSystem : SharedShipyardSystem
 {

Content.Server/_NF/Shipyard/Systems/ShuttleDeedSystem.cs

@@ -1,8 +1,8 @@
-using Content.Shared.Shipyard.Components;
+using Content.Shared._NF.Shipyard.Components;
 using Content.Shared.Examine;
-using Content.Server.Shipyard.Systems;
+using Content.Server._NF.Shipyard.Systems;
 
-namespace Content.Shared.Shipyard;
+namespace Content.Shared._NF.Shipyard;
 
 public sealed partial class ShuttleDeedSystem : EntitySystem
 {

Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server._NF.Bank;
 using Content.Server.Cargo.Components;
 using Content.Shared._NF.Bank.BUI;
@@ -7,7 +7,7 @@ using Content.Shared._NF.ShuttleRecords.Components;
 using Content.Shared._NF.ShuttleRecords.Events;
 using Content.Shared.Access.Components;
 using Content.Shared.Database;
-using Content.Shared.Shipyard.Components;
+using Content.Shared._NF.Shipyard.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 

Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Server._NF.SectorServices;
 using Content.Server._NF.ShuttleRecords.Components;
 using Content.Server.Administration.Logs;
@@ -7,7 +7,7 @@ using Content.Server.Popups;
 using Content.Server.Station.Systems;
 using Content.Shared._NF.ShuttleRecords;
 using Content.Shared.Access.Systems;
-using Content.Shared.Shipyard.Components;
+using Content.Shared._NF.Shipyard.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Timing;
 

Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs

@@ -4,7 +4,7 @@
 using Content.Server._NF.Station.Components;
 using Content.Server.Shuttles.Components;
 using Content.Shared._NF.Shuttles.Events;
-using Content.Shared.Shipyard.Components;
+using Content.Shared._NF.Shipyard.Components;
 using Robust.Shared.Physics.Components;
 
 namespace Content.Server.Shuttles.Systems;

Content.Server/_NF/Smuggling/DeadDropSystem.cs

@@ -5,7 +5,7 @@ using Content.Server._NF.SectorServices;
 using Content.Server._NF.Smuggling.Components;
 using Content.Server.Administration.Logs;
 using Content.Server.Radio.EntitySystems;
-using Content.Server.Shipyard.Systems;
+using Content.Server._NF.Shipyard.Systems;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Station.Components;
@@ -28,6 +28,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Content.Server._NF.Station.Systems;
 
 namespace Content.Server._NF.Smuggling;
 

Content.Server/_NF/Species/Components/GoblinComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server._NF.Goblin.Components;
+namespace Content.Server._NF.Species.Components;
 
 [RegisterComponent]
 public sealed partial class GoblinComponent : Component

Content.Server/_NF/Station/Components/StationDeedSpawnerComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.Station.Components;
+namespace Content.Server._NF.Station.Components;
 
 /// <summary>
 /// Copy deep of a ship to a new card

Content.Server/_NF/Station/Systems/StationRenameWarpsSystems.cs

@@ -1,9 +1,10 @@
 using System.Linq;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
+using Content.Server.Station.Systems;
 using Content.Server.Warps;
 
-namespace Content.Server.Station.Systems;
+namespace Content.Server._NF.Station.Systems;
 
 public sealed class StationRenameWarpsSystems : EntitySystem
 {

Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs

@@ -4,10 +4,11 @@ using Content.Shared.Dataset;
 using Content.Shared.Procedural;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 using Robust.Shared.Map;
+using Content.Server._NF.StationEvents.Events;
 
-namespace Content.Server.StationEvents.Components;
+namespace Content.Server._NF.StationEvents.Components;
 
 [RegisterComponent, Access(typeof(BluespaceErrorRule), typeof(ShuttleSystem))]
 public sealed partial class BluespaceErrorRuleComponent : Component

Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs

@@ -1,6 +1,6 @@
 using System.Numerics;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Mech.Components;
 using Content.Shared.Mind;

Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs

@@ -14,12 +14,12 @@ using Content.Server.GameTicking;
 using Content.Server.Procedural;
 using Robust.Shared.Prototypes;
 using Content.Shared.Salvage;
-using Content.Server.Warps;
-using Content.Server.Station.Systems;
 using Content.Server.Maps.NameGenerators;
-using Content.Shared.Dataset;
+using Content.Server.StationEvents.Events;
+using Content.Server._NF.Station.Systems;
+using Content.Server._NF.StationEvents.Components;
 
-namespace Content.Server.StationEvents.Events;
+namespace Content.Server._NF.StationEvents.Events;
 
 public sealed class BluespaceErrorRule : StationEventSystem<BluespaceErrorRuleComponent>
 {

Content.Server/_NF/Traits/Assorted/FriedTraitComponent.cs

@@ -2,7 +2,7 @@ using System.Numerics;
 using Content.Shared.Nyanotrasen.Kitchen.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.Traits.Assorted;
+namespace Content.Server._NF.Traits.Assorted;
 
 /// <summary>
 /// This is used for the fried trait.

Content.Server/_NF/Traits/Assorted/FriedTraitSystem.cs

@@ -1,7 +1,7 @@
 using Content.Server.Kitchen.EntitySystems;
 using Content.Server.Nyanotrasen.Kitchen.EntitySystems;
 
-namespace Content.Server.Traits.Assorted;
+namespace Content.Server._NF.Traits.Assorted;
 
 /// <summary>
 /// This handles fried trait, causing the affected to look crispy.

Content.Server/_NF/Traits/Assorted/StinkyTraitComponent.cs

@@ -1,7 +1,6 @@
 using System.Numerics;
-using Content.Shared.Atmos;
 
-namespace Content.Server.Traits.Assorted;
+namespace Content.Server._NF.Traits.Assorted;
 
 /// <summary>
 /// This is used for the stinky trait.

Content.Server/_NF/Traits/Assorted/StinkyTraitSystem.cs

@@ -13,7 +13,7 @@ using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Popups;
 using Robust.Shared.Player;
 
-namespace Content.Server.Traits.Assorted;
+namespace Content.Server._NF.Traits.Assorted;
 
 /// <summary>
 /// This handles stink, causing the affected to stink uncontrollably at a random interval.

Content.Server/_NF/Traits/Assorted/UncloneableComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.Traits.Assorted;
+namespace Content.Server._NF.Traits.Assorted;
 
 /// <summary>
 /// This is used for the uncloneable trait.

Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs

@@ -3,7 +3,7 @@ using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Content.Shared.Radio;
 using Robust.Shared.Prototypes;
-using Content.Shared.Bank.Components;
+using Content.Shared._NF.Bank.Components;
 
 namespace Content.Shared.Cargo.Components;
 

Content.Shared/Mind/MindComponent.cs

@@ -4,7 +4,7 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Shared.Corvax.Respawn; // Frontier
+using Content.Shared._Corvax.Respawn; // Frontier
 
 namespace Content.Shared.Mind;
 

Content.Shared/RCD/Systems/RCDSystem.cs

@@ -12,7 +12,7 @@ using Content.Shared.Maps;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
 using Content.Shared.RCD.Components;
-using Content.Shared.Shipyard.Components;
+using Content.Shared._NF.Shipyard.Components; // Frontier
 using Content.Shared.Tag;
 using Content.Shared.Tiles;
 using Robust.Shared.Audio.Systems;