Merge branch 'master' into duchess

Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Abilities;
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared._DV.CCVars;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;

Content.Client/Options/UI/OptionsMenu.xaml

@@ -1,6 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
-            xmlns:dtabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
+            xmlns:dtabs="clr-namespace:Content.Client._DV.Options.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">

Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs

@@ -26,7 +26,7 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered<LobbyS
     [Dependency] private readonly IConfigurationManager _configuration = default!;
     [Dependency] private readonly JobRequirementsManager _jobRequirements = default!;
 
-    private const int PlaytimeOpenGuidebook = 60;
+    private const int PlaytimeOpenGuidebook = 180; // Frontier 60<180
 
     private GuidebookWindow? _guideWindow;
     private MenuButton? GuidebookButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.GuidebookButton;

Content.Client/DeltaV/Abilities/CrawlUnderObjectsSystem.cs → Content.Client/_DV/Abilities/CrawlUnderObjectsSystem.cs

@@ -1,9 +1,9 @@
-using Content.Shared.DeltaV.Abilities;
+using Content.Shared._DV.Abilities;
 using Content.Shared.Popups;
 using Robust.Client.GameObjects;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
-namespace Content.Client.DeltaV.Abilities;
+namespace Content.Client._DV.Abilities;
 
 public sealed partial class HideUnderTableAbilitySystem : SharedCrawlUnderObjectsSystem
 {

Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml → Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml

@@ -1,6 +1,6 @@
 <PanelContainer
         xmlns="https://spacestation14.io"
-        xmlns:cc="clr-namespace:Content.Client.DeltaV.Administration.UI"
+        xmlns:cc="clr-namespace:Content.Client._DV.Administration.UI"
         StyleClasses="BackgroundDark"
         HorizontalExpand="True"
         Margin="4">

Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml.cs → Content.Client/_DV/Administration/UI/DepartmentWhitelistPanel.xaml.cs

@@ -6,7 +6,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.DeltaV.Administration.UI;
+namespace Content.Client._DV.Administration.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class DepartmentWhitelistPanel : PanelContainer

Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml → Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml

@@ -1,6 +1,6 @@
 <PanelContainer
         xmlns="https://spacestation14.io"
-        xmlns:cc="clr-namespace:Content.Client.DeltaV.Administration.UI"
+        xmlns:cc="clr-namespace:Content.Client._DV.Administration.UI"
         StyleClasses="BackgroundDark"
         HorizontalExpand="True"
         Margin="4"> <!-- Frontier: ghost role set whitelist -->

Content.Client/DeltaV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs → Content.Client/_DV/Administration/UI/GhostRoleSetWhitelistPanel.xaml.cs

@@ -4,7 +4,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.DeltaV.Administration.UI;
+namespace Content.Client._DV.Administration.UI;
 
 // Frontier: ghost role whitelist set
 [GenerateTypedNameReferences]

Content.Client/DeltaV/Administration/UI/JobWhitelistsEui.cs → Content.Client/_DV/Administration/UI/JobWhitelistsEui.cs

@@ -1,8 +1,8 @@
 using Content.Client.Eui;
-using Content.Shared.DeltaV.Administration;
+using Content.Shared._DV.Administration;
 using Content.Shared.Eui;
 
-namespace Content.Client.DeltaV.Administration.UI;
+namespace Content.Client._DV.Administration.UI;
 
 public sealed class JobWhitelistsEui : BaseEui
 {

Content.Client/DeltaV/Administration/UI/JobWhitelistsWindow.xaml.cs → Content.Client/_DV/Administration/UI/JobWhitelistsWindow.xaml.cs

@@ -1,8 +1,8 @@
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Database;
-using Content.Shared.DeltaV.Administration;
+using Content.Shared._DV.Administration;
 using Content.Shared.Roles;
-using Content.Shared.DeltaV.Whitelist;
+using Content.Shared._DV.Whitelist;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -11,7 +11,7 @@
 using Robust.Shared.Prototypes;
 using Content.Shared.Ghost.Roles;
 
-namespace Content.Client.DeltaV.Administration.UI;
+namespace Content.Client._DV.Administration.UI;
 
 /// <summary>
 /// An admin panel to toggle whitelists for individual jobs or entire departments.

Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUi.cs → Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUi.cs

@@ -2,7 +2,7 @@
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 
-namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+namespace Content.Client._DV.CartridgeLoader.Cartridges;
 
 public sealed partial class MailMetricUi : UIFragment
 {

Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml → Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml

@@ -1,5 +1,5 @@
 <cartridges:MailMetricUiFragment
-    xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
+    xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
     xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns="https://spacestation14.io"

Content.Client/DeltaV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml.cs → Content.Client/_DV/CartridgeLoader/Cartridges/MailMetricUiFragment.xaml.cs

@@ -3,7 +3,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
+namespace Content.Client._DV.CartridgeLoader.Cartridges;
 
 [GenerateTypedNameReferences]
 public sealed partial class MailMetricUiFragment : BoxContainer

Content.Client/DeltaV/Harpy/HarpyVisualsComponent.cs → Content.Client/_DV/Harpy/HarpyVisualsComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Client.DeltaV.Harpy;
+namespace Content.Client._DV.Harpy;
 
 [RegisterComponent]
 public sealed partial class HarpyVisualsComponent : Component

Content.Client/DeltaV/Mail/MailComponent.cs → Content.Client/_DV/Mail/MailComponent.cs

@@ -1,6 +1,6 @@
-using Content.Shared.DeltaV.Mail;
+using Content.Shared._DV.Mail;
 
-namespace Content.Client.DeltaV.Mail
+namespace Content.Client._DV.Mail
 {
     [RegisterComponent]
     public sealed partial class MailComponent : SharedMailComponent

Content.Client/DeltaV/Mail/MailSystem.cs → Content.Client/_DV/Mail/MailSystem.cs

@@ -1,9 +1,9 @@
-using Content.Shared.DeltaV.Mail;
+using Content.Shared._DV.Mail;
 using Content.Shared.StatusIcon;
 using Robust.Client.GameObjects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.DeltaV.Mail;
+namespace Content.Client._DV.Mail;
 
 /// <summary>
 ///     Display a cool stamp on the parcel based on the job of the recipient.

Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml → Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml

@@ -1,6 +1,6 @@
-<tabs:DeltaTab xmlns="https://spacestation14.io"
+<tabs:DeltaTab xmlns="https://spacestation14.io"
                   xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                  xmlns:tabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
+                  xmlns:tabs="clr-namespace:Content.Client._DV.Options.UI.Tabs"
                   xmlns:xNamespace="http://schemas.microsoft.com/winfx/2006/xaml"
                   xmlns:s="clr-namespace:Content.Client.Stylesheets">
     <BoxContainer Orientation="Vertical">

Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs → Content.Client/_DV/Options/UI/Tabs/DeltaTab.xaml.cs

@@ -1,11 +1,11 @@
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared._DV.CCVars;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
 
-namespace Content.Client.DeltaV.Options.UI.Tabs;
+namespace Content.Client._DV.Options.UI.Tabs;
 
 [GenerateTypedNameReferences]
 public sealed partial class DeltaTab : Control

Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs → Content.Client/_DV/Overlays/UltraVisionOverlay.cs

@@ -5,7 +5,7 @@
 using Content.Shared.Abilities;
 using System.Numerics;
 
-namespace Content.Client.DeltaV.Overlays;
+namespace Content.Client._DV.Overlays;
 
 public sealed partial class UltraVisionOverlay : Overlay
 {

Content.Client/DeltaV/Overlays/UltraVisionSystem.cs → Content.Client/_DV/Overlays/UltraVisionSystem.cs

@@ -1,10 +1,10 @@
 using Content.Shared.Abilities;
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared._DV.CCVars;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 
-namespace Content.Client.DeltaV.Overlays;
+namespace Content.Client._DV.Overlays;
 
 public sealed partial class UltraVisionSystem : EntitySystem
 {

Content.Client/DeltaV/RoundEnd/NoEorgPopup.xaml.cs → Content.Client/_DV/RoundEnd/NoEorgPopup.xaml.cs

@@ -1,13 +1,13 @@
 using Content.Client.UserInterface.Controls;
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared._DV.CCVars;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client.DeltaV.RoundEnd;
+namespace Content.Client._DV.RoundEnd;
 
 [GenerateTypedNameReferences]
 public sealed partial class NoEorgPopup : FancyWindow

Content.Client/DeltaV/RoundEnd/NoEorgPopupSystem.cs → Content.Client/_DV/RoundEnd/NoEorgPopupSystem.cs

@@ -1,8 +1,8 @@
 using Content.Shared.GameTicking;
-using Content.Shared.DeltaV.CCVars;
+using Content.Shared._DV.CCVars;
 using Robust.Shared.Configuration;
 
-namespace Content.Client.DeltaV.RoundEnd;
+namespace Content.Client._DV.RoundEnd;
 
 public sealed class NoEorgPopupSystem : EntitySystem
 {

Content.Server/Chat/Systems/ChatSystem.Emote.cs

@@ -4,7 +4,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-using Content.Shared.DeltaV.Harpy;
+using Content.Shared._DV.Harpy;
 
 namespace Content.Server.Chat.Systems;
 

Content.Server/Ghost/GhostSystem.cs

@@ -1,5 +1,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Administration.Managers; // Frontier
+using Content.Server.Cargo.Systems; // Frontier
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Server.Ghost.Components;
@@ -93,6 +94,7 @@ public override void Initialize()
             SubscribeLocalEvent<GhostComponent, BooActionEvent>(OnActionPerform);
             SubscribeLocalEvent<GhostComponent, ToggleGhostHearingActionEvent>(OnGhostHearingAction);
             SubscribeLocalEvent<GhostComponent, InsertIntoEntityStorageAttemptEvent>(OnEntityStorageInsertAttempt);
+            SubscribeLocalEvent<GhostComponent, PriceCalculationEvent>(OnPriceCalculation); // Frontier
 
             SubscribeLocalEvent<RoundEndTextAppendEvent>(_ => MakeVisible(true));
             SubscribeLocalEvent<ToggleGhostVisibilityToAllEvent>(OnToggleGhostVisibilityToAll);
@@ -592,6 +594,14 @@ public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaComma
 
             return true;
         }
+
+        // Frontier: worthless ghosts
+        private void OnPriceCalculation(Entity<GhostComponent> ent, ref PriceCalculationEvent args)
+        {
+            args.Price = 0;
+            args.Handled = true;
+        }
+        // End Frontier
     }
 
     public sealed class GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) : HandledEntityEventArgs

Content.Server/Materials/MaterialStorageSystem.cs

@@ -3,6 +3,7 @@
 using Content.Shared.Materials;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
+using Content.Server.Storage.Components; // Frontier
 using Content.Server.Power.Components;
 using Content.Server.Stack;
 using Content.Shared.ActionBlocker;
@@ -81,6 +82,14 @@ private void OnEjectMessage(EjectMaterialMessage msg, EntitySessionEventArgs arg
         if (volume <= 0 || !TryChangeMaterialAmount(uid, msg.Material, -volume))
             return;
 
+        // Frontier
+        // If we made it this far, turn off the magnet before spawning materials
+        if (TryComp<MaterialStorageMagnetPickupComponent>(uid, out var magnet))
+        {
+            magnet.MagnetEnabled = false;
+        }
+        // end Frontier
+
         var mats = SpawnMultipleFromMaterial(volume, material, Transform(uid).Coordinates, out _);
         foreach (var mat in mats.Where(mat => !TerminatingOrDeleted(mat)))
         {

Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs

@@ -152,7 +152,7 @@ private void OnEatMouse(EntityUid uid, FelinidComponent component, EatMouseActio
         Del(component.EatActionTarget.Value);
         component.EatActionTarget = null;
 
-        _audio.PlayPvs("/Audio/DeltaV/Items/eatfood.ogg", uid, AudioHelpers.WithVariation(0.15f));
+        _audio.PlayPvs("/Audio/_DV/Items/eatfood.ogg", uid, AudioHelpers.WithVariation(0.15f));
 
         _hungerSystem.ModifyHunger(uid, 50f, hunger);
 

Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs

@@ -88,7 +88,7 @@ private void OnDebrisDespawn(EntityUid entity, SpaceDebrisComponent component, E
             }
 
             // Do not delete the grid, it is being deleted.
-            _linkedLifecycleGrid.UnparentPlayersFromGrid(entity, false);
+            _linkedLifecycleGrid.UnparentPlayersFromGrid(grid: entity, deleteGrid: false, ignoreLifeStage: true);
         }
     }
     // Frontier

Content.Server/DeltaV/Abilities/CrawlUnderObjectsSystem.cs → Content.Server/_DV/Abilities/CrawlUnderObjectsSystem.cs

@@ -1,15 +1,15 @@
 using Content.Shared.Actions;
 using Content.Shared.Climbing.Components;
 using Content.Shared.Climbing.Events;
-using Content.Shared.DeltaV.Abilities;
+using Content.Shared._DV.Abilities;
 using Content.Shared.Maps;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Physics;
 using Robust.Server.GameObjects;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Systems;
 
-namespace Content.Server.DeltaV.Abilities;
+namespace Content.Server._DV.Abilities;
 
 public sealed partial class CrawlUnderObjectsSystem : SharedCrawlUnderObjectsSystem
 {

Content.Server/DeltaV/Administration/Commands/JobWhitelistsCommand.cs → Content.Server/_DV/Administration/Commands/JobWhitelistsCommand.cs

@@ -3,7 +3,7 @@
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
-namespace Content.Server.DeltaV.Administration.Commands;
+namespace Content.Server._DV.Administration.Commands;
 
 /// <summary>
 /// Opens the job whitelists panel for editing player whitelists.