Merge branch 'Selective-Dropper' of https://github.com/blueDev2/front…

…ier-station-14 into Selective-Dropper

Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs

@@ -23,6 +23,8 @@ public AdminAnnounceWindow()
             AnnounceMethod.SetItemMetadata(0, AdminAnnounceType.Station);
             AnnounceMethod.AddItem(_localization.GetString("admin-announce-type-server"));
             AnnounceMethod.SetItemMetadata(1, AdminAnnounceType.Server);
+            AnnounceMethod.AddItem(_localization.GetString("admin-announce-type-antag"));  // Frontier
+            AnnounceMethod.SetItemMetadata(2, AdminAnnounceType.Antag);  // Frontier
             AnnounceMethod.OnItemSelected += AnnounceMethodOnOnItemSelected;
             Announcement.OnKeyBindUp += AnnouncementOnOnTextChanged;
         }
@@ -35,7 +37,8 @@ private void AnnouncementOnOnTextChanged(GUIBoundKeyEventArgs args)
         private void AnnounceMethodOnOnItemSelected(OptionButton.ItemSelectedEventArgs args)
         {
             AnnounceMethod.SelectId(args.Id);
-            Announcer.Editable = ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Station) == AdminAnnounceType.Station;
+            Announcer.Editable = ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Station) == AdminAnnounceType.Station
+            || ((AdminAnnounceType?)args.Button.SelectedMetadata ?? AdminAnnounceType.Antag) == AdminAnnounceType.Antag; // Frontier
         }
     }
 }

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -8,6 +8,7 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Wieldable.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -95,10 +96,29 @@ public override void Update(float frameTime)
         // it's kinda tricky.
         // I think as long as we make secondaries their own component it's probably fine
         // as long as guncomp has an alt-use key then it shouldn't be too much of a PITA to deal with.
-        if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
+
+        //Frontier: better support melee vs. ranged checks
+        /*if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
         {
             return;
+        }*/
+
+        // Ranged component has priority over melee if both are supported.
+        bool gunBoundToUse = false;
+        bool gunBoundToAlt = false;
+        if (TryComp<GunComponent>(weaponUid, out var gun)) {
+            gunBoundToUse = gun.UseKey;
+            gunBoundToAlt = !gun.UseKey; //Bound to alt-use when false
+
+            // If ranged mode only works when wielded, do not block melee attacks when unwielded
+            // (e.g. crusher & crusher glaive)
+            if (TryComp<GunRequiresWieldComponent>(weaponUid, out var _) &&
+                    TryComp<WieldableComponent>(weaponUid, out var wield)) {
+                gunBoundToUse &= wield.Wielded;
+                gunBoundToAlt &= wield.Wielded;
+            }
         }
+        //End Frontier
 
         var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
 
@@ -119,7 +139,7 @@ public override void Update(float frameTime)
         }
 
         // Heavy attack.
-        if (altDown == BoundKeyState.Down)
+        if (altDown == BoundKeyState.Down && !gunBoundToAlt) //Frontier: add !gunBoundToAlt condition
         {
             // If it's an unarmed attack then do a disarm
             if (weapon.AltDisarm && weaponUid == entity)
@@ -140,7 +160,7 @@ public override void Update(float frameTime)
         }
 
         // Light attack
-        if (useDown == BoundKeyState.Down)
+        if (useDown == BoundKeyState.Down && !gunBoundToUse) //Frontier: add !gunBoundToUse condition
         {
             var attackerPos = Transform(entity).MapPosition;
 

Content.Server/Administration/UI/AdminAnnounceEui.cs

@@ -5,6 +5,7 @@
 using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
+using Robust.Shared.Audio; // Frontier
 
 namespace Content.Server.Administration.UI
 {
@@ -52,6 +53,9 @@ public override void HandleMessage(EuiMessageBase msg)
                         case AdminAnnounceType.Station:
                             _chatSystem.DispatchGlobalAnnouncement(doAnnounce.Announcement, doAnnounce.Announcer, colorOverride: Color.Gold);
                             break;
+                        case AdminAnnounceType.Antag: // Frontier
+                            _chatSystem.DispatchGlobalAnnouncement(doAnnounce.Announcement, doAnnounce.Announcer, true, new SoundPathSpecifier("/Audio/Announcements/war.ogg"), colorOverride: Color.Red);
+                            break;
                     }
 
                     StateDirty();

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

@@ -196,7 +196,7 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
                 ("approverName", approverName),
                 ("approverJob", approverJob),
                 ("cost", cost));
-            _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false);
+            //_radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false); # Frontier
             ConsolePopup(args.Actor, Loc.GetString("cargo-console-trade-station", ("destination", MetaData(uid).EntityName)));
 
             // Log order approval

Content.Server/VendingMachines/VendingMachineSystem.cs

@@ -34,6 +34,8 @@
 using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
+using Content.Server.Administration.Logs; // Frontier
+using Content.Shared.Database; // Frontier
 
 namespace Content.Server.VendingMachines
 {
@@ -57,6 +59,8 @@ public sealed class VendingMachineSystem : SharedVendingMachineSystem
 
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
 
+        [Dependency] private readonly IAdminLogManager _adminLogger = default!; // Frontier
+
         private ISawmill _sawmill = default!;
 
         public override void Initialize()
@@ -407,6 +411,9 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type,
                         }
 
                         UpdateVendingMachineInterfaceState(uid, component, bank.Balance);
+
+                        _adminLogger.Add(LogType.Action, LogImpact.Low, // Frontier - Vending machine log
+                            $"{ToPrettyString(sender):user} bought from [vendingMachine:{ToPrettyString(uid!)}, product:{proto.Name}, cost:{totalPrice},  with balance at {bank.Balance}"); // Frontier - Vending machine log
                     }
                 }
             }

Content.Server/Worldgen/Systems/Debris/DebrisFeaturePlacerSystem.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Server.Worldgen.Components;
 using Content.Server.Worldgen.Components.Debris;
@@ -10,6 +10,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
+using Content.Server._NF.Worldgen.Components.Debris; // Frontier
 
 namespace Content.Server.Worldgen.Systems.Debris;
 
@@ -227,6 +228,8 @@ private void OnChunkLoaded(EntityUid uid, DebrisFeaturePlacerControllerComponent
             var owned = EnsureComp<OwnedDebrisComponent>(ent);
             owned.OwningController = uid;
             owned.LastKey = point;
+
+            EnsureComp<SpaceDebrisComponent>(ent); // Frontier
         }
 
         if (failures > 0)

Content.Server/Worldgen/Systems/GC/GCQueueSystem.cs

@@ -1,10 +1,9 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Worldgen.Components.GC;
 using Content.Server.Worldgen.Prototypes;
 using Content.Shared.CCVar;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -19,7 +18,6 @@ public sealed class GCQueueSystem : EntitySystem
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     [ViewVariables] private TimeSpan _maximumProcessTime = TimeSpan.Zero;
 
@@ -72,32 +70,6 @@ public override void Update(float frameTime)
     /// <param name="e">Entity to GC.</param>
     public void TryGCEntity(EntityUid e)
     {
-        if (!EntityManager.TryGetComponent<TransformComponent>(e, out var transform))
-        {
-            Log.Error("Entity was missing transform component");
-            return;
-        }
-
-        if (transform.GridUid == null)
-        {
-            Log.Error("Entity has no associated grid?");
-            return;
-        }
-
-        foreach (var player in Filter.Empty().AddInGrid(transform.GridUid.Value, EntityManager).Recipients)
-        {
-            if (player.AttachedEntity.HasValue)
-            {
-                var playerEntityUid = player.AttachedEntity.Value;
-                if (HasComp<GCAbleObjectComponent>(playerEntityUid))
-                {
-                    // Mobs are NEVER immune (even if they're from a different grid, they shouldn't be here)
-                    continue;
-                }
-                _transform.SetParent(playerEntityUid, transform.ParentUid);
-            }
-        }
-
         if (!TryComp<GCAbleObjectComponent>(e, out var comp))
         {
             QueueDel(e); // not our problem :)

Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs

@@ -1,5 +1,13 @@
-using Content.Server.Worldgen.Components;
+using Content.Server.Worldgen.Components;
 using Robust.Server.GameObjects;
+using Content.Server._NF.Worldgen.Components.Debris; // Frontier
+using Content.Shared.Humanoid; // Frontier
+using Content.Shared.Mobs.Components; // Frontier
+using System.Numerics; // Frontier
+using Robust.Shared.Map; // Frontier
+using Content.Server._NF.Salvage; // Frontier
+
+using EntityPosition = (Robust.Shared.GameObjects.EntityUid Entity, Robust.Shared.Map.EntityCoordinates Coordinates); // Frontier
 
 namespace Content.Server.Worldgen.Systems;
 
@@ -10,6 +18,18 @@ public sealed class LocalityLoaderSystem : BaseWorldSystem
 {
     [Dependency] private readonly TransformSystem _xformSys = default!;
 
+    // Frontier
+    private List<(Entity<TransformComponent> Entity, EntityUid MapUid, Vector2 LocalPosition)> _detachEnts = new(); // Frontier
+    private EntityQuery<SpaceDebrisComponent> _debrisQuery;
+    private readonly List<(EntityUid Debris, List<EntityPosition> Entity)> _terminatingDebris = [];
+
+    public override void Initialize()
+    {
+        _debrisQuery = GetEntityQuery<SpaceDebrisComponent>();
+        SubscribeLocalEvent<SpaceDebrisComponent, EntityTerminatingEvent>(OnDebrisDespawn);
+    }
+    // Frontier
+
     /// <inheritdoc />
     public override void Update(float frameTime)
     {
@@ -54,10 +74,46 @@ public override void Update(float frameTime)
             }
         }
     }
+
+    // Frontier
+    private void OnDebrisDespawn(EntityUid entity, SpaceDebrisComponent component, EntityTerminatingEvent e)
+    {
+        if (entity != null)
+        {
+            // Handle mobrestrictions getting deleted
+            var query = AllEntityQuery<SalvageMobRestrictionsNFComponent>();
+
+            while (query.MoveNext(out var salvUid, out var salvMob))
+            {
+                if (entity == salvMob.LinkedGridEntity)
+                {
+                    QueueDel(salvUid);
+                }
+            }
+
+            var mobQuery = AllEntityQuery<HumanoidAppearanceComponent, MobStateComponent, TransformComponent>();
+            _detachEnts.Clear();
+
+            while (mobQuery.MoveNext(out var mobUid, out _, out _, out var xform))
+            {
+                if (xform.GridUid == null || entity != xform.GridUid.Value || xform.MapUid == null)
+                    continue;
+
+                // Can't parent directly to map as it runs grid traversal.
+                _detachEnts.Add(((mobUid, xform), xform.MapUid.Value, _xformSys.GetWorldPosition(xform)));
+                _xformSys.DetachParentToNull(mobUid, xform);
+            }
+
+            foreach (var detachEnt in _detachEnts)
+            {
+                _xformSys.SetCoordinates(detachEnt.Entity.Owner, new EntityCoordinates(detachEnt.MapUid, detachEnt.LocalPosition));
+            }
+        }
+    }
+    // Frontier
 }
 
 /// <summary>
 ///     A directed fired on a loadable entity when a local loader enters it's vicinity.
 /// </summary>
 public record struct LocalStructureLoadedEvent;
-

Content.Shared/Administration/AdminAnnounceEuiState.cs

@@ -7,6 +7,7 @@ public enum AdminAnnounceType
     {
         Station,
         Server,
+        Antag, // Frontier
     }
 
     [Serializable, NetSerializable]

Content.Shared/_NF/Worldgen/Components/Debris/SpaceDebrisComponent.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Server._NF.Worldgen.Components.Debris;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SpaceDebrisComponent : Component
+{
+    /// <summary>
+    /// TODO: Add this so we can track all the debris active entities.
+    /// </summary>
+    [DataField]
+    public List<EntityUid>? ActiveEntities;
+}

Resources/Changelog/Changelog.yml

@@ -4658,3 +4658,19 @@ Entries:
       message: new Cryo Chem
   id: 4990
   time: '2024-05-21T21:55:06.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: 'Future ranged weapons can support melee attacks on the alt-use key. '
+  id: 4991
+  time: '2024-05-24T19:22:22.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Maintenance pass on a number of shuttles with minor changes to: Brigand,
+        Harbormaster, Kilderkin, Lantern, Legman, Liquidator and Searchlight;
+        Major changes to Gasbender and Pioneer. Gasbender is now expedition
+        capable. Pioneer is now smaller.
+  id: 4992
+  time: '2024-05-24T19:47:11.0000000+00:00'

Resources/Locale/en-US/_NF/administration/ui/admin-announce-window.ftl

@@ -0,0 +1 @@
+admin-announce-type-antag = Antag