Revert "Revert "Ed 09 06 2024 upstream (#230)" (#233)"

This reverts commit b89117f8e6.
2024-06-11 15:19:52 +03:00
parent b89117f8e6
commit bb3c74d557
402 changed files with 21561 additions and 11300 deletions
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
@@ -171,7 +171,8 @@ public sealed partial class TriggerSystem
        if (args.Handled || HasComp<AutomatedTimerComponent>(uid) || component.UseVerbInstead)
            return;

-        _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
+        if (component.DoPopup)
+            _popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);

        HandleTimerTrigger(
            uid,