Merge branch 'master' into 2024-06-Wizard-NPCs-Rework

Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs

@@ -25,6 +25,7 @@ protected override void Open()
                 Index = index,
             });
         };
+        _window.FinishMission += () => SendMessage(new FinishSalvageMessage()); // Frontier
         _window.OnClose += Close;
         _window?.OpenCenteredLeft();
     }

Content.Client/Salvage/UI/SalvageExpeditionWindow.xaml

@@ -19,5 +19,8 @@
         <BoxContainer Name="Container"
                       Orientation="Horizontal"
                       Margin="5 0 5 0"/>
+        <Button Name="Finish"
+                Text="{Loc 'salvage-expedition-window-finish'}"
+                HorizontalAlignment="Right"/>
     </BoxContainer>
 </controls:FancyWindow>

Content.Client/Salvage/UI/SalvageExpeditionWindow.xaml.cs

@@ -30,6 +30,7 @@ public sealed partial class SalvageExpeditionWindow : FancyWindow,
     private readonly SharedSalvageSystem _salvage;
 
     public event Action<ushort>? ClaimMission;
+    public event Action? FinishMission; // Frontier
     private bool _claimed;
     private bool _cooldown;
     private TimeSpan _nextOffer;
@@ -266,6 +267,16 @@ public void UpdateState(SalvageExpeditionConsoleState state)
 
             Container.AddChild(box);
         }
+
+        // Frontier
+        Finish.OnPressed += _ =>
+        {
+            Finish.Disabled = true;
+            FinishMission?.Invoke();
+        };
+
+        Finish.Disabled = !state.CanFinish;
+        // Frontier
     }
 
     protected override void FrameUpdate(FrameEventArgs args)

Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs

@@ -272,7 +272,7 @@ protected override void Draw(DrawingHandleScreen handle)
                             var canDock = distance < SharedDockingSystem.DockRange && inAlignment;
 
                             if (dockButton != null)
-                                dockButton.Disabled = !canDock || !canDockChange;
+                                dockButton.Disabled = !canDock && dock.GridDockedWith == null || !canDockChange; // Frontier: add "&& dock.GridDockedWith == null"
 
                             var lineColor = inAlignment ? Color.Lime : Color.Red;
                             handle.DrawDottedLine(viewedDockPos.Value, collisionCenter, lineColor, offset: lineOffset);

Content.Client/StatusIcon/StatusIconOverlay.cs

@@ -66,7 +66,7 @@ protected override void Draw(in OverlayDrawArgs args)
 
             var countL = 0;
             var countR = 0;
-            var accOffsetL = 0;
+            var accOffsetL = 8; // Frontier: 0<8 - do not overlap the speech bubble
             var accOffsetR = 0;
             icons.Sort();
 

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

@@ -3,7 +3,7 @@
 using Content.Client.UserInterface.Systems.Gameplay;
 using Content.Client.UserInterface.Systems.Ghost.Widgets;
 using Content.Shared.CCVar;
-using Content.Shared.NF14.CCVar;
+using Content.Shared._NF.CCVar; // Frontier
 using Content.Shared.Ghost;
 using Robust.Client.Console;
 using Robust.Client.UserInterface;
@@ -76,8 +76,8 @@ public void UpdateGui()
         Gui.Visible = _system?.IsGhost ?? false;
         Gui.Update(_system?.AvailableGhostRoleCount, _system?.Player?.CanReturnToBody,
             _system?.Player?.TimeOfDeath,
-            _cfg.GetCVar(NF14CVars.RespawnTime),
-            _canUncryo && _cfg.GetCVar(NF14CVars.CryoReturnEnabled));
+            _cfg.GetCVar(NFCCVars.RespawnTime), // Frontier
+            _canUncryo && _cfg.GetCVar(NFCCVars.CryoReturnEnabled)); // Frontier
     }
 
     private void UpdateRespawn(TimeSpan? timeOfDeath)

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

@@ -6,8 +6,7 @@
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
 using Robust.Shared.Configuration;
-using Content.Shared.CCVar;
-using Content.Shared.NF14.CCVar;
+using Content.Shared._NF.CCVar; // Frontier
 
 namespace Content.Client.UserInterface.Systems.Ghost.Widgets;
 
@@ -58,7 +57,7 @@ public void UpdateRespawn(TimeSpan? todd)
         if (todd != null)
         {
             _timeOfDeath = todd;
-            _minTimeToRespawn = _configurationManager.GetCVar(NF14CVars.RespawnTime);
+            _minTimeToRespawn = _configurationManager.GetCVar(NFCCVars.RespawnTime); // Frontier
         }
     }
 

Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

@@ -143,7 +143,7 @@ private bool IsHeater(GasThermoMachineComponent comp)
 
         private void OnToggleMessage(EntityUid uid, GasThermoMachineComponent thermoMachine, GasThermomachineToggleMessage args)
         {
-            var powerState = _power.TogglePower(uid);
+            var powerState = _power.TryTogglePower(uid); // Frontier: Upstream - #28984
             _adminLogger.Add(LogType.AtmosPowerChanged, $"{ToPrettyString(args.Actor)} turned {(powerState ? "On" : "Off")} {ToPrettyString(uid)}");
             DirtyUI(uid, thermoMachine);
         }

Content.Server/Atmos/Portable/SpaceHeaterSystem.cs

@@ -98,7 +98,7 @@ private void OnToggle(EntityUid uid, SpaceHeaterComponent spaceHeater, SpaceHeat
         if (!Resolve(uid, ref powerReceiver))
             return;
 
-        _power.TogglePower(uid);
+        _power.TryTogglePower(uid); // Frontier: Upstream - #28984
 
         UpdateAppearance(uid);
         DirtyUI(uid, spaceHeater);

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

@@ -278,7 +278,7 @@ private bool SellPallets(EntityUid consoleUid, EntityUid gridUid, out double amo
             return false;
 
 
-        var ev = new EntitySoldEvent(toSell, gridUid);
+        var ev = new EntitySoldEvent(toSell, gridUid); // Frontier: add gridUid
         RaiseLocalEvent(ref ev);
 
         foreach (var ent in toSell)

Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs

@@ -238,7 +238,7 @@ private void OnUiButtonPressed(EntityUid uid, SharedDisposalUnitComponent compon
                 _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(player):player} hit flush button on {ToPrettyString(uid)}, it's now {(component.Engaged ? "on" : "off")}");
                 break;
             case SharedDisposalUnitComponent.UiButton.Power:
-                _power.TogglePower(uid, user: args.Actor);
+                _power.TryTogglePower(uid, user: args.Actor); // Frontier: Upstream - #28984
                 break;
             default:
                 throw new ArgumentOutOfRangeException($"{ToPrettyString(player):player} attempted to hit a nonexistant button on {ToPrettyString(uid)}");

Content.Server/Emp/EmpSystem.cs

@@ -1,15 +1,15 @@
 using Content.Server.Entry;
 using Content.Server.Explosion.EntitySystems;
+using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Radio;
 using Content.Server.Station.Components;
 using Content.Server.SurveillanceCamera;
 using Content.Shared.Emp;
 using Content.Shared.Examine;
+using Content.Shared.Tiles; // Frontier
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
-using static Content.Server.Shuttles.Systems.ShuttleConsoleSystem;
-using static Content.Server.Shuttles.Systems.ThrusterSystem;
 
 namespace Content.Server.Emp;
 
@@ -28,10 +28,8 @@ public override void Initialize()
 
         SubscribeLocalEvent<EmpDisabledComponent, RadioSendAttemptEvent>(OnRadioSendAttempt);
         SubscribeLocalEvent<EmpDisabledComponent, RadioReceiveAttemptEvent>(OnRadioReceiveAttempt);
-        SubscribeLocalEvent<EmpDisabledComponent, ApcToggleMainBreakerAttemptEvent>(OnApcToggleMainBreaker);
-        SubscribeLocalEvent<EmpDisabledComponent, SurveillanceCameraSetActiveAttemptEvent>(OnCameraSetActive);
-        //SubscribeLocalEvent<EmpDisabledComponent, ThrusterToggleAttemptEvent>(OnThrusterToggle);
-        //SubscribeLocalEvent<EmpDisabledComponent, ShuttleToggleAttemptEvent>(OnShuttleConsoleToggle);
+        //SubscribeLocalEvent<EmpDisabledComponent, ApcToggleMainBreakerAttemptEvent>(OnApcToggleMainBreaker); // Frontier: Upstream - #28984
+        //SubscribeLocalEvent<EmpDisabledComponent, SurveillanceCameraSetActiveAttemptEvent>(OnCameraSetActive); // Frontier: Upstream - #28984
     }
 
     /// <summary>
@@ -48,7 +46,7 @@ public void EmpPulse(MapCoordinates coordinates, float range, float energyConsum
             // Block EMP on grid
             var gridUid = Transform(uid).GridUid;
             var attemptEv = new EmpAttemptEvent();
-            if (HasComp<StationEmpImmuneComponent>(gridUid))
+            if (TryComp<ProtectedGridComponent>(gridUid, out var prot) && prot.PreventEmpEvents)
                 continue;
 
             TryEmpEffects(uid, energyConsumption, duration);
@@ -88,8 +86,22 @@ public void DoEmpEffects(EntityUid uid, float energyConsumption, float duration)
         }
         if (ev.Disabled)
         {
+            // Frontier: Upstream - #28984 start
+            //disabled.DisabledUntil = Timing.CurTime + TimeSpan.FromSeconds(duration);
             var disabled = EnsureComp<EmpDisabledComponent>(uid);
-            disabled.DisabledUntil = Timing.CurTime + TimeSpan.FromSeconds(duration);
+            if (disabled.DisabledUntil == TimeSpan.Zero)
+            {
+                disabled.DisabledUntil = Timing.CurTime;
+            }
+            disabled.DisabledUntil = disabled.DisabledUntil + TimeSpan.FromSeconds(duration);
+
+            /// i tried my best to go through the Pow3r server code but i literally couldn't find in relation to PowerNetworkBatteryComponent that uses the event system
+            /// the code is otherwise too esoteric for my innocent eyes
+            if (TryComp<PowerNetworkBatteryComponent>(uid, out var powerNetBattery))
+            {
+                powerNetBattery.CanCharge = false;
+            }
+            // Frontier: Upstream - #28984 end
         }
     }
 
@@ -105,6 +117,11 @@ public override void Update(float frameTime)
                 RemComp<EmpDisabledComponent>(uid);
                 var ev = new EmpDisabledRemoved();
                 RaiseLocalEvent(uid, ref ev);
+
+                if (TryComp<PowerNetworkBatteryComponent>(uid, out var powerNetBattery)) // Frontier: Upstream - #28984
+                {
+                    powerNetBattery.CanCharge = true;
+                }
             }
         }
     }
@@ -130,25 +147,16 @@ private void OnRadioReceiveAttempt(EntityUid uid, EmpDisabledComponent component
         args.Cancelled = true;
     }
 
-    private void OnApcToggleMainBreaker(EntityUid uid, EmpDisabledComponent component, ref ApcToggleMainBreakerAttemptEvent args)
-    {
-        args.Cancelled = true;
-    }
-
-    private void OnCameraSetActive(EntityUid uid, EmpDisabledComponent component, ref SurveillanceCameraSetActiveAttemptEvent args)
-    {
-        args.Cancelled = true;
-    }
-
-    //private void OnThrusterToggle(EntityUid uid, EmpDisabledComponent component, ref ThrusterToggleAttemptEvent args)
+    //private void OnApcToggleMainBreaker(EntityUid uid, EmpDisabledComponent component, ref ApcToggleMainBreakerAttemptEvent args) // Frontier: Upstream - #28984
     //{
     //    args.Cancelled = true;
     //}
 
-    //private void OnShuttleConsoleToggle(EntityUid uid, EmpDisabledComponent component, ref ShuttleToggleAttemptEvent args)
+    //private void OnCameraSetActive(EntityUid uid, EmpDisabledComponent component, ref SurveillanceCameraSetActiveAttemptEvent args) // Frontier: Upstream - #28984
     //{
     //    args.Cancelled = true;
     //}
+
 }
 
 /// <summary>

Content.Server/Explosion/EntitySystems/ExplosionSystem.cs

@@ -366,7 +366,7 @@ public void QueueExplosion(MapCoordinates epicenter,
                 var mapGrid = _mapManager.GetGrid(gridId.Value);
                 var gridUid = mapGrid.Owner;
                 var ev = new FloorTileAttemptEvent();
-                if (HasComp<ProtectedGridComponent>(gridUid) || ev.Cancelled)
+                if ((TryComp<ProtectedGridComponent>(gridUid, out var prot) && prot.PreventExplosions) || ev.Cancelled)
                     return null;
             }
         }

Content.Server/Gravity/GravityGeneratorSystem.cs

@@ -2,6 +2,7 @@
 using Content.Server.Audio;
 using Content.Server.Construction;
 using Content.Server.Power.Components;
+using Content.Server.Emp; // Frontier: Upstream - #28984
 using Content.Shared.Database;
 using Content.Shared.Gravity;
 using Content.Shared.Interaction;
@@ -30,6 +31,8 @@ public override void Initialize()
             SubscribeLocalEvent<GravityGeneratorComponent, RefreshPartsEvent>(OnRefreshParts);
             SubscribeLocalEvent<GravityGeneratorComponent, SharedGravityGeneratorComponent.SwitchGeneratorMessage>(
                 OnSwitchGenerator);
+
+            SubscribeLocalEvent<GravityGeneratorComponent, EmpPulseEvent>(OnEmpPulse); // Frontier: Upstream - #28984
         }
 
         private void OnParentChanged(EntityUid uid, GravityGeneratorComponent component, ref EntParentChangedMessage args)
@@ -294,5 +297,27 @@ private void OnSwitchGenerator(
         {
             SetSwitchedOn(uid, component, args.On, user: args.Actor);
         }
+
+        private void OnEmpPulse(EntityUid uid, GravityGeneratorComponent component, EmpPulseEvent args) // Frontier: Upstream - #28984
+        {
+            /// i really don't think that the gravity generator should use normalised 0-1 charge
+            /// as opposed to watts charge that every other battery uses
+
+            if (!TryComp<ApcPowerReceiverComponent>(uid, out var powerReceiver))
+                return;
+
+            var ent = (uid, component, powerReceiver);
+
+            // convert from normalised energy to watts and subtract
+            float maxEnergy = component.ActivePowerUse / component.ChargeRate;
+            float currentEnergy = maxEnergy * component.Charge;
+            currentEnergy = Math.Max(0, currentEnergy - args.EnergyConsumption);
+
+            // apply renormalised energy to charge variable
+            component.Charge = currentEnergy / maxEnergy;
+
+            // update power state
+            UpdateState(ent);
+        }
     }
 }

Content.Server/Paper/PaperSystem.cs

@@ -101,14 +101,14 @@ private void OnExamined(EntityUid uid, PaperComponent paperComp, ExaminedEvent a
                 if (paperComp.StampedBy.Count > 0)
                 {
                     // BEGIN FRONTIER MODIFICATION - Make stamps and signatures render separately.
-                    // Separate into stamps and signatures.
+                    // Separate into stamps and signatures, display each name/stamp only once.
                     var stamps = paperComp.StampedBy.FindAll(s => s.Type == StampType.RubberStamp);
                     var signatures = paperComp.StampedBy.FindAll(s => s.Type == StampType.Signature);
 
                     // If we have stamps, render them.
                     if (stamps.Count > 0)
                     {
-                        var joined = string.Join(", ", stamps.Select(s => Loc.GetString(s.StampedName)));
+                        var joined = string.Join(", ", stamps.Select(s => Loc.GetString(s.StampedName)).Distinct());
                         args.PushMarkup(
                             Loc.GetString(
                                 "paper-component-examine-detail-stamped-by",
@@ -121,7 +121,7 @@ private void OnExamined(EntityUid uid, PaperComponent paperComp, ExaminedEvent a
                     // Ditto for signatures.
                     if (signatures.Count > 0)
                     {
-                        var joined = string.Join(", ", signatures.Select(s => s.StampedName));
+                        var joined = string.Join(", ", signatures.Select(s => s.StampedName).Distinct());
                         args.PushMarkup(
                             Loc.GetString(
                                 "paper-component-examine-detail-signed-by",
@@ -169,8 +169,10 @@ private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUs
             {
                 var stampInfo = GetStampInfo(stampComp); // Frontier: assign DisplayStampInfo before stamp
                 if (_tagSystem.HasTag(args.Used, "Write"))
-                    stampInfo.Type = StampType.Signature;
-                if (TryStamp(uid, stampInfo, stampComp.StampState, paperComp))
+                {
+                    TrySign(uid, args.User, args.Used, paperComp);
+                }
+                else if (TryStamp(uid, stampInfo, stampComp.StampState, paperComp))
                 {
                     // End of Frontier modifications
                     // successfully stamped, play popup

Content.Server/Power/Components/ActiveChargerComponent.cs

@@ -1,10 +1,11 @@
-using Content.Shared.Containers.ItemSlots;
+/* using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Power;
 
 namespace Content.Server.Power.Components
 {
     [RegisterComponent]
-    public sealed partial class ActiveChargerComponent : Component
+    public sealed partial class ActiveChargerComponent : Component  // Frontier: Upstream - #28984 Not used anymore, swap to ChargingComponent
     {
     }
 }
+ */

Content.Server/Power/Components/ChargingComponent.cs

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