]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Remove redundant admin flag check in AdminVerbSystem.Tools (#36122)
authorTayrtahn <tayrtahn@gmail.com>
Fri, 18 Apr 2025 20:06:27 +0000 (16:06 -0400)
committerGitHub <noreply@github.com>
Fri, 18 Apr 2025 20:06:27 +0000 (22:06 +0200)
* Remove redundant admin flag check

* Formatting

Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs

index f598c8cf0b1f30cf3fedf8e0f0b40e2562582d24..8b0a24d9029f670e30d000c08bbdee1768cff649 100644 (file)
@@ -65,343 +65,340 @@ public sealed partial class AdminVerbSystem
         if (!_adminManager.HasAdminFlag(player, AdminFlags.Admin))
             return;
 
-        if (_adminManager.HasAdminFlag(player, AdminFlags.Admin))
+        if (TryComp<DoorBoltComponent>(args.Target, out var bolts))
         {
-            if (TryComp<DoorBoltComponent>(args.Target, out var bolts))
+            Verb bolt = new()
             {
-                Verb bolt = new()
+                Text = bolts.BoltsDown ? "Unbolt" : "Bolt",
+                Category = VerbCategory.Tricks,
+                Icon = bolts.BoltsDown
+                    ? new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/unbolt.png"))
+                    : new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/bolt.png")),
+                Act = () =>
                 {
-                    Text = bolts.BoltsDown ? "Unbolt" : "Bolt",
-                    Category = VerbCategory.Tricks,
-                    Icon = bolts.BoltsDown
-                        ? new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/unbolt.png"))
-                        : new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/bolt.png")),
-                    Act = () =>
-                    {
-                        _door.SetBoltsDown((args.Target, bolts), !bolts.BoltsDown);
-                    },
-                    Impact = LogImpact.Medium,
-                    Message = Loc.GetString(bolts.BoltsDown
-                        ? "admin-trick-unbolt-description"
-                        : "admin-trick-bolt-description"),
-                    Priority = (int) (bolts.BoltsDown ? TricksVerbPriorities.Unbolt : TricksVerbPriorities.Bolt),
-                };
-                args.Verbs.Add(bolt);
-            }
+                    _door.SetBoltsDown((args.Target, bolts), !bolts.BoltsDown);
+                },
+                Impact = LogImpact.Medium,
+                Message = Loc.GetString(bolts.BoltsDown
+                    ? "admin-trick-unbolt-description"
+                    : "admin-trick-bolt-description"),
+                Priority = (int)(bolts.BoltsDown ? TricksVerbPriorities.Unbolt : TricksVerbPriorities.Bolt),
+            };
+            args.Verbs.Add(bolt);
+        }
 
-            if (TryComp<AirlockComponent>(args.Target, out var airlockComp))
+        if (TryComp<AirlockComponent>(args.Target, out var airlockComp))
+        {
+            Verb emergencyAccess = new()
             {
-                Verb emergencyAccess = new()
+                Text = airlockComp.EmergencyAccess ? "Emergency Access Off" : "Emergency Access On",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/emergency_access.png")),
+                Act = () =>
                 {
-                    Text = airlockComp.EmergencyAccess ? "Emergency Access Off" : "Emergency Access On",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/emergency_access.png")),
-                    Act = () =>
-                    {
-                        _airlockSystem.SetEmergencyAccess((args.Target, airlockComp), !airlockComp.EmergencyAccess);
-                    },
-                    Impact = LogImpact.Medium,
-                    Message = Loc.GetString(airlockComp.EmergencyAccess
-                        ? "admin-trick-emergency-access-off-description"
-                        : "admin-trick-emergency-access-on-description"),
-                    Priority = (int) (airlockComp.EmergencyAccess ? TricksVerbPriorities.EmergencyAccessOff : TricksVerbPriorities.EmergencyAccessOn),
-                };
-                args.Verbs.Add(emergencyAccess);
-            }
+                    _airlockSystem.SetEmergencyAccess((args.Target, airlockComp), !airlockComp.EmergencyAccess);
+                },
+                Impact = LogImpact.Medium,
+                Message = Loc.GetString(airlockComp.EmergencyAccess
+                    ? "admin-trick-emergency-access-off-description"
+                    : "admin-trick-emergency-access-on-description"),
+                Priority = (int)(airlockComp.EmergencyAccess ? TricksVerbPriorities.EmergencyAccessOff : TricksVerbPriorities.EmergencyAccessOn),
+            };
+            args.Verbs.Add(emergencyAccess);
+        }
 
-            if (HasComp<DamageableComponent>(args.Target))
+        if (HasComp<DamageableComponent>(args.Target))
+        {
+            Verb rejuvenate = new()
             {
-                Verb rejuvenate = new()
+                Text = "Rejuvenate",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rejuvenate.png")),
+                Act = () =>
                 {
-                    Text = "Rejuvenate",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/rejuvenate.png")),
-                    Act = () =>
-                    {
-                        _rejuvenate.PerformRejuvenate(args.Target);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-rejuvenate-description"),
-                    Priority = (int) TricksVerbPriorities.Rejuvenate,
-                };
-                args.Verbs.Add(rejuvenate);
-            }
+                    _rejuvenate.PerformRejuvenate(args.Target);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-rejuvenate-description"),
+                Priority = (int)TricksVerbPriorities.Rejuvenate,
+            };
+            args.Verbs.Add(rejuvenate);
+        }
 
-            if (!HasComp<GodmodeComponent>(args.Target))
+        if (!HasComp<GodmodeComponent>(args.Target))
+        {
+            Verb makeIndestructible = new()
             {
-                Verb makeIndestructible = new()
+                Text = "Make Indestructible",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
+                Act = () =>
                 {
-                    Text = "Make Indestructible",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
-                    Act = () =>
-                    {
-                        _sharedGodmodeSystem.EnableGodmode(args.Target);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-make-indestructible-description"),
-                    Priority = (int) TricksVerbPriorities.MakeIndestructible,
-                };
-                args.Verbs.Add(makeIndestructible);
-            }
-            else
+                    _sharedGodmodeSystem.EnableGodmode(args.Target);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-make-indestructible-description"),
+                Priority = (int)TricksVerbPriorities.MakeIndestructible,
+            };
+            args.Verbs.Add(makeIndestructible);
+        }
+        else
+        {
+            Verb makeVulnerable = new()
             {
-                Verb makeVulnerable = new()
+                Text = "Make Vulnerable",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
+                Act = () =>
                 {
-                    Text = "Make Vulnerable",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/plus.svg.192dpi.png")),
-                    Act = () =>
-                    {
-                        _sharedGodmodeSystem.DisableGodmode(args.Target);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-make-vulnerable-description"),
-                    Priority = (int) TricksVerbPriorities.MakeVulnerable,
-                };
-                args.Verbs.Add(makeVulnerable);
-            }
+                    _sharedGodmodeSystem.DisableGodmode(args.Target);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-make-vulnerable-description"),
+                Priority = (int)TricksVerbPriorities.MakeVulnerable,
+            };
+            args.Verbs.Add(makeVulnerable);
+        }
 
-            if (TryComp<BatteryComponent>(args.Target, out var battery))
+        if (TryComp<BatteryComponent>(args.Target, out var battery))
+        {
+            Verb refillBattery = new()
             {
-                Verb refillBattery = new()
-                {
-                    Text = "Refill Battery",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
-                    Act = () =>
-                    {
-                        _batterySystem.SetCharge(args.Target, battery.MaxCharge, battery);
-                    },
-                    Impact = LogImpact.Medium,
-                    Message = Loc.GetString("admin-trick-refill-battery-description"),
-                    Priority = (int) TricksVerbPriorities.RefillBattery,
-                };
-                args.Verbs.Add(refillBattery);
-
-                Verb drainBattery = new()
+                Text = "Refill Battery",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/fill_battery.png")),
+                Act = () =>
                 {
-                    Text = "Drain Battery",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
-                    Act = () =>
-                    {
-                        _batterySystem.SetCharge(args.Target, 0, battery);
-                    },
-                    Impact = LogImpact.Medium,
-                    Message = Loc.GetString("admin-trick-drain-battery-description"),
-                    Priority = (int) TricksVerbPriorities.DrainBattery,
-                };
-                args.Verbs.Add(drainBattery);
+                    _batterySystem.SetCharge(args.Target, battery.MaxCharge, battery);
+                },
+                Impact = LogImpact.Medium,
+                Message = Loc.GetString("admin-trick-refill-battery-description"),
+                Priority = (int)TricksVerbPriorities.RefillBattery,
+            };
+            args.Verbs.Add(refillBattery);
 
-                Verb infiniteBattery = new()
+            Verb drainBattery = new()
+            {
+                Text = "Drain Battery",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/drain_battery.png")),
+                Act = () =>
                 {
-                    Text = "Infinite Battery",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
-                    Act = () =>
-                    {
-                        var recharger = EnsureComp<BatterySelfRechargerComponent>(args.Target);
-                        recharger.AutoRecharge = true;
-                        recharger.AutoRechargeRate = battery.MaxCharge; // Instant refill.
-                        recharger.AutoRechargePause = false; // No delay.
-                    },
-                    Impact = LogImpact.Medium,
-                    Message = Loc.GetString("admin-trick-infinite-battery-object-description"),
-                    Priority = (int) TricksVerbPriorities.InfiniteBattery,
-                };
-                args.Verbs.Add(infiniteBattery);
-            }
+                    _batterySystem.SetCharge(args.Target, 0, battery);
+                },
+                Impact = LogImpact.Medium,
+                Message = Loc.GetString("admin-trick-drain-battery-description"),
+                Priority = (int)TricksVerbPriorities.DrainBattery,
+            };
+            args.Verbs.Add(drainBattery);
 
-            if (TryComp<AnchorableComponent>(args.Target, out var anchor))
+            Verb infiniteBattery = new()
             {
-                Verb blockUnanchor = new()
+                Text = "Infinite Battery",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/infinite_battery.png")),
+                Act = () =>
                 {
-                    Text = "Block Unanchoring",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/anchor.svg.192dpi.png")),
-                    Act = () =>
-                    {
-                        RemComp(args.Target, anchor);
-                    },
-                    Impact = LogImpact.Medium,
-                    Message = Loc.GetString("admin-trick-block-unanchoring-description"),
-                    Priority = (int) TricksVerbPriorities.BlockUnanchoring,
-                };
-                args.Verbs.Add(blockUnanchor);
-            }
+                    var recharger = EnsureComp<BatterySelfRechargerComponent>(args.Target);
+                    recharger.AutoRecharge = true;
+                    recharger.AutoRechargeRate = battery.MaxCharge; // Instant refill.
+                    recharger.AutoRechargePause = false; // No delay.
+                },
+                Impact = LogImpact.Medium,
+                Message = Loc.GetString("admin-trick-infinite-battery-object-description"),
+                Priority = (int)TricksVerbPriorities.InfiniteBattery,
+            };
+            args.Verbs.Add(infiniteBattery);
+        }
 
-            if (TryComp<GasTankComponent>(args.Target, out var tank))
+        if (TryComp<AnchorableComponent>(args.Target, out var anchor))
+        {
+            Verb blockUnanchor = new()
             {
-                Verb refillInternalsO2 = new()
+                Text = "Block Unanchoring",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/anchor.svg.192dpi.png")),
+                Act = () =>
                 {
-                    Text = "Refill Internals Oxygen",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
-                    Act = () =>
-                    {
-                        RefillGasTank(args.Target, Gas.Oxygen, tank);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-internals-refill-oxygen-description"),
-                    Priority = (int) TricksVerbPriorities.RefillOxygen,
-                };
-                args.Verbs.Add(refillInternalsO2);
+                    RemComp(args.Target, anchor);
+                },
+                Impact = LogImpact.Medium,
+                Message = Loc.GetString("admin-trick-block-unanchoring-description"),
+                Priority = (int)TricksVerbPriorities.BlockUnanchoring,
+            };
+            args.Verbs.Add(blockUnanchor);
+        }
 
-                Verb refillInternalsN2 = new()
+        if (TryComp<GasTankComponent>(args.Target, out var tank))
+        {
+            Verb refillInternalsO2 = new()
+            {
+                Text = "Refill Internals Oxygen",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
+                Act = () =>
                 {
-                    Text = "Refill Internals Nitrogen",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
-                    Act = () =>
-                    {
-                        RefillGasTank(args.Target, Gas.Nitrogen, tank);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-internals-refill-nitrogen-description"),
-                    Priority = (int) TricksVerbPriorities.RefillNitrogen,
-                };
-                args.Verbs.Add(refillInternalsN2);
+                    RefillGasTank(args.Target, Gas.Oxygen, tank);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-internals-refill-oxygen-description"),
+                Priority = (int)TricksVerbPriorities.RefillOxygen,
+            };
+            args.Verbs.Add(refillInternalsO2);
 
-                Verb refillInternalsPlasma = new()
+            Verb refillInternalsN2 = new()
+            {
+                Text = "Refill Internals Nitrogen",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
+                Act = () =>
                 {
-                    Text = "Refill Internals Plasma",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
-                    Act = () =>
-                    {
-                        RefillGasTank(args.Target, Gas.Plasma, tank);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-internals-refill-plasma-description"),
-                    Priority = (int) TricksVerbPriorities.RefillPlasma,
-                };
-                args.Verbs.Add(refillInternalsPlasma);
-            }
+                    RefillGasTank(args.Target, Gas.Nitrogen, tank);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-internals-refill-nitrogen-description"),
+                Priority = (int)TricksVerbPriorities.RefillNitrogen,
+            };
+            args.Verbs.Add(refillInternalsN2);
 
-            if (HasComp<InventoryComponent>(args.Target))
+            Verb refillInternalsPlasma = new()
             {
-                Verb refillInternalsO2 = new()
+                Text = "Refill Internals Plasma",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
+                Act = () =>
                 {
-                    Text = "Refill Internals Oxygen",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
-                    Act = () => RefillEquippedTanks(args.User, Gas.Oxygen),
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-internals-refill-oxygen-description"),
-                    Priority = (int) TricksVerbPriorities.RefillOxygen,
-                };
-                args.Verbs.Add(refillInternalsO2);
+                    RefillGasTank(args.Target, Gas.Plasma, tank);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-internals-refill-plasma-description"),
+                Priority = (int)TricksVerbPriorities.RefillPlasma,
+            };
+            args.Verbs.Add(refillInternalsPlasma);
+        }
 
-                Verb refillInternalsN2 = new()
-                {
-                    Text = "Refill Internals Nitrogen",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
-                    Act = () =>RefillEquippedTanks(args.User, Gas.Nitrogen),
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-internals-refill-nitrogen-description"),
-                    Priority = (int) TricksVerbPriorities.RefillNitrogen,
-                };
-                args.Verbs.Add(refillInternalsN2);
+        if (HasComp<InventoryComponent>(args.Target))
+        {
+            Verb refillInternalsO2 = new()
+            {
+                Text = "Refill Internals Oxygen",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/oxygen.rsi"), "icon"),
+                Act = () => RefillEquippedTanks(args.User, Gas.Oxygen),
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-internals-refill-oxygen-description"),
+                Priority = (int)TricksVerbPriorities.RefillOxygen,
+            };
+            args.Verbs.Add(refillInternalsO2);
 
-                Verb refillInternalsPlasma = new()
-                {
-                    Text = "Refill Internals Plasma",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
-                    Act = () => RefillEquippedTanks(args.User, Gas.Plasma),
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-internals-refill-plasma-description"),
-                    Priority = (int) TricksVerbPriorities.RefillPlasma,
-                };
-                args.Verbs.Add(refillInternalsPlasma);
-            }
+            Verb refillInternalsN2 = new()
+            {
+                Text = "Refill Internals Nitrogen",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
+                Act = () => RefillEquippedTanks(args.User, Gas.Nitrogen),
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-internals-refill-nitrogen-description"),
+                Priority = (int)TricksVerbPriorities.RefillNitrogen,
+            };
+            args.Verbs.Add(refillInternalsN2);
 
-            Verb sendToTestArena = new()
+            Verb refillInternalsPlasma = new()
             {
-                Text = "Send to test arena",
+                Text = "Refill Internals Plasma",
                 Category = VerbCategory.Tricks,
-                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")),
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/plasma.rsi"), "icon"),
+                Act = () => RefillEquippedTanks(args.User, Gas.Plasma),
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-internals-refill-plasma-description"),
+                Priority = (int)TricksVerbPriorities.RefillPlasma,
+            };
+            args.Verbs.Add(refillInternalsPlasma);
+        }
+
+        Verb sendToTestArena = new()
+        {
+            Text = "Send to test arena",
+            Category = VerbCategory.Tricks,
+            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")),
+
+            Act = () =>
+            {
+                var (mapUid, gridUid) = _adminTestArenaSystem.AssertArenaLoaded(player);
+                _transformSystem.SetCoordinates(args.Target, new EntityCoordinates(gridUid ?? mapUid, Vector2.One));
+            },
+            Impact = LogImpact.Medium,
+            Message = Loc.GetString("admin-trick-send-to-test-arena-description"),
+            Priority = (int)TricksVerbPriorities.SendToTestArena,
+        };
+        args.Verbs.Add(sendToTestArena);
+
+        var activeId = FindActiveId(args.Target);
 
+        if (activeId is not null)
+        {
+            Verb grantAllAccess = new()
+            {
+                Text = "Grant All Access",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
                 Act = () =>
                 {
-                    var (mapUid, gridUid) = _adminTestArenaSystem.AssertArenaLoaded(player);
-                    _transformSystem.SetCoordinates(args.Target, new EntityCoordinates(gridUid ?? mapUid, Vector2.One));
+                    GiveAllAccess(activeId.Value);
                 },
-                Impact = LogImpact.Medium,
-                Message = Loc.GetString("admin-trick-send-to-test-arena-description"),
-                Priority = (int) TricksVerbPriorities.SendToTestArena,
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-grant-all-access-description"),
+                Priority = (int)TricksVerbPriorities.GrantAllAccess,
             };
-            args.Verbs.Add(sendToTestArena);
-
-            var activeId = FindActiveId(args.Target);
+            args.Verbs.Add(grantAllAccess);
 
-            if (activeId is not null)
+            Verb revokeAllAccess = new()
             {
-                Verb grantAllAccess = new()
-                {
-                    Text = "Grant All Access",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
-                    Act = () =>
-                    {
-                        GiveAllAccess(activeId.Value);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-grant-all-access-description"),
-                    Priority = (int) TricksVerbPriorities.GrantAllAccess,
-                };
-                args.Verbs.Add(grantAllAccess);
-
-                Verb revokeAllAccess = new()
+                Text = "Revoke All Access",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
+                Act = () =>
                 {
-                    Text = "Revoke All Access",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
-                    Act = () =>
-                    {
-                        RevokeAllAccess(activeId.Value);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-revoke-all-access-description"),
-                    Priority = (int) TricksVerbPriorities.RevokeAllAccess,
-                };
-                args.Verbs.Add(revokeAllAccess);
-            }
+                    RevokeAllAccess(activeId.Value);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-revoke-all-access-description"),
+                Priority = (int)TricksVerbPriorities.RevokeAllAccess,
+            };
+            args.Verbs.Add(revokeAllAccess);
+        }
 
-            if (HasComp<AccessComponent>(args.Target))
+        if (HasComp<AccessComponent>(args.Target))
+        {
+            Verb grantAllAccess = new()
             {
-                Verb grantAllAccess = new()
+                Text = "Grant All Access",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
+                Act = () =>
                 {
-                    Text = "Grant All Access",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "centcom"),
-                    Act = () =>
-                    {
-                        GiveAllAccess(args.Target);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-grant-all-access-description"),
-                    Priority = (int) TricksVerbPriorities.GrantAllAccess,
-                };
-                args.Verbs.Add(grantAllAccess);
+                    GiveAllAccess(args.Target);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-grant-all-access-description"),
+                Priority = (int)TricksVerbPriorities.GrantAllAccess,
+            };
+            args.Verbs.Add(grantAllAccess);
 
-                Verb revokeAllAccess = new()
+            Verb revokeAllAccess = new()
+            {
+                Text = "Revoke All Access",
+                Category = VerbCategory.Tricks,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
+                Act = () =>
                 {
-                    Text = "Revoke All Access",
-                    Category = VerbCategory.Tricks,
-                    Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Misc/id_cards.rsi"), "default"),
-                    Act = () =>
-                    {
-                        RevokeAllAccess(args.Target);
-                    },
-                    Impact = LogImpact.Extreme,
-                    Message = Loc.GetString("admin-trick-revoke-all-access-description"),
-                    Priority = (int) TricksVerbPriorities.RevokeAllAccess,
-                };
-                args.Verbs.Add(revokeAllAccess);
-            }
+                    RevokeAllAccess(args.Target);
+                },
+                Impact = LogImpact.Extreme,
+                Message = Loc.GetString("admin-trick-revoke-all-access-description"),
+                Priority = (int)TricksVerbPriorities.RevokeAllAccess,
+            };
+            args.Verbs.Add(revokeAllAccess);
         }
 
         if (TryComp<StackComponent>(args.Target, out var stack))