Death acidifier fix (space-wizards#25251)

Jezithyr · Feb 15, 2024 · be29a05 · be29a05
1 parent d613942
commit be29a05
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
@@ -111,7 +111,6 @@ public override HashSet<EntityUid> GibBody(
         EntityUid bodyId,
         bool gibOrgans = false,
         BodyComponent? body = null ,
-        bool deleteItems = false,
         bool launchGibs = true,
         Vector2? splatDirection = null,
         float splatModifier = 1,
@@ -129,7 +128,7 @@ public override HashSet<EntityUid> GibBody(
         if (xform.MapUid == null)
             return new HashSet<EntityUid>();
 
-        var gibs = base.GibBody(bodyId, gibOrgans, body, deleteItems, launchGibs: launchGibs,
+        var gibs = base.GibBody(bodyId, gibOrgans, body, launchGibs: launchGibs,
             splatDirection: splatDirection, splatModifier: splatModifier, splatCone:splatCone);
         RaiseLocalEvent(bodyId, new BeingGibbedEvent(gibs));
         QueueDel(bodyId);

diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Explosion.Components.OnTrigger;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
+using Content.Shared.Inventory;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Payload.Components;
@@ -68,6 +69,7 @@ public sealed partial class TriggerSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+        [Dependency] private readonly InventorySystem _inventory = default!;
 
         public override void Initialize()
         {
@@ -154,9 +156,15 @@ private void HandleGibTrigger(EntityUid uid, GibOnTriggerComponent component, Tr
         {
             if (!TryComp<TransformComponent>(uid, out var xform))
                 return;
-
-            _body.GibBody(xform.ParentUid, true, deleteItems: component.DeleteItems);
-
+            if (component.DeleteItems)
+            {
+                var items = _inventory.GetHandOrInventoryEntities(xform.ParentUid);
+                foreach (var item in items)
+                {
+                    Del(item);
+                }
+            }
+            _body.GibBody(xform.ParentUid, true);
             args.Handled = true;
         }
 

diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -274,8 +274,7 @@ public IEnumerable<BodyPartSlot> GetBodyAllSlots(EntityUid bodyId, BodyComponent
     public virtual HashSet<EntityUid> GibBody(
         EntityUid bodyId,
         bool gibOrgans = false,
-        BodyComponent? body = null ,
-        bool deleteItems = false,
+        BodyComponent? body = null,
         bool launchGibs = true,
         Vector2? splatDirection = null,
         float splatModifier = 1,