Modular landmines (#8351)

2022-06-01 01:39:06 -07:00
parent 19778cc664
commit da07d91895
14 changed files with 190 additions and 28 deletions
--- a/Content.Server/LandMines/LandMineSystem.cs
+++ b/Content.Server/LandMines/LandMineSystem.cs
@@ -27,14 +27,16 @@ public sealed class LandMineSystem : EntitySystem

    private void HandleTriggered(EntityUid uid, LandMineComponent component, ref StepTriggeredEvent args)
    {
-        _popupSystem.PopupCoordinates(
-            Loc.GetString("land-mine-triggered", ("mine", uid)),
-            Transform(uid).Coordinates,
-            Filter.Entities(args.Tripper));
+        if (_trigger.Trigger(uid, args.Tripper))
+        {
+            _popupSystem.PopupCoordinates(
+                Loc.GetString("land-mine-triggered", ("mine", uid)),
+                Transform(uid).Coordinates,
+                Filter.Entities(args.Tripper));
+        }

-        _trigger.Trigger(uid, args.Tripper);
-
-        QueueDel(uid);
+        if (component.DeleteOnActivate)
+            QueueDel(uid);
    }
 }