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

This reverts commit 50470c3aaa.
This commit is contained in:
Ed
2024-06-11 15:19:27 +03:00
committed by GitHub
parent 36da152d73
commit b89117f8e6
402 changed files with 11291 additions and 21552 deletions

View File

@@ -171,8 +171,7 @@ public sealed partial class TriggerSystem
if (args.Handled || HasComp<AutomatedTimerComponent>(uid) || component.UseVerbInstead)
return;
if (component.DoPopup)
_popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
_popupSystem.PopupEntity(Loc.GetString("trigger-activated", ("device", uid)), args.User, args.User);
HandleTimerTrigger(
uid,