Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)

* Add BreakOnDropItem, update do afters, remove unnecessary declarations * bola * Changed my mind about the nuke * gennies too * Make the comments more clear. * Sorry for the trailing commas * Revert "Sorry for the trailing commas" This reverts commit e60fd9a30977393df3344948e6d5c0ce035723cd. --------- Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-08 04:39:46 -07:00
parent bd51cf330b
commit 190ceda02e
29 changed files with 74 additions and 68 deletions
--- a/Content.Server/Botany/Systems/BotanySwabSystem.cs
+++ b/Content.Server/Botany/Systems/BotanySwabSystem.cs
@@ -48,7 +48,7 @@ public sealed class BotanySwabSystem : EntitySystem
        {
            Broadcast = true,
            BreakOnMove = true,
-            NeedHand = true
+            NeedHand = true,
        });
    }

--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -287,7 +287,7 @@ namespace Content.Server.Construction
                        {
                            BreakOnDamage = false,
                            BreakOnMove = true,
-                            NeedHand = true
+                            NeedHand = true,
                        };

                        var started  = _doAfterSystem.TryStartDoAfter(doAfterEventArgs);
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -488,7 +488,7 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
        {
            BreakOnDamage = true,
            BreakOnMove = true,
-            NeedHand = false
+            NeedHand = false,
        };

        _doAfterSystem.TryStartDoAfter(doAfterArgs);
--- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
+++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs
@@ -128,7 +128,7 @@ public sealed partial class EnsnareableSystem
    /// <param name="component">The ensnaring component</param>
    public void TryFree(EntityUid target, EntityUid user, EntityUid ensnare, EnsnaringComponent component)
    {
-        //Don't do anything if they don't have the ensnareable component.
+        // Don't do anything if they don't have the ensnareable component.
        if (!HasComp<EnsnareableComponent>(target))
            return;

@@ -140,7 +140,7 @@ public sealed partial class EnsnareableSystem
            BreakOnMove = breakOnMove,
            BreakOnDamage = false,
            NeedHand = true,
-            BlockDuplicate = true,
+            BreakOnDropItem = false,
        };

        if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -159,7 +159,6 @@ namespace Content.Server.Forensics
                var cleanDelay = cleanForensicsEntity.Comp.CleanDelay;
                var doAfterArgs = new DoAfterArgs(EntityManager, user, cleanDelay, new CleanForensicsDoAfterEvent(), cleanForensicsEntity, target: target, used: cleanForensicsEntity)
                {
-                    BreakOnHandChange = true,
                    NeedHand = true,
                    BreakOnDamage = true,
                    BreakOnMove = true,
--- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
@@ -259,7 +259,8 @@ namespace Content.Server.Kitchen.EntitySystems
            {
                BreakOnDamage = true,
                BreakOnMove = true,
-                NeedHand = true
+                NeedHand = true,
+                BreakOnDropItem = false,
            };

            _doAfter.TryStartDoAfter(doAfterArgs);
--- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs
@@ -77,7 +77,7 @@ public sealed class SharpSystem : EntitySystem
            {
                BreakOnDamage = true,
                BreakOnMove = true,
-                NeedHand = true
+                NeedHand = true,
            };
        _doAfterSystem.TryStartDoAfter(doAfter);
        return true;
--- a/Content.Server/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs
@@ -85,8 +85,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
            DistanceThreshold = SharedInteractionSystem.InteractionRange,
            BreakOnDamage = true,
            BreakOnMove = true,
-            BreakOnHandChange = false,
-            NeedHand = true
+            NeedHand = true,
        },
            out var doAfterId);

@@ -166,7 +165,6 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
        {
            BreakOnDamage = true,
            BreakOnMove = true,
-            BreakOnHandChange = false,
            NeedHand = true
        },
            out var doAfterId);
@@ -245,7 +243,6 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
        {
            DistanceThreshold = SharedInteractionSystem.InteractionRange,
            BreakOnDamage = true,
-            BreakOnHandChange = false,
            NeedHand = true
        },
            out var doAfterId);
@@ -324,8 +321,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
        {
            BreakOnDamage = true,
            BreakOnMove = true,
-            BreakOnHandChange = false,
-            NeedHand = true
+            NeedHand = true,
        },
            out var doAfterId);

--- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
+++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
@@ -169,7 +169,7 @@ namespace Content.Server.Medical.BiomassReclaimer
            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, delay, new ReclaimerDoAfterEvent(), reclaimer, target: args.Target, used: args.Used)
            {
                NeedHand = true,
-                BreakOnMove = true
+                BreakOnMove = true,
            });
        }

--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -119,8 +119,6 @@ public sealed class DefibrillatorSystem : EntitySystem
        return _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.DoAfterDuration, new DefibrillatorZapDoAfterEvent(),
            uid, target, uid)
            {
-                BlockDuplicate = true,
-                BreakOnHandChange = true,
                NeedHand = true,
                BreakOnMove = !component.AllowDoAfterMovement
            });
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -89,7 +89,7 @@ public sealed class HealthAnalyzerSystem : EntitySystem
        _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, uid.Comp.ScanDelay, new HealthAnalyzerDoAfterEvent(), uid, target: args.Target, used: uid)
        {
            NeedHand = true,
-            BreakOnMove = true
+            BreakOnMove = true,
        });

        var msg = Loc.GetString("health-analyzer-popup-scan-target", ("user", Identity.Entity(args.User, EntityManager)));
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -590,7 +590,7 @@ public sealed class NukeSystem : EntitySystem
        {
            BreakOnDamage = true,
            BreakOnMove = true,
-            NeedHand = true
+            NeedHand = true,
        };

        if (!_doAfter.TryStartDoAfter(doAfter))
--- a/Content.Server/Power/Generator/PortableGeneratorSystem.cs
+++ b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -73,8 +73,10 @@ public sealed class PortableGeneratorSystem : SharedPortableGeneratorSystem

        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.StartTime, new GeneratorStartedEvent(), uid, uid)
        {
-            BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true,
-            NeedHand = true
+            BreakOnDamage = true,
+            BreakOnMove = true,
+            NeedHand = true,
+            BreakOnDropItem = false,
        });
    }

--- a/Content.Server/Resist/ResistLockerSystem.cs
+++ b/Content.Server/Resist/ResistLockerSystem.cs
@@ -54,7 +54,7 @@ public sealed class ResistLockerSystem : EntitySystem
        {
            BreakOnMove = true,
            BreakOnDamage = true,
-            NeedHand = false //No hands 'cause we be kickin'
+            NeedHand = false, //No hands 'cause we be kickin'
        };

        resistLockerComponent.IsResisting = true;
--- a/Content.Server/SprayPainter/SprayPainterSystem.cs
+++ b/Content.Server/SprayPainter/SprayPainterSystem.cs
@@ -57,10 +57,9 @@ public sealed class SprayPainterSystem : SharedSprayPainterSystem
        {
            BreakOnMove = true,
            BreakOnDamage = true,
-            CancelDuplicate = true,
            // multiple pipes can be sprayed at once just not the same one
            DuplicateCondition = DuplicateConditions.SameTarget,
-            NeedHand = true
+            NeedHand = true,
        };

        args.Handled = DoAfter.TryStartDoAfter(doAfterEventArgs);
--- a/Content.Server/Sticky/Systems/StickySystem.cs
+++ b/Content.Server/Sticky/Systems/StickySystem.cs
@@ -95,7 +95,7 @@ public sealed class StickySystem : EntitySystem
            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new StickyDoAfterEvent(), uid, target: target, used: uid)
            {
                BreakOnMove = true,
-                NeedHand = true
+                NeedHand = true,
            });
        }
        else
@@ -149,7 +149,7 @@ public sealed class StickySystem : EntitySystem
            _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new StickyDoAfterEvent(), uid, target: uid)
            {
                BreakOnMove = true,
-                NeedHand = true
+                NeedHand = true,
            });
        }
        else