From c2bee3bc4a7eba72039b10adbd81fa7ae9f061dd Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 31 Jan 2025 18:45:12 -0500 Subject: [PATCH 1/5] Keyboard shortcut for "swap to previous hand" (#2801) * Swap to previous hand function * previous fix: ensure default order is fine --- Content.Client/Input/ContentContexts.cs | 2 ++ .../Options/UI/Tabs/KeyRebindTab.xaml.cs | 1 + .../SharedHandsSystem.Interactions.cs | 20 +++++++++++++++++++ Content.Shared/Input/ContentKeyFunctions.cs | 1 + .../en-US/escape-menu/ui/options-menu.ftl | 5 ++++- Resources/keybinds.yml | 6 ++++++ 6 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 639f326f7f4..240d2f5ff76 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/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); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 24be904e061..897ad52e344 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -181,6 +181,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action(); @@ -95,6 +96,25 @@ private void SwapHandsPressed(ICommonSession? session) TrySetActiveHand(session.AttachedEntity.Value, nextHand, component); } + // Frontier: swap hands + private void SwapHandsPreviousPressed(ICommonSession? session) + { + if (!TryComp(session?.AttachedEntity, out HandsComponent? component)) + return; + + if (!_actionBlocker.CanInteract(session.AttachedEntity.Value, null)) + return; + + if (component.ActiveHand == null || component.Hands.Count < 2) + return; + + var newActiveIndex = component.SortedHands.IndexOf(component.ActiveHand.Name) + component.Hands.Count - 1; // Ensure no negatives + var nextHand = component.SortedHands[newActiveIndex % component.Hands.Count]; + + TrySetActiveHand(session.AttachedEntity.Value, nextHand, component); + } + // End Frontier: swap hands + private bool DropPressed(ICommonSession? session, EntityCoordinates coords, EntityUid netEntity) { if (TryComp(session?.AttachedEntity, out HandsComponent? hands) && hands.ActiveHand != null) diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 863d9da970f..20dd64047fb 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -35,6 +35,7 @@ public static class ContentKeyFunctions public static readonly BoundKeyFunction OpenBelt = "OpenBelt"; public static readonly BoundKeyFunction OpenAHelp = "OpenAHelp"; public static readonly BoundKeyFunction SwapHands = "SwapHands"; + public static readonly BoundKeyFunction SwapHandsPrevious = "SwapHandsPrevious"; // Frontier public static readonly BoundKeyFunction MoveStoredItem = "MoveStoredItem"; public static readonly BoundKeyFunction RotateStoredItem = "RotateStoredItem"; public static readonly BoundKeyFunction SaveItemLocation = "SaveItemLocation"; diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index bcc5a994b8b..e25a2c4ceec 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -143,7 +143,10 @@ ui-options-function-activate-item-in-world = Activate item in world ui-options-function-alt-activate-item-in-world = Alternative activate item in world ui-options-function-drop = Drop item ui-options-function-examine-entity = Examine -ui-options-function-swap-hands = Swap hands +# Frontier: add (next) +ui-options-function-swap-hands = Swap hands (next) +# Frontier +ui-options-function-swap-hands-previous = Swap hands (previous) ui-options-function-move-stored-item = Move stored item ui-options-function-rotate-stored-item = Rotate stored item ui-options-function-save-item-location = Save item location diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 3b8158b7c7a..69330251229 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -584,3 +584,9 @@ binds: type: State key: MouseRight canFocus: true +# region Frontier +- function: SwapHandsPrevious + type: State + key: X + mod1: Shift +# endregion Frontier From 989bc6c8f32f02fd90f085e715748a1432065e8f Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 31 Jan 2025 23:45:37 +0000 Subject: [PATCH 2/5] Automatic Changelog (#2801) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 921c1b47515..e0c1b5876a2 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6722,3 +6722,9 @@ Entries: message: Scrap asteroids no longer spawn with gas deposits. id: 5702 time: '2025-01-31T21:51:22.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: A keybind is available to swap to the previous hand (default Shift+X). + id: 5703 + time: '2025-01-31T23:45:13.0000000+00:00' From 3d3e4161ea897ac1d335c618a532533e3c6dd029 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 1 Feb 2025 02:02:10 +0200 Subject: [PATCH 3/5] 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 Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Access/UI/IdCardConsoleWindow.xaml.cs | 4 +- Content.Client/Ghost/GhostSystem.cs | 2 +- Content.Client/StationRecords/JobRow.xaml.cs | 2 - .../Systems/Ghost/GhostUIController.cs | 2 +- .../Systems/Ghost/Widgets/GhostGui.xaml.cs | 5 +-- .../VendingMachineBoundUserInterface.cs | 2 +- .../Respawn/RespawnSystem.cs | 4 +- .../Bank/BUI/BankATMMenuBoundUserInterface.cs | 7 ++-- .../StationBankATMMenuBoundUserInterface.cs | 7 ++-- .../WithdrawlBankATMMenuBoundUserInterface.cs | 7 ++-- Content.Client/_NF/Bank/BankSystem.cs | 2 +- .../{ => _NF}/Bank/UI/BankATMMenu.xaml | 0 .../{ => _NF}/Bank/UI/BankATMMenu.xaml.cs | 7 +--- .../{ => _NF}/Bank/UI/StationBankATMMenu.xaml | 0 .../Bank/UI/StationBankATMMenu.xaml.cs | 7 +--- .../{ => _NF}/Bank/UI/WithdrawBankATMMenu.cs | 7 +--- .../Bank/UI/WithdrawBankATMMenu.xaml | 0 .../Cartridges/LedgerTab.xaml.cs | 2 +- .../Cartridges/LedgerUiFragment.xaml.cs | 2 +- .../{ => _NF}/CryoSleep/AcceptCryoWindow.cs | 2 +- .../{ => _NF}/CryoSleep/CryoSleepEui.cs | 4 +- .../CryoSleep/CryosleepWakeupWindow.cs | 4 +- .../BUI/ShipyardConsoleBoundUserInterface.cs | 11 ++--- .../Shipyard/UI/ShipyardConsoleMenu.xaml | 0 .../Shipyard/UI/ShipyardConsoleMenu.xaml.cs | 8 ++-- .../Shipyard/UI/ShipyardRulesPopup.xaml | 0 .../Shipyard/UI/ShipyardRulesPopup.xaml.cs | 4 +- .../{ => _NF}/Shipyard/UI/VesselRow.xaml | 0 .../{ => _NF}/Shipyard/UI/VesselRow.xaml.cs | 5 +-- .../Tests/_NF/ShipyardTests.cs | 2 +- .../Access/Systems/IdCardConsoleSystem.cs | 6 +-- .../Cargo/Systems/CargoSystem.Orders.cs | 2 +- .../Cargo/Systems/CargoSystem.Shuttle.cs | 2 +- Content.Server/Cloning/CloningSystem.cs | 5 ++- .../Systems/ForensicScannerSystem.cs | 2 +- .../GameTicking/GameTicker.Spawning.cs | 2 +- Content.Server/PDA/PdaSystem.cs | 6 +-- .../Power/Components/ChargingComponent.cs | 19 --------- .../Components/UpgradeBatteryComponent.cs | 28 ------------- .../UpgradePowerSupplyRampingComponent.cs | 38 ------------------ .../Power/EntitySystems/BatterySystem.cs | 1 + .../Power/EntitySystems/ChargerSystem.cs | 1 + .../EntitySystems/UpgradeBatterySystem.cs | 39 ------------------ .../Power/Generator/GeneratorSystem.cs | 9 +++-- Content.Server/Species/Systems/NymphSystem.cs | 8 ++-- .../Station/Systems/StationSpawningSystem.cs | 2 +- .../VendingMachines/VendingMachineSystem.cs | 2 +- .../Respawn/RespawnSystem.cs | 6 +-- .../_DV/Mail/EntitySystems/MailSystem.cs | 2 +- .../_NF/Atmos/Systems/GasDepositSystem.cs | 2 +- Content.Server/_NF/Bank/ATMSystem.cs | 6 +-- Content.Server/_NF/Bank/BankSystem.Ledger.cs | 4 +- Content.Server/_NF/Bank/BankSystem.Sector.cs | 4 +- Content.Server/_NF/Bank/BankSystem.cs | 4 +- .../_NF/Bank/SectorBankComponent.cs | 2 +- Content.Server/_NF/Bank/StationATMSystem.cs | 8 ++-- .../_NF/Commands/GhostRespawnCommand.cs | 4 +- .../_NF/Commands/SpawnRefundCommand.cs | 2 +- .../_NF/CryoSleep/CryoSleepComponent.cs | 2 +- Content.Server/_NF/CryoSleep/CryoSleepEui.cs | 4 +- .../CryoSleep/CryoSleepFallbackComponent.cs | 2 +- .../CryoSleep/CryoSleepSystem.Returning.cs | 2 +- .../_NF/CryoSleep/CryoSleepSystem.cs | 6 +-- .../_NF/CryoSleep/CryosleepEvents.cs | 2 +- .../_NF/GameRule/PointOfInterestSystem.cs | 1 + .../Systems/MarketSystem.CrateMachine.cs | 2 +- .../Systems/MarketSystem.MarketConsole.cs | 2 +- .../MedicalBountyRedemptionComponent.cs | 2 +- .../_NF/Medical/MedicalBountySystem.cs | 3 +- .../_NF/Power/Components/ChargingComponent.cs | 17 ++++++++ .../Components/UpgradeBatteryComponent.cs | 26 ++++++++++++ .../Components/UpgradePowerDrawComponent.cs | 4 +- .../UpgradePowerSupplierComponent.cs | 2 +- .../UpgradePowerSupplyRampingComponent.cs | 36 +++++++++++++++++ .../EntitySystems/UpgradeBatterySystem.cs | 40 +++++++++++++++++++ .../Power/EntitySystems/UpgradePowerSystem.cs | 3 +- .../_NF/PublicTransit/PublicTransitSystem.cs | 3 +- .../Commands/PurchaseShuttleCommand.cs | 5 +-- .../Components/ShipyardVoucherComponent.cs | 4 +- .../Systems/ShipyardSystem.Consoles.cs | 20 +++++----- .../Shipyard/Systems/ShipyardSystem.cs | 12 +++--- .../Shipyard/Systems/ShuttleDeedSystem.cs | 6 +-- .../ShuttleRecordsSystem.Console.cs | 4 +- .../ShuttleRecords/ShuttleRecordsSystem.cs | 4 +- .../_NF/Shuttles/Systems/ShuttleSystem.cs | 2 +- .../_NF/Smuggling/DeadDropSystem.cs | 3 +- .../Components/GoblinComponent.cs | 2 +- .../Components/StationDeedSpawnerComponent.cs | 2 +- .../Systems/StationRenameWarpsSystems.cs | 3 +- .../Components/BluespaceErrorRuleComponent.cs | 5 ++- .../EventSystems/LinkedLifecycleGridSystem.cs | 2 +- .../Events/BluespaceErrorRule.cs | 8 ++-- .../Traits/Assorted/FriedTraitComponent.cs | 2 +- .../Traits/Assorted/FriedTraitSystem.cs | 2 +- .../Traits/Assorted/StinkyTraitComponent.cs | 3 +- .../Traits/Assorted/StinkyTraitSystem.cs | 2 +- .../Traits/Assorted/UncloneableComponent.cs | 2 +- .../Components/CargoOrderConsoleComponent.cs | 2 +- Content.Shared/Mind/MindComponent.cs | 2 +- Content.Shared/RCD/Systems/RCDSystem.cs | 2 +- .../Species/Systems/ReformSystem.cs | 2 +- .../VendingMachineComponent.cs | 2 +- .../Respawn/RespawnResetEvent.cs | 2 +- .../_NF/Bank/BUI/BankATMMenuInterfaceState.cs | 2 +- Content.Shared/_NF/Bank/BUI/NFLedgerState.cs | 2 +- .../BUI/StationBankATMMenuInterfaceState.cs | 2 +- .../_NF/Bank/Components/BankATMComponent.cs | 2 +- .../Bank/Components/BankAccountComponent.cs | 5 +-- .../Components/MarketModifierComponent.cs | 2 +- .../Components/StationBankATMComponent.cs | 2 +- .../_NF/Bank/Events/BankDepositMessage.cs | 2 +- .../_NF/Bank/Events/BankWithdrawMessage.cs | 2 +- .../Bank/Events/StationBankDepositMessage.cs | 2 +- .../Bank/Events/StationBankWithdrawMessage.cs | 2 +- .../_NF/Bank/MarketModifierSystem.cs | 4 +- Content.Shared/_NF/Bank/SharedBankSystem.cs | 4 +- .../CryoSleep/AcceptCryoSleepEuiMessage.cs | 2 +- .../_NF/CryoSleep/SharedCryoSleepSystem.cs | 2 +- .../BUI/ShipyardConsoleInterfaceState.cs | 2 +- .../DisableShipyardSaleComponent.cs | 2 +- .../SharedShipyardConsoleComponent.cs | 4 +- .../Components/ShipyardListingComponent.cs | 4 +- .../Components/ShuttleDeedComponent.cs | 2 +- .../Events/ShipyardConsolePurchaseMessage.cs | 2 +- .../Events/ShipyardConsoleSellMessage.cs | 2 +- .../Shipyard/Prototypes/VesselPrototype.cs | 2 +- .../Shipyard/SharedShipyardSystem.cs | 6 +-- .../ShuttleRecordsConsoleComponent.cs | 2 +- 128 files changed, 311 insertions(+), 343 deletions(-) rename Content.Client/{Corvax => _Corvax}/Respawn/RespawnSystem.cs (83%) rename Content.Client/{ => _NF}/Bank/BUI/BankATMMenuBoundUserInterface.cs (90%) rename Content.Client/{ => _NF}/Bank/BUI/StationBankATMMenuBoundUserInterface.cs (91%) rename Content.Client/{ => _NF}/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs (89%) rename Content.Client/{ => _NF}/Bank/UI/BankATMMenu.xaml (100%) rename Content.Client/{ => _NF}/Bank/UI/BankATMMenu.xaml.cs (90%) rename Content.Client/{ => _NF}/Bank/UI/StationBankATMMenu.xaml (100%) rename Content.Client/{ => _NF}/Bank/UI/StationBankATMMenu.xaml.cs (96%) rename Content.Client/{ => _NF}/Bank/UI/WithdrawBankATMMenu.cs (86%) rename Content.Client/{ => _NF}/Bank/UI/WithdrawBankATMMenu.xaml (100%) rename Content.Client/{ => _NF}/CryoSleep/AcceptCryoWindow.cs (98%) rename Content.Client/{ => _NF}/CryoSleep/CryoSleepEui.cs (91%) rename Content.Client/{ => _NF}/CryoSleep/CryosleepWakeupWindow.cs (97%) rename Content.Client/{ => _NF}/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs (92%) rename Content.Client/{ => _NF}/Shipyard/UI/ShipyardConsoleMenu.xaml (100%) rename Content.Client/{ => _NF}/Shipyard/UI/ShipyardConsoleMenu.xaml.cs (98%) rename Content.Client/{ => _NF}/Shipyard/UI/ShipyardRulesPopup.xaml (100%) rename Content.Client/{ => _NF}/Shipyard/UI/ShipyardRulesPopup.xaml.cs (90%) rename Content.Client/{ => _NF}/Shipyard/UI/VesselRow.xaml (100%) rename Content.Client/{ => _NF}/Shipyard/UI/VesselRow.xaml.cs (90%) delete mode 100644 Content.Server/Power/Components/ChargingComponent.cs delete mode 100644 Content.Server/Power/Components/UpgradeBatteryComponent.cs delete mode 100644 Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs delete mode 100644 Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs rename Content.Server/{Corvax => _Corvax}/Respawn/RespawnSystem.cs (98%) create mode 100644 Content.Server/_NF/Power/Components/ChargingComponent.cs create mode 100644 Content.Server/_NF/Power/Components/UpgradeBatteryComponent.cs rename Content.Server/{ => _NF}/Power/Components/UpgradePowerDrawComponent.cs (96%) rename Content.Server/{ => _NF}/Power/Components/UpgradePowerSupplierComponent.cs (96%) create mode 100644 Content.Server/_NF/Power/Components/UpgradePowerSupplyRampingComponent.cs create mode 100644 Content.Server/_NF/Power/EntitySystems/UpgradeBatterySystem.cs rename Content.Server/{ => _NF}/Power/EntitySystems/UpgradePowerSystem.cs (98%) rename Content.Server/{ => _NF}/Shipyard/Commands/PurchaseShuttleCommand.cs (92%) rename Content.Server/{ => _NF}/Shipyard/Components/ShipyardVoucherComponent.cs (93%) rename Content.Server/{ => _NF}/Shipyard/Systems/ShipyardSystem.Consoles.cs (98%) rename Content.Server/{ => _NF}/Shipyard/Systems/ShipyardSystem.cs (97%) rename Content.Server/{ => _NF}/Shipyard/Systems/ShuttleDeedSystem.cs (82%) rename Content.Server/_NF/{Goblin => Species}/Components/GoblinComponent.cs (62%) rename Content.Server/{ => _NF}/Station/Components/StationDeedSpawnerComponent.cs (76%) rename Content.Server/{ => _NF}/Station/Systems/StationRenameWarpsSystems.cs (98%) rename Content.Server/{ => _NF}/Traits/Assorted/FriedTraitComponent.cs (92%) rename Content.Server/{ => _NF}/Traits/Assorted/FriedTraitSystem.cs (93%) rename Content.Server/{ => _NF}/Traits/Assorted/StinkyTraitComponent.cs (87%) rename Content.Server/{ => _NF}/Traits/Assorted/StinkyTraitSystem.cs (98%) rename Content.Server/{ => _NF}/Traits/Assorted/UncloneableComponent.cs (77%) rename Content.Shared/{Corvax => _Corvax}/Respawn/RespawnResetEvent.cs (81%) rename Content.Shared/{ => _NF}/Shipyard/BUI/ShipyardConsoleInterfaceState.cs (96%) rename Content.Shared/{ => _NF}/Shipyard/Components/DisableShipyardSaleComponent.cs (94%) rename Content.Shared/{ => _NF}/Shipyard/Components/SharedShipyardConsoleComponent.cs (95%) rename Content.Shared/{ => _NF}/Shipyard/Components/ShipyardListingComponent.cs (85%) rename Content.Shared/{ => _NF}/Shipyard/Components/ShuttleDeedComponent.cs (94%) rename Content.Shared/{ => _NF}/Shipyard/Events/ShipyardConsolePurchaseMessage.cs (88%) rename Content.Shared/{ => _NF}/Shipyard/Events/ShipyardConsoleSellMessage.cs (89%) rename Content.Shared/{ => _NF}/Shipyard/Prototypes/VesselPrototype.cs (98%) rename Content.Shared/{ => _NF}/Shipyard/SharedShipyardSystem.cs (94%) diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs index 4a72c149e32..2f7b29a51dc 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs +++ b/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; diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs index 6f91a0b3f60..8a5e0044334 100644 --- a/Content.Client/Ghost/GhostSystem.cs +++ b/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 { diff --git a/Content.Client/StationRecords/JobRow.xaml.cs b/Content.Client/StationRecords/JobRow.xaml.cs index 018b90ddc50..aa9a00cb0ed 100644 --- a/Content.Client/StationRecords/JobRow.xaml.cs +++ b/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; diff --git a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs b/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs index 0bf82080c03..cc19682636b 100644 --- a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs +++ b/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; diff --git a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs index 9c17022e462..6a2df243492 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs +++ b/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.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; diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 025bde5b64d..a34ae9ae798 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/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; diff --git a/Content.Client/Corvax/Respawn/RespawnSystem.cs b/Content.Client/_Corvax/Respawn/RespawnSystem.cs similarity index 83% rename from Content.Client/Corvax/Respawn/RespawnSystem.cs rename to Content.Client/_Corvax/Respawn/RespawnSystem.cs index bbdfdc88b6a..6eb31028c6f 100644 --- a/Content.Client/Corvax/Respawn/RespawnSystem.cs +++ b/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 { diff --git a/Content.Client/Bank/BUI/BankATMMenuBoundUserInterface.cs b/Content.Client/_NF/Bank/BUI/BankATMMenuBoundUserInterface.cs similarity index 90% rename from Content.Client/Bank/BUI/BankATMMenuBoundUserInterface.cs rename to Content.Client/_NF/Bank/BUI/BankATMMenuBoundUserInterface.cs index 455388fd4ef..c3e428fc8c8 100644 --- a/Content.Client/Bank/BUI/BankATMMenuBoundUserInterface.cs +++ b/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; diff --git a/Content.Client/Bank/BUI/StationBankATMMenuBoundUserInterface.cs b/Content.Client/_NF/Bank/BUI/StationBankATMMenuBoundUserInterface.cs similarity index 91% rename from Content.Client/Bank/BUI/StationBankATMMenuBoundUserInterface.cs rename to Content.Client/_NF/Bank/BUI/StationBankATMMenuBoundUserInterface.cs index e3d7fb3fc77..d27fbd2f85b 100644 --- a/Content.Client/Bank/BUI/StationBankATMMenuBoundUserInterface.cs +++ b/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 { diff --git a/Content.Client/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs b/Content.Client/_NF/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs similarity index 89% rename from Content.Client/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs rename to Content.Client/_NF/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs index 54fabcf7d70..2474236f57e 100644 --- a/Content.Client/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs +++ b/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 { diff --git a/Content.Client/_NF/Bank/BankSystem.cs b/Content.Client/_NF/Bank/BankSystem.cs index 699d3b258a6..b4121947a1a 100644 --- a/Content.Client/_NF/Bank/BankSystem.cs +++ b/Content.Client/_NF/Bank/BankSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Bank; +using Content.Shared._NF.Bank; namespace Content.Client.Bank; diff --git a/Content.Client/Bank/UI/BankATMMenu.xaml b/Content.Client/_NF/Bank/UI/BankATMMenu.xaml similarity index 100% rename from Content.Client/Bank/UI/BankATMMenu.xaml rename to Content.Client/_NF/Bank/UI/BankATMMenu.xaml diff --git a/Content.Client/Bank/UI/BankATMMenu.xaml.cs b/Content.Client/_NF/Bank/UI/BankATMMenu.xaml.cs similarity index 90% rename from Content.Client/Bank/UI/BankATMMenu.xaml.cs rename to Content.Client/_NF/Bank/UI/BankATMMenu.xaml.cs index d72ab5315d9..b9426a1fea6 100644 --- a/Content.Client/Bank/UI/BankATMMenu.xaml.cs +++ b/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 diff --git a/Content.Client/Bank/UI/StationBankATMMenu.xaml b/Content.Client/_NF/Bank/UI/StationBankATMMenu.xaml similarity index 100% rename from Content.Client/Bank/UI/StationBankATMMenu.xaml rename to Content.Client/_NF/Bank/UI/StationBankATMMenu.xaml diff --git a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs b/Content.Client/_NF/Bank/UI/StationBankATMMenu.xaml.cs similarity index 96% rename from Content.Client/Bank/UI/StationBankATMMenu.xaml.cs rename to Content.Client/_NF/Bank/UI/StationBankATMMenu.xaml.cs index 20c3246818d..70e47b617a7 100644 --- a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs +++ b/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 diff --git a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs b/Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.cs similarity index 86% rename from Content.Client/Bank/UI/WithdrawBankATMMenu.cs rename to Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.cs index 78f61ec94e5..cd7415eb006 100644 --- a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs +++ b/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 diff --git a/Content.Client/Bank/UI/WithdrawBankATMMenu.xaml b/Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.xaml similarity index 100% rename from Content.Client/Bank/UI/WithdrawBankATMMenu.xaml rename to Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.xaml diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerTab.xaml.cs b/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerTab.xaml.cs index 40908330089..f94bc7413b1 100644 --- a/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerTab.xaml.cs +++ b/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; diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerUiFragment.xaml.cs b/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerUiFragment.xaml.cs index cf7aec5a1cd..8f30a21581a 100644 --- a/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerUiFragment.xaml.cs +++ b/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; diff --git a/Content.Client/CryoSleep/AcceptCryoWindow.cs b/Content.Client/_NF/CryoSleep/AcceptCryoWindow.cs similarity index 98% rename from Content.Client/CryoSleep/AcceptCryoWindow.cs rename to Content.Client/_NF/CryoSleep/AcceptCryoWindow.cs index bc5f55e0c6d..77885c0016a 100644 --- a/Content.Client/CryoSleep/AcceptCryoWindow.cs +++ b/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; diff --git a/Content.Client/CryoSleep/CryoSleepEui.cs b/Content.Client/_NF/CryoSleep/CryoSleepEui.cs similarity index 91% rename from Content.Client/CryoSleep/CryoSleepEui.cs rename to Content.Client/_NF/CryoSleep/CryoSleepEui.cs index a223aafe014..a57fb225646 100644 --- a/Content.Client/CryoSleep/CryoSleepEui.cs +++ b/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 diff --git a/Content.Client/CryoSleep/CryosleepWakeupWindow.cs b/Content.Client/_NF/CryoSleep/CryosleepWakeupWindow.cs similarity index 97% rename from Content.Client/CryoSleep/CryosleepWakeupWindow.cs rename to Content.Client/_NF/CryoSleep/CryosleepWakeupWindow.cs index 205676d1833..ea39967546e 100644 --- a/Content.Client/CryoSleep/CryosleepWakeupWindow.cs +++ b/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 { diff --git a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs b/Content.Client/_NF/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs similarity index 92% rename from Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs rename to Content.Client/_NF/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs index 9365d8fe94c..f4c251223bd 100644 --- a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs +++ b/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 { diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml b/Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml similarity index 100% rename from Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml rename to Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml.cs similarity index 98% rename from Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs rename to Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml.cs index 8322279d0d4..7bda8d25458 100644 --- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs +++ b/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 diff --git a/Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml b/Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml similarity index 100% rename from Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml rename to Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml diff --git a/Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml.cs b/Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml.cs similarity index 90% rename from Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml.cs rename to Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml.cs index d908ebc5c36..e962e072b67 100644 --- a/Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml.cs +++ b/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 diff --git a/Content.Client/Shipyard/UI/VesselRow.xaml b/Content.Client/_NF/Shipyard/UI/VesselRow.xaml similarity index 100% rename from Content.Client/Shipyard/UI/VesselRow.xaml rename to Content.Client/_NF/Shipyard/UI/VesselRow.xaml diff --git a/Content.Client/Shipyard/UI/VesselRow.xaml.cs b/Content.Client/_NF/Shipyard/UI/VesselRow.xaml.cs similarity index 90% rename from Content.Client/Shipyard/UI/VesselRow.xaml.cs rename to Content.Client/_NF/Shipyard/UI/VesselRow.xaml.cs index 4e34aa66ca2..03e8cf57eab 100644 --- a/Content.Client/Shipyard/UI/VesselRow.xaml.cs +++ b/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 diff --git a/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs b/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs index d222b042145..15876b24dbb 100644 --- a/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs +++ b/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; diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs index 2bfe8e163b2..78c62dae85c 100644 --- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs +++ b/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; diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index 70df786b800..66555cec07e 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/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; diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index 2270374fb86..9b5899af79c 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/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; diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index cc51e003e2e..e748c38a31d 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/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 { diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs index 381c138919e..047bae7aba1 100644 --- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs +++ b/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 diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 049e2b76c72..4af997a56de 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/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 { diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs index 2fd14dc32c2..eafb269848b 100644 --- a/Content.Server/PDA/PdaSystem.cs +++ b/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 diff --git a/Content.Server/Power/Components/ChargingComponent.cs b/Content.Server/Power/Components/ChargingComponent.cs deleted file mode 100644 index 184e2a15ff3..00000000000 --- a/Content.Server/Power/Components/ChargingComponent.cs +++ /dev/null @@ -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 - { - /// - ///References the entity of the charger that is currently powering this battery - /// - public EntityUid ChargerUid; - - /// - ///References the component of the charger that is currently powering this battery - /// - public ChargerComponent ChargerComponent; - } -} diff --git a/Content.Server/Power/Components/UpgradeBatteryComponent.cs b/Content.Server/Power/Components/UpgradeBatteryComponent.cs deleted file mode 100644 index ff91cfa7559..00000000000 --- a/Content.Server/Power/Components/UpgradeBatteryComponent.cs +++ /dev/null @@ -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 - { - /// - /// The machine part that affects the power capacity. - /// - [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartPowerCapacity = "PowerCell"; - - /// - /// The machine part rating is raised to this power when calculating power gain - /// - [DataField("maxChargeMultiplier")] - public float MaxChargeMultiplier = 2f; - - /// - /// Power gain scaling - /// - [DataField("baseMaxCharge")] - public float BaseMaxCharge = 8000000; - } -} diff --git a/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs b/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs deleted file mode 100644 index 7bd29f2de71..00000000000 --- a/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs +++ /dev/null @@ -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; - - /// - /// The machine part that affects the power supply ramping - /// - [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartRampRate = "Capacitor"; - - /// - /// The multiplier used for scaling the power supply ramping - /// - [DataField("supplyRampingMultiplier")] - public float SupplyRampingMultiplier = 1f; - - /// - /// What type of scaling is being used? - /// - [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)] - public MachineUpgradeScalingType Scaling; - - /// - /// The current value that the power supply is being scaled by - /// - [DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)] - public float ActualScalar = 1f; - } -} diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index 4a00247a68e..b9a1a753ddf 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -8,6 +8,7 @@ using JetBrains.Annotations; using Robust.Shared.Utility; using Robust.Shared.Timing; +using Content.Server._NF.Power.Components; // Frontier namespace Content.Server.Power.EntitySystems { diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index a5fd72477a1..be867d99cc8 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -11,6 +11,7 @@ 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; diff --git a/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs b/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs deleted file mode 100644 index 734cf9d89ce..00000000000 --- a/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs +++ /dev/null @@ -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(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); - } - - public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args) - { - var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity]; - - if (TryComp(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(uid, out var batteryComp)) - { - args.AddPercentageUpgrade("upgrade-max-charge", batteryComp.MaxCharge / component.BaseMaxCharge); - } - } - } -} diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs index 111cf363636..8e2fc0441c1 100644 --- a/Content.Server/Power/Generator/GeneratorSystem.cs +++ b/Content.Server/Power/Generator/GeneratorSystem.cs @@ -12,6 +12,7 @@ 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 _upgradeQuery; + private EntityQuery _upgradeQuery; // Frontier: keeping upgradeable power supplies public override void Initialize() { - _upgradeQuery = GetEntityQuery(); + _upgradeQuery = GetEntityQuery(); // Frontier: keeping upgradeable power supplies UpdatesBefore.Add(typeof(PowerNetSystem)); diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs index 259aa42f9a3..47f66261869 100644 --- a/Content.Server/Species/Systems/NymphSystem.cs +++ b/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 @@ private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, ref OrganRemo _mindSystem.TransferTo(mindId, nymph, mind: mind); - // Frontier + // Frontier: bank account transfer, mob setup EnsureComp(nymph); - // Frontier: bank account transfer if (HasComp(args.OldBody)) - { EnsureComp(nymph); - } + // End Frontier } // Delete the old organ diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 12cd4d2b1d2..e2450dae57d 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -28,7 +28,7 @@ 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 diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index c121a87ecd5..1f2ee6a20ce 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -13,7 +13,7 @@ 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; diff --git a/Content.Server/Corvax/Respawn/RespawnSystem.cs b/Content.Server/_Corvax/Respawn/RespawnSystem.cs similarity index 98% rename from Content.Server/Corvax/Respawn/RespawnSystem.cs rename to Content.Server/_Corvax/Respawn/RespawnSystem.cs index 6bd0d975c2e..3fecd2ed480 100644 --- a/Content.Server/Corvax/Respawn/RespawnSystem.cs +++ b/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.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 { diff --git a/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs b/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs index 3e96a168bcb..ea9897f4342 100644 --- a/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs +++ b/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs @@ -48,7 +48,7 @@ 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 diff --git a/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs b/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs index 6b37613a404..7aad2c72f6d 100644 --- a/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs +++ b/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs @@ -17,7 +17,7 @@ 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; diff --git a/Content.Server/_NF/Bank/ATMSystem.cs b/Content.Server/_NF/Bank/ATMSystem.cs index a284f2bc0f1..5f9baeec314 100644 --- a/Content.Server/_NF/Bank/ATMSystem.cs +++ b/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; diff --git a/Content.Server/_NF/Bank/BankSystem.Ledger.cs b/Content.Server/_NF/Bank/BankSystem.Ledger.cs index bd57197a0b8..4f060c49ddc 100644 --- a/Content.Server/_NF/Bank/BankSystem.Ledger.cs +++ b/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; diff --git a/Content.Server/_NF/Bank/BankSystem.Sector.cs b/Content.Server/_NF/Bank/BankSystem.Sector.cs index 6f3c6ba39ed..6460912541e 100644 --- a/Content.Server/_NF/Bank/BankSystem.Sector.cs +++ b/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; diff --git a/Content.Server/_NF/Bank/BankSystem.cs b/Content.Server/_NF/Bank/BankSystem.cs index b2591195e29..feba4217374 100644 --- a/Content.Server/_NF/Bank/BankSystem.cs +++ b/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; diff --git a/Content.Server/_NF/Bank/SectorBankComponent.cs b/Content.Server/_NF/Bank/SectorBankComponent.cs index 8caa521c51e..26512424363 100644 --- a/Content.Server/_NF/Bank/SectorBankComponent.cs +++ b/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; diff --git a/Content.Server/_NF/Bank/StationATMSystem.cs b/Content.Server/_NF/Bank/StationATMSystem.cs index cbce9951f1d..fbfbfabc1a6 100644 --- a/Content.Server/_NF/Bank/StationATMSystem.cs +++ b/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; diff --git a/Content.Server/_NF/Commands/GhostRespawnCommand.cs b/Content.Server/_NF/Commands/GhostRespawnCommand.cs index 62557844370..7a7aeed1fdb 100644 --- a/Content.Server/_NF/Commands/GhostRespawnCommand.cs +++ b/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.Player; using Robust.Shared.Timing; -namespace Content.Server.NF14.Commands; +namespace Content.Server._NF.Commands; [AnyCommand()] public sealed class GhostRespawnCommand : IConsoleCommand diff --git a/Content.Server/_NF/Commands/SpawnRefundCommand.cs b/Content.Server/_NF/Commands/SpawnRefundCommand.cs index 8f00577351a..d6046ef5860 100644 --- a/Content.Server/_NF/Commands/SpawnRefundCommand.cs +++ b/Content.Server/_NF/Commands/SpawnRefundCommand.cs @@ -11,7 +11,7 @@ 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 diff --git a/Content.Server/_NF/CryoSleep/CryoSleepComponent.cs b/Content.Server/_NF/CryoSleep/CryoSleepComponent.cs index 942b5b8b318..09d471a0000 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepComponent.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Audio; using Robust.Shared.Containers; -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; [RegisterComponent] public sealed partial class CryoSleepComponent : Component { diff --git a/Content.Server/_NF/CryoSleep/CryoSleepEui.cs b/Content.Server/_NF/CryoSleep/CryoSleepEui.cs index 46f2a4f3e43..e59f057fa5c 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepEui.cs +++ b/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 { diff --git a/Content.Server/_NF/CryoSleep/CryoSleepFallbackComponent.cs b/Content.Server/_NF/CryoSleep/CryoSleepFallbackComponent.cs index 93d026e62e6..f3f14fb5230 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepFallbackComponent.cs +++ b/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. diff --git a/Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs b/Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs index 776e9f877d2..ad4fc87401b 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs @@ -11,7 +11,7 @@ using Robust.Shared.Configuration; using Robust.Shared.Network; -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; public sealed partial class CryoSleepSystem { diff --git a/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs b/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs index 2b51ec97829..7e8126d33cc 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs @@ -5,10 +5,10 @@ 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.Timing; using Content.Server.Ghost; -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; public sealed partial class CryoSleepSystem : SharedCryoSleepSystem { diff --git a/Content.Server/_NF/CryoSleep/CryosleepEvents.cs b/Content.Server/_NF/CryoSleep/CryosleepEvents.cs index 0519d2b3b2d..e746451acb4 100644 --- a/Content.Server/_NF/CryoSleep/CryosleepEvents.cs +++ b/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 { diff --git a/Content.Server/_NF/GameRule/PointOfInterestSystem.cs b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs index f9a910027f9..f8e926bd31d 100644 --- a/Content.Server/_NF/GameRule/PointOfInterestSystem.cs +++ b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs @@ -11,6 +11,7 @@ using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Content.Server._NF.Station.Systems; namespace Content.Server._NF.GameRule; diff --git a/Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs b/Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs index b569a72b6df..cf68a2bff85 100644 --- a/Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs +++ b/Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs @@ -4,7 +4,7 @@ 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; diff --git a/Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs b/Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs index d27b64b9f4e..bd8a9724902 100644 --- a/Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs +++ b/Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs @@ -6,7 +6,7 @@ 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; diff --git a/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs b/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs index 1eb39feaa84..a7d9c8073e2 100644 --- a/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs +++ b/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; diff --git a/Content.Server/_NF/Medical/MedicalBountySystem.cs b/Content.Server/_NF/Medical/MedicalBountySystem.cs index 1bd54f01db6..a6a7e0c9fd6 100644 --- a/Content.Server/_NF/Medical/MedicalBountySystem.cs +++ b/Content.Server/_NF/Medical/MedicalBountySystem.cs @@ -7,7 +7,6 @@ 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.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; diff --git a/Content.Server/_NF/Power/Components/ChargingComponent.cs b/Content.Server/_NF/Power/Components/ChargingComponent.cs new file mode 100644 index 00000000000..af31920dfa2 --- /dev/null +++ b/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 +{ + /// + ///References the entity of the charger that is currently powering this battery + /// + public EntityUid ChargerUid; + + /// + ///References the component of the charger that is currently powering this battery + /// + public ChargerComponent ChargerComponent; +} diff --git a/Content.Server/_NF/Power/Components/UpgradeBatteryComponent.cs b/Content.Server/_NF/Power/Components/UpgradeBatteryComponent.cs new file mode 100644 index 00000000000..ce108e68053 --- /dev/null +++ b/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 +{ + /// + /// The machine part that affects the power capacity. + /// + [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string MachinePartPowerCapacity = "PowerCell"; + + /// + /// The machine part rating is raised to this power when calculating power gain + /// + [DataField("maxChargeMultiplier")] + public float MaxChargeMultiplier = 2f; + + /// + /// Power gain scaling + /// + [DataField("baseMaxCharge")] + public float BaseMaxCharge = 8000000; +} diff --git a/Content.Server/Power/Components/UpgradePowerDrawComponent.cs b/Content.Server/_NF/Power/Components/UpgradePowerDrawComponent.cs similarity index 96% rename from Content.Server/Power/Components/UpgradePowerDrawComponent.cs rename to Content.Server/_NF/Power/Components/UpgradePowerDrawComponent.cs index 02a6c57b9bf..57c1203739a 100644 --- a/Content.Server/Power/Components/UpgradePowerDrawComponent.cs +++ b/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; /// /// 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; } - - diff --git a/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs b/Content.Server/_NF/Power/Components/UpgradePowerSupplierComponent.cs similarity index 96% rename from Content.Server/Power/Components/UpgradePowerSupplierComponent.cs rename to Content.Server/_NF/Power/Components/UpgradePowerSupplierComponent.cs index 35b43867d2f..98bd45bf437 100644 --- a/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs +++ b/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 diff --git a/Content.Server/_NF/Power/Components/UpgradePowerSupplyRampingComponent.cs b/Content.Server/_NF/Power/Components/UpgradePowerSupplyRampingComponent.cs new file mode 100644 index 00000000000..d26ece0c6b9 --- /dev/null +++ b/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; + + /// + /// The machine part that affects the power supply ramping + /// + [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string MachinePartRampRate = "Capacitor"; + + /// + /// The multiplier used for scaling the power supply ramping + /// + [DataField("supplyRampingMultiplier")] + public float SupplyRampingMultiplier = 1f; + + /// + /// What type of scaling is being used? + /// + [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)] + public MachineUpgradeScalingType Scaling; + + /// + /// The current value that the power supply is being scaled by + /// + [DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)] + public float ActualScalar = 1f; +} diff --git a/Content.Server/_NF/Power/EntitySystems/UpgradeBatterySystem.cs b/Content.Server/_NF/Power/EntitySystems/UpgradeBatterySystem.cs new file mode 100644 index 00000000000..bc41c4aa962 --- /dev/null +++ b/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(OnRefreshParts); + SubscribeLocalEvent(OnUpgradeExamine); + } + + public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args) + { + var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity]; + + if (TryComp(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(uid, out var batteryComp)) + { + args.AddPercentageUpgrade("upgrade-max-charge", batteryComp.MaxCharge / component.BaseMaxCharge); + } + } +} diff --git a/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs b/Content.Server/_NF/Power/EntitySystems/UpgradePowerSystem.cs similarity index 98% rename from Content.Server/Power/EntitySystems/UpgradePowerSystem.cs rename to Content.Server/_NF/Power/EntitySystems/UpgradePowerSystem.cs index 9cf28c386a6..51c8c76d549 100644 --- a/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs +++ b/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; /// /// This handles using upgraded machine parts diff --git a/Content.Server/_NF/PublicTransit/PublicTransitSystem.cs b/Content.Server/_NF/PublicTransit/PublicTransitSystem.cs index 21eb4d17d00..d662b953abb 100644 --- a/Content.Server/_NF/PublicTransit/PublicTransitSystem.cs +++ b/Content.Server/_NF/PublicTransit/PublicTransitSystem.cs @@ -13,8 +13,7 @@ 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; diff --git a/Content.Server/Shipyard/Commands/PurchaseShuttleCommand.cs b/Content.Server/_NF/Shipyard/Commands/PurchaseShuttleCommand.cs similarity index 92% rename from Content.Server/Shipyard/Commands/PurchaseShuttleCommand.cs rename to Content.Server/_NF/Shipyard/Commands/PurchaseShuttleCommand.cs index 6dca2bcc1f6..4273294d188 100644 --- a/Content.Server/Shipyard/Commands/PurchaseShuttleCommand.cs +++ b/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; /// /// Purchases a shuttle and docks it to a station. diff --git a/Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs b/Content.Server/_NF/Shipyard/Components/ShipyardVoucherComponent.cs similarity index 93% rename from Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs rename to Content.Server/_NF/Shipyard/Components/ShipyardVoucherComponent.cs index 9a90ce503e6..e9bfe71b29e 100644 --- a/Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs +++ b/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 diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs similarity index 98% rename from Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs rename to Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs index 2d1e7eb2358..2776654a40f 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -2,15 +2,15 @@ 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.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.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 { diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.cs b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.cs similarity index 97% rename from Content.Server/Shipyard/Systems/ShipyardSystem.cs rename to Content.Server/_NF/Shipyard/Systems/ShipyardSystem.cs index a4b7e405300..982789f031f 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.cs +++ b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.cs @@ -3,26 +3,24 @@ 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 { diff --git a/Content.Server/Shipyard/Systems/ShuttleDeedSystem.cs b/Content.Server/_NF/Shipyard/Systems/ShuttleDeedSystem.cs similarity index 82% rename from Content.Server/Shipyard/Systems/ShuttleDeedSystem.cs rename to Content.Server/_NF/Shipyard/Systems/ShuttleDeedSystem.cs index eb47ab54cab..6053158915c 100644 --- a/Content.Server/Shipyard/Systems/ShuttleDeedSystem.cs +++ b/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 { diff --git a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs index bbd0c906675..0d497b8e19a 100644 --- a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs +++ b/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.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; diff --git a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs index f3b9242d422..dae89c7caf4 100644 --- a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs +++ b/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.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; diff --git a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs index f8a11aa3993..4781b75a905 100644 --- a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs +++ b/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; diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs index 6c658e2a661..5a67566e07f 100644 --- a/Content.Server/_NF/Smuggling/DeadDropSystem.cs +++ b/Content.Server/_NF/Smuggling/DeadDropSystem.cs @@ -5,7 +5,7 @@ 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.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; +using Content.Server._NF.Station.Systems; namespace Content.Server._NF.Smuggling; diff --git a/Content.Server/_NF/Goblin/Components/GoblinComponent.cs b/Content.Server/_NF/Species/Components/GoblinComponent.cs similarity index 62% rename from Content.Server/_NF/Goblin/Components/GoblinComponent.cs rename to Content.Server/_NF/Species/Components/GoblinComponent.cs index 35533e98cc3..37db3aeeab7 100644 --- a/Content.Server/_NF/Goblin/Components/GoblinComponent.cs +++ b/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 diff --git a/Content.Server/Station/Components/StationDeedSpawnerComponent.cs b/Content.Server/_NF/Station/Components/StationDeedSpawnerComponent.cs similarity index 76% rename from Content.Server/Station/Components/StationDeedSpawnerComponent.cs rename to Content.Server/_NF/Station/Components/StationDeedSpawnerComponent.cs index 81ff6d64187..196b99ea066 100644 --- a/Content.Server/Station/Components/StationDeedSpawnerComponent.cs +++ b/Content.Server/_NF/Station/Components/StationDeedSpawnerComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Station.Components; +namespace Content.Server._NF.Station.Components; /// /// Copy deep of a ship to a new card diff --git a/Content.Server/Station/Systems/StationRenameWarpsSystems.cs b/Content.Server/_NF/Station/Systems/StationRenameWarpsSystems.cs similarity index 98% rename from Content.Server/Station/Systems/StationRenameWarpsSystems.cs rename to Content.Server/_NF/Station/Systems/StationRenameWarpsSystems.cs index 7ec387cb2ac..0a1e8e5862e 100644 --- a/Content.Server/Station/Systems/StationRenameWarpsSystems.cs +++ b/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 { diff --git a/Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs b/Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs index 927e7591a63..520f63fc761 100644 --- a/Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs +++ b/Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs @@ -4,10 +4,11 @@ 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 diff --git a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs index eb1fc5c7159..66c52913ce2 100644 --- a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs +++ b/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; diff --git a/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs b/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs index 1073ea56e15..db199d039ab 100644 --- a/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs +++ b/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs @@ -14,12 +14,12 @@ 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 { diff --git a/Content.Server/Traits/Assorted/FriedTraitComponent.cs b/Content.Server/_NF/Traits/Assorted/FriedTraitComponent.cs similarity index 92% rename from Content.Server/Traits/Assorted/FriedTraitComponent.cs rename to Content.Server/_NF/Traits/Assorted/FriedTraitComponent.cs index f0a3f38af90..33bf7a132b6 100644 --- a/Content.Server/Traits/Assorted/FriedTraitComponent.cs +++ b/Content.Server/_NF/Traits/Assorted/FriedTraitComponent.cs @@ -2,7 +2,7 @@ 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; /// /// This is used for the fried trait. diff --git a/Content.Server/Traits/Assorted/FriedTraitSystem.cs b/Content.Server/_NF/Traits/Assorted/FriedTraitSystem.cs similarity index 93% rename from Content.Server/Traits/Assorted/FriedTraitSystem.cs rename to Content.Server/_NF/Traits/Assorted/FriedTraitSystem.cs index 4e6fc19af9e..fd8c3bda548 100644 --- a/Content.Server/Traits/Assorted/FriedTraitSystem.cs +++ b/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; /// /// This handles fried trait, causing the affected to look crispy. diff --git a/Content.Server/Traits/Assorted/StinkyTraitComponent.cs b/Content.Server/_NF/Traits/Assorted/StinkyTraitComponent.cs similarity index 87% rename from Content.Server/Traits/Assorted/StinkyTraitComponent.cs rename to Content.Server/_NF/Traits/Assorted/StinkyTraitComponent.cs index bd5d5f681b8..34cac1aad9b 100644 --- a/Content.Server/Traits/Assorted/StinkyTraitComponent.cs +++ b/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; /// /// This is used for the stinky trait. diff --git a/Content.Server/Traits/Assorted/StinkyTraitSystem.cs b/Content.Server/_NF/Traits/Assorted/StinkyTraitSystem.cs similarity index 98% rename from Content.Server/Traits/Assorted/StinkyTraitSystem.cs rename to Content.Server/_NF/Traits/Assorted/StinkyTraitSystem.cs index 51ca17b656c..83b485789b7 100644 --- a/Content.Server/Traits/Assorted/StinkyTraitSystem.cs +++ b/Content.Server/_NF/Traits/Assorted/StinkyTraitSystem.cs @@ -13,7 +13,7 @@ using Content.Shared.Popups; using Robust.Shared.Player; -namespace Content.Server.Traits.Assorted; +namespace Content.Server._NF.Traits.Assorted; /// /// This handles stink, causing the affected to stink uncontrollably at a random interval. diff --git a/Content.Server/Traits/Assorted/UncloneableComponent.cs b/Content.Server/_NF/Traits/Assorted/UncloneableComponent.cs similarity index 77% rename from Content.Server/Traits/Assorted/UncloneableComponent.cs rename to Content.Server/_NF/Traits/Assorted/UncloneableComponent.cs index 650b78cd0f2..91fae96fb8f 100644 --- a/Content.Server/Traits/Assorted/UncloneableComponent.cs +++ b/Content.Server/_NF/Traits/Assorted/UncloneableComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Traits.Assorted; +namespace Content.Server._NF.Traits.Assorted; /// /// This is used for the uncloneable trait. diff --git a/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs b/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs index 59380c46c47..2192a9caa73 100644 --- a/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs +++ b/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs @@ -3,7 +3,7 @@ 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; diff --git a/Content.Shared/Mind/MindComponent.cs b/Content.Shared/Mind/MindComponent.cs index 544ac40f68f..865c45f0c83 100644 --- a/Content.Shared/Mind/MindComponent.cs +++ b/Content.Shared/Mind/MindComponent.cs @@ -4,7 +4,7 @@ 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; diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs index 9bf79f5188e..c95566292a0 100644 --- a/Content.Shared/RCD/Systems/RCDSystem.cs +++ b/Content.Shared/RCD/Systems/RCDSystem.cs @@ -12,7 +12,7 @@ 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; diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs index d18a5abb5e3..503ee2863f2 100644 --- a/Content.Shared/Species/Systems/ReformSystem.cs +++ b/Content.Shared/Species/Systems/ReformSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.Species.Components; using Content.Shared.Actions; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; // Frontier using Content.Shared.DoAfter; using Content.Shared.Popups; using Content.Shared.Stunnable; diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index e5b14924391..1d3493ba3c4 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; // Frontier using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Corvax/Respawn/RespawnResetEvent.cs b/Content.Shared/_Corvax/Respawn/RespawnResetEvent.cs similarity index 81% rename from Content.Shared/Corvax/Respawn/RespawnResetEvent.cs rename to Content.Shared/_Corvax/Respawn/RespawnResetEvent.cs index 81fc4b9ec67..ee090458e4f 100644 --- a/Content.Shared/Corvax/Respawn/RespawnResetEvent.cs +++ b/Content.Shared/_Corvax/Respawn/RespawnResetEvent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Corvax.Respawn; +namespace Content.Shared._Corvax.Respawn; [Serializable, NetSerializable] public sealed class RespawnResetEvent(TimeSpan? time) : EntityEventArgs diff --git a/Content.Shared/_NF/Bank/BUI/BankATMMenuInterfaceState.cs b/Content.Shared/_NF/Bank/BUI/BankATMMenuInterfaceState.cs index 5da333d5fe2..211ec01785d 100644 --- a/Content.Shared/_NF/Bank/BUI/BankATMMenuInterfaceState.cs +++ b/Content.Shared/_NF/Bank/BUI/BankATMMenuInterfaceState.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.BUI; +namespace Content.Shared._NF.Bank.BUI; [NetSerializable, Serializable] public sealed class BankATMMenuInterfaceState : BoundUserInterfaceState diff --git a/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs b/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs index 35669bf7157..8936af7ea6e 100644 --- a/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs +++ b/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs @@ -1,4 +1,4 @@ -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Robust.Shared.Serialization; namespace Content.Shared._NF.Bank.BUI; diff --git a/Content.Shared/_NF/Bank/BUI/StationBankATMMenuInterfaceState.cs b/Content.Shared/_NF/Bank/BUI/StationBankATMMenuInterfaceState.cs index 9fe203f6896..c895996a472 100644 --- a/Content.Shared/_NF/Bank/BUI/StationBankATMMenuInterfaceState.cs +++ b/Content.Shared/_NF/Bank/BUI/StationBankATMMenuInterfaceState.cs @@ -5,7 +5,7 @@ */ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.BUI; +namespace Content.Shared._NF.Bank.BUI; [NetSerializable, Serializable] public sealed class StationBankATMMenuInterfaceState : BoundUserInterfaceState diff --git a/Content.Shared/_NF/Bank/Components/BankATMComponent.cs b/Content.Shared/_NF/Bank/Components/BankATMComponent.cs index 90fe3d91ee9..390c2222c87 100644 --- a/Content.Shared/_NF/Bank/Components/BankATMComponent.cs +++ b/Content.Shared/_NF/Bank/Components/BankATMComponent.cs @@ -4,7 +4,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Bank.Components; +namespace Content.Shared._NF.Bank.Components; [RegisterComponent, NetworkedComponent] diff --git a/Content.Shared/_NF/Bank/Components/BankAccountComponent.cs b/Content.Shared/_NF/Bank/Components/BankAccountComponent.cs index ebe379b0cee..ce7f4d25259 100644 --- a/Content.Shared/_NF/Bank/Components/BankAccountComponent.cs +++ b/Content.Shared/_NF/Bank/Components/BankAccountComponent.cs @@ -1,7 +1,6 @@ using Robust.Shared.GameStates; -using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Components; +namespace Content.Shared._NF.Bank.Components; [RegisterComponent, NetworkedComponent] [AutoGenerateComponentState] @@ -9,7 +8,7 @@ public sealed partial class BankAccountComponent : Component { // The amount of money this entity has in their bank account. // Should not be modified directly, may be out-of-date. - [DataField("balance"), Access(typeof(SharedBankSystem))] + [DataField, Access(typeof(SharedBankSystem))] [AutoNetworkedField] public int Balance; } diff --git a/Content.Shared/_NF/Bank/Components/MarketModifierComponent.cs b/Content.Shared/_NF/Bank/Components/MarketModifierComponent.cs index aad7a124bcc..e2abef8e63e 100644 --- a/Content.Shared/_NF/Bank/Components/MarketModifierComponent.cs +++ b/Content.Shared/_NF/Bank/Components/MarketModifierComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Bank.Components; +namespace Content.Shared._NF.Bank.Components; /// /// This is used for applying a pricing modifier to things like vending machines. diff --git a/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs b/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs index 022fd3d5d29..282aa5de667 100644 --- a/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs +++ b/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs @@ -4,7 +4,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Bank.Components; +namespace Content.Shared._NF.Bank.Components; [RegisterComponent, NetworkedComponent] diff --git a/Content.Shared/_NF/Bank/Events/BankDepositMessage.cs b/Content.Shared/_NF/Bank/Events/BankDepositMessage.cs index 02b500d97b6..b4df842a652 100644 --- a/Content.Shared/_NF/Bank/Events/BankDepositMessage.cs +++ b/Content.Shared/_NF/Bank/Events/BankDepositMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Events; +namespace Content.Shared._NF.Bank.Events; /// /// Raised on a client bank deposit diff --git a/Content.Shared/_NF/Bank/Events/BankWithdrawMessage.cs b/Content.Shared/_NF/Bank/Events/BankWithdrawMessage.cs index 9b4b76bfd16..30c5a8d30b5 100644 --- a/Content.Shared/_NF/Bank/Events/BankWithdrawMessage.cs +++ b/Content.Shared/_NF/Bank/Events/BankWithdrawMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Events; +namespace Content.Shared._NF.Bank.Events; /// /// Raised on a client bank withdrawl diff --git a/Content.Shared/_NF/Bank/Events/StationBankDepositMessage.cs b/Content.Shared/_NF/Bank/Events/StationBankDepositMessage.cs index ddbc074449d..b171dca674e 100644 --- a/Content.Shared/_NF/Bank/Events/StationBankDepositMessage.cs +++ b/Content.Shared/_NF/Bank/Events/StationBankDepositMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Events; +namespace Content.Shared._NF.Bank.Events; /// /// Raised on a client bank deposit diff --git a/Content.Shared/_NF/Bank/Events/StationBankWithdrawMessage.cs b/Content.Shared/_NF/Bank/Events/StationBankWithdrawMessage.cs index 22cac8ab656..931b821eb0a 100644 --- a/Content.Shared/_NF/Bank/Events/StationBankWithdrawMessage.cs +++ b/Content.Shared/_NF/Bank/Events/StationBankWithdrawMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Events; +namespace Content.Shared._NF.Bank.Events; /// /// Raised on a client bank withdrawl diff --git a/Content.Shared/_NF/Bank/MarketModifierSystem.cs b/Content.Shared/_NF/Bank/MarketModifierSystem.cs index 4e1ec313228..41d99628eaf 100644 --- a/Content.Shared/_NF/Bank/MarketModifierSystem.cs +++ b/Content.Shared/_NF/Bank/MarketModifierSystem.cs @@ -1,8 +1,8 @@ using Content.Shared.Examine; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.VendingMachines; -namespace Content.Shared.Bank; +namespace Content.Shared._NF.Bank; public sealed partial class MarketModifierSystem : EntitySystem { diff --git a/Content.Shared/_NF/Bank/SharedBankSystem.cs b/Content.Shared/_NF/Bank/SharedBankSystem.cs index 8961f5f1483..cc86d65c44b 100644 --- a/Content.Shared/_NF/Bank/SharedBankSystem.cs +++ b/Content.Shared/_NF/Bank/SharedBankSystem.cs @@ -1,9 +1,9 @@ -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.Containers.ItemSlots; using Robust.Shared.GameStates; using Robust.Shared.Serialization; -namespace Content.Shared.Bank; +namespace Content.Shared._NF.Bank; [NetSerializable, Serializable] public enum BankATMMenuUiKey : byte diff --git a/Content.Shared/_NF/CryoSleep/AcceptCryoSleepEuiMessage.cs b/Content.Shared/_NF/CryoSleep/AcceptCryoSleepEuiMessage.cs index 081b36b12e3..51ac998c132 100644 --- a/Content.Shared/_NF/CryoSleep/AcceptCryoSleepEuiMessage.cs +++ b/Content.Shared/_NF/CryoSleep/AcceptCryoSleepEuiMessage.cs @@ -1,7 +1,7 @@ using Content.Shared.Eui; using Robust.Shared.Serialization; -namespace Content.Shared.CryoSleep; +namespace Content.Shared._NF.CryoSleep; [Serializable, NetSerializable] public enum AcceptCryoUiButton diff --git a/Content.Shared/_NF/CryoSleep/SharedCryoSleepSystem.cs b/Content.Shared/_NF/CryoSleep/SharedCryoSleepSystem.cs index 109c25225c7..d3459ab55e8 100644 --- a/Content.Shared/_NF/CryoSleep/SharedCryoSleepSystem.cs +++ b/Content.Shared/_NF/CryoSleep/SharedCryoSleepSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.DoAfter; using Robust.Shared.Serialization; -namespace Content.Shared.CryoSleep; +namespace Content.Shared._NF.CryoSleep; public abstract partial class SharedCryoSleepSystem : EntitySystem { diff --git a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs b/Content.Shared/_NF/Shipyard/BUI/ShipyardConsoleInterfaceState.cs similarity index 96% rename from Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs rename to Content.Shared/_NF/Shipyard/BUI/ShipyardConsoleInterfaceState.cs index b2262a4041f..c01f50dc965 100644 --- a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs +++ b/Content.Shared/_NF/Shipyard/BUI/ShipyardConsoleInterfaceState.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Shipyard.BUI; +namespace Content.Shared._NF.Shipyard.BUI; [NetSerializable, Serializable] public sealed class ShipyardConsoleInterfaceState : BoundUserInterfaceState diff --git a/Content.Shared/Shipyard/Components/DisableShipyardSaleComponent.cs b/Content.Shared/_NF/Shipyard/Components/DisableShipyardSaleComponent.cs similarity index 94% rename from Content.Shared/Shipyard/Components/DisableShipyardSaleComponent.cs rename to Content.Shared/_NF/Shipyard/Components/DisableShipyardSaleComponent.cs index ff6f89d6dbf..e2d151f1b6b 100644 --- a/Content.Shared/Shipyard/Components/DisableShipyardSaleComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/DisableShipyardSaleComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Shipyard; +using Content.Shared._NF.Shipyard; namespace Content.Server._NF.Smuggling.Components; diff --git a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs b/Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs similarity index 95% rename from Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs rename to Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs index 6b42793eb48..401a7e0b1a8 100644 --- a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs @@ -4,9 +4,9 @@ using Robust.Shared.Prototypes; using Content.Shared.Radio; using Content.Shared.Access; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; -namespace Content.Shared.Shipyard.Components; +namespace Content.Shared._NF.Shipyard.Components; [RegisterComponent, NetworkedComponent, Access(typeof(SharedShipyardSystem))] public sealed partial class ShipyardConsoleComponent : Component diff --git a/Content.Shared/Shipyard/Components/ShipyardListingComponent.cs b/Content.Shared/_NF/Shipyard/Components/ShipyardListingComponent.cs similarity index 85% rename from Content.Shared/Shipyard/Components/ShipyardListingComponent.cs rename to Content.Shared/_NF/Shipyard/Components/ShipyardListingComponent.cs index 2aa1df67534..87eb0c2ed48 100644 --- a/Content.Shared/Shipyard/Components/ShipyardListingComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/ShipyardListingComponent.cs @@ -1,7 +1,7 @@ -using Content.Shared.Shipyard.Prototypes; +using Content.Shared._NF.Shipyard.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; -namespace Content.Shared.Shipyard.Components; +namespace Content.Shared._NF.Shipyard.Components; /// /// When applied to a shipyard console, adds all specified shuttles to the list of sold shuttles. diff --git a/Content.Shared/Shipyard/Components/ShuttleDeedComponent.cs b/Content.Shared/_NF/Shipyard/Components/ShuttleDeedComponent.cs similarity index 94% rename from Content.Shared/Shipyard/Components/ShuttleDeedComponent.cs rename to Content.Shared/_NF/Shipyard/Components/ShuttleDeedComponent.cs index 8f9c3cb942e..ca208931093 100644 --- a/Content.Shared/Shipyard/Components/ShuttleDeedComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/ShuttleDeedComponent.cs @@ -1,7 +1,7 @@ using Content.Shared._NF.ShuttleRecords; using Robust.Shared.GameStates; -namespace Content.Shared.Shipyard.Components; +namespace Content.Shared._NF.Shipyard.Components; /// /// Tied to an ID card when a ship is purchased. 1 ship per captain. diff --git a/Content.Shared/Shipyard/Events/ShipyardConsolePurchaseMessage.cs b/Content.Shared/_NF/Shipyard/Events/ShipyardConsolePurchaseMessage.cs similarity index 88% rename from Content.Shared/Shipyard/Events/ShipyardConsolePurchaseMessage.cs rename to Content.Shared/_NF/Shipyard/Events/ShipyardConsolePurchaseMessage.cs index dd2a6e7649e..1722e9652de 100644 --- a/Content.Shared/Shipyard/Events/ShipyardConsolePurchaseMessage.cs +++ b/Content.Shared/_NF/Shipyard/Events/ShipyardConsolePurchaseMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Shipyard.Events; +namespace Content.Shared._NF.Shipyard.Events; /// /// Purchase a Vessel from the console diff --git a/Content.Shared/Shipyard/Events/ShipyardConsoleSellMessage.cs b/Content.Shared/_NF/Shipyard/Events/ShipyardConsoleSellMessage.cs similarity index 89% rename from Content.Shared/Shipyard/Events/ShipyardConsoleSellMessage.cs rename to Content.Shared/_NF/Shipyard/Events/ShipyardConsoleSellMessage.cs index f5218ba797b..afb13cf1336 100644 --- a/Content.Shared/Shipyard/Events/ShipyardConsoleSellMessage.cs +++ b/Content.Shared/_NF/Shipyard/Events/ShipyardConsoleSellMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Shipyard.Events; +namespace Content.Shared._NF.Shipyard.Events; /// /// Sell a Vessel from the console. The button holds no info and is doing a validation check for a deed client side, but we will still check on the server. diff --git a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs b/Content.Shared/_NF/Shipyard/Prototypes/VesselPrototype.cs similarity index 98% rename from Content.Shared/Shipyard/Prototypes/VesselPrototype.cs rename to Content.Shared/_NF/Shipyard/Prototypes/VesselPrototype.cs index d822331ac20..73afcbf4bc3 100644 --- a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs +++ b/Content.Shared/_NF/Shipyard/Prototypes/VesselPrototype.cs @@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; using Robust.Shared.Utility; -namespace Content.Shared.Shipyard.Prototypes; +namespace Content.Shared._NF.Shipyard.Prototypes; [Prototype] public sealed class VesselPrototype : IPrototype, IInheritingPrototype diff --git a/Content.Shared/Shipyard/SharedShipyardSystem.cs b/Content.Shared/_NF/Shipyard/SharedShipyardSystem.cs similarity index 94% rename from Content.Shared/Shipyard/SharedShipyardSystem.cs rename to Content.Shared/_NF/Shipyard/SharedShipyardSystem.cs index 215b54cc2d0..168511efc05 100644 --- a/Content.Shared/Shipyard/SharedShipyardSystem.cs +++ b/Content.Shared/_NF/Shipyard/SharedShipyardSystem.cs @@ -1,11 +1,11 @@ using Content.Shared.Containers.ItemSlots; -using Content.Shared.Shipyard; +using Content.Shared._NF.Shipyard; using JetBrains.Annotations; using Robust.Shared.GameStates; using Robust.Shared.Serialization; -using Content.Shared.Shipyard.Components; +using Content.Shared._NF.Shipyard.Components; -namespace Content.Shared.Shipyard; +namespace Content.Shared._NF.Shipyard; // Note: when adding a new ui key, don't forget to modify the dictionary in SharedShipyardSystem [NetSerializable, Serializable] diff --git a/Content.Shared/_NF/ShuttleRecords/Components/ShuttleRecordsConsoleComponent.cs b/Content.Shared/_NF/ShuttleRecords/Components/ShuttleRecordsConsoleComponent.cs index d32f021ce11..a39a9c375b2 100644 --- a/Content.Shared/_NF/ShuttleRecords/Components/ShuttleRecordsConsoleComponent.cs +++ b/Content.Shared/_NF/ShuttleRecords/Components/ShuttleRecordsConsoleComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.Containers.ItemSlots; using Robust.Shared.Audio; using Robust.Shared.GameStates; From 4f57377903bcda2f3bd334bf56bb52524f4cfebf Mon Sep 17 00:00:00 2001 From: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Fri, 31 Jan 2025 18:06:35 -0600 Subject: [PATCH 4/5] Rename (#2825) --- .../Shuttles/Nfsd/{wendigo.yml => hypnos.yml} | 4 ++-- .../Shipyard/Nfsd/{wendigo.yml => hypnos.yml} | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) rename Resources/Maps/_NF/Shuttles/Nfsd/{wendigo.yml => hypnos.yml} (99%) rename Resources/Prototypes/_NF/Shipyard/Nfsd/{wendigo.yml => hypnos.yml} (64%) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml b/Resources/Maps/_NF/Shuttles/Nfsd/hypnos.yml similarity index 99% rename from Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/hypnos.yml index 8c16363977d..f4d8ba47852 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/hypnos.yml @@ -18,9 +18,9 @@ entities: - uid: 1 components: - type: MetaData - name: Wendigo + name: Hypnos - type: BecomesStation - id: Wendigo + id: Hypnos - type: Transform parent: invalid - type: MapGrid diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hypnos.yml similarity index 64% rename from Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml rename to Resources/Prototypes/_NF/Shipyard/Nfsd/hypnos.yml index 6eff3aec397..258b371a45f 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/wendigo.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/hypnos.yml @@ -9,31 +9,31 @@ # Shuttle Notes: # - type: vessel - id: Wendigo + id: Hypnos parent: BaseVessel - name: NSF Wendigo - description: A light medium ship with a recommended crew of 2 to 3 officers, the Wendigo is a dedicated interdiction vessel outfitted with a powerful EMP device for tackling escaping vessels. + name: NSF Hypnos + description: A light medium ship with a recommended crew of 2 to 3 officers, the Hypnos is a dedicated interdiction vessel outfitted with a powerful EMP device for tackling escaping vessels. price: 34500 category: Medium group: Security access: Sergeant - shuttlePath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml + shuttlePath: /Maps/_NF/Shuttles/Nfsd/hypnos.yml class: - Pursuit engine: - Uranium - type: gameMap - id: Wendigo - mapName: 'NSF Wendigo' - mapPath: /Maps/_NF/Shuttles/Nfsd/wendigo.yml + id: Hypnos + mapName: 'NSF Hypnos' + mapPath: /Maps/_NF/Shuttles/Nfsd/hypnos.yml minPlayers: 0 stations: - Wendigo: + Hypnos: stationProto: StandardFrontierSecurityVessel components: - type: StationNameSetup - mapNameTemplate: 'Wendigo {1}' + mapNameTemplate: 'Hypnos {1}' nameGenerator: !type:NanotrasenNameGenerator prefixCreator: '14' From 1999f80697dfe42b3a250edfb9818967ff1a6548 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 1 Feb 2025 00:07:01 +0000 Subject: [PATCH 5/5] Automatic Changelog (#2825) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index e0c1b5876a2..8b1f16f741f 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6728,3 +6728,9 @@ Entries: message: A keybind is available to swap to the previous hand (default Shift+X). id: 5703 time: '2025-01-31T23:45:13.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Tweak + message: Renamed Wendigo to Hypnos. + id: 5704 + time: '2025-02-01T00:06:36.0000000+00:00'