tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant admin flag check in AdminVerbSystem.Tools (#36122)

Browse Source 
* Remove redundant admin flag check

* Formatting
This commit is contained in:
Tayrtahn
2025-04-18 16:06:27 -04:00
committed by GitHub
parent 9a05bf138d
commit 69f8fe393f
1 changed files with 318 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
View File

@@ -65,8 +65,6 @@ public sealed partial class AdminVerbSystem
if (!_adminManager.HasAdminFlag(player, AdminFlags.Admin)) if (!_adminManager.HasAdminFlag(player, AdminFlags.Admin))
return; 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()
@@ -84,7 +82,7 @@ public sealed partial class AdminVerbSystem
Message = Loc.GetString(bolts.BoltsDown Message = Loc.GetString(bolts.BoltsDown
? "admin-trick-unbolt-description" ? "admin-trick-unbolt-description"
: "admin-trick-bolt-description"), : "admin-trick-bolt-description"),
Priority = (int) (bolts.BoltsDown ? TricksVerbPriorities.Unbolt : TricksVerbPriorities.Bolt), Priority = (int)(bolts.BoltsDown ? TricksVerbPriorities.Unbolt : TricksVerbPriorities.Bolt),
}; };
args.Verbs.Add(bolt); args.Verbs.Add(bolt);
} }
@@ -104,7 +102,7 @@ public sealed partial class AdminVerbSystem
Message = Loc.GetString(airlockComp.EmergencyAccess Message = Loc.GetString(airlockComp.EmergencyAccess
? "admin-trick-emergency-access-off-description" ? "admin-trick-emergency-access-off-description"
: "admin-trick-emergency-access-on-description"), : "admin-trick-emergency-access-on-description"),
Priority = (int) (airlockComp.EmergencyAccess ? TricksVerbPriorities.EmergencyAccessOff : TricksVerbPriorities.EmergencyAccessOn), Priority = (int)(airlockComp.EmergencyAccess ? TricksVerbPriorities.EmergencyAccessOff : TricksVerbPriorities.EmergencyAccessOn),
}; };
args.Verbs.Add(emergencyAccess); args.Verbs.Add(emergencyAccess);
} }
@@ -122,7 +120,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-rejuvenate-description"), Message = Loc.GetString("admin-trick-rejuvenate-description"),
Priority = (int) TricksVerbPriorities.Rejuvenate, Priority = (int)TricksVerbPriorities.Rejuvenate,
}; };
args.Verbs.Add(rejuvenate); args.Verbs.Add(rejuvenate);
} }
@@ -140,7 +138,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-make-indestructible-description"), Message = Loc.GetString("admin-trick-make-indestructible-description"),
Priority = (int) TricksVerbPriorities.MakeIndestructible, Priority = (int)TricksVerbPriorities.MakeIndestructible,
}; };
args.Verbs.Add(makeIndestructible); args.Verbs.Add(makeIndestructible);
} }
@@ -157,7 +155,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-make-vulnerable-description"), Message = Loc.GetString("admin-trick-make-vulnerable-description"),
Priority = (int) TricksVerbPriorities.MakeVulnerable, Priority = (int)TricksVerbPriorities.MakeVulnerable,
}; };
args.Verbs.Add(makeVulnerable); args.Verbs.Add(makeVulnerable);
} }
@@ -175,7 +173,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Medium, Impact = LogImpact.Medium,
Message = Loc.GetString("admin-trick-refill-battery-description"), Message = Loc.GetString("admin-trick-refill-battery-description"),
Priority = (int) TricksVerbPriorities.RefillBattery, Priority = (int)TricksVerbPriorities.RefillBattery,
}; };
args.Verbs.Add(refillBattery); args.Verbs.Add(refillBattery);
@@ -190,7 +188,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Medium, Impact = LogImpact.Medium,
Message = Loc.GetString("admin-trick-drain-battery-description"), Message = Loc.GetString("admin-trick-drain-battery-description"),
Priority = (int) TricksVerbPriorities.DrainBattery, Priority = (int)TricksVerbPriorities.DrainBattery,
}; };
args.Verbs.Add(drainBattery); args.Verbs.Add(drainBattery);
@@ -208,7 +206,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Medium, Impact = LogImpact.Medium,
Message = Loc.GetString("admin-trick-infinite-battery-object-description"), Message = Loc.GetString("admin-trick-infinite-battery-object-description"),
Priority = (int) TricksVerbPriorities.InfiniteBattery, Priority = (int)TricksVerbPriorities.InfiniteBattery,
}; };
args.Verbs.Add(infiniteBattery); args.Verbs.Add(infiniteBattery);
} }
@@ -226,7 +224,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Medium, Impact = LogImpact.Medium,
Message = Loc.GetString("admin-trick-block-unanchoring-description"), Message = Loc.GetString("admin-trick-block-unanchoring-description"),
Priority = (int) TricksVerbPriorities.BlockUnanchoring, Priority = (int)TricksVerbPriorities.BlockUnanchoring,
}; };
args.Verbs.Add(blockUnanchor); args.Verbs.Add(blockUnanchor);
} }
@@ -244,7 +242,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-internals-refill-oxygen-description"), Message = Loc.GetString("admin-trick-internals-refill-oxygen-description"),
Priority = (int) TricksVerbPriorities.RefillOxygen, Priority = (int)TricksVerbPriorities.RefillOxygen,
}; };
args.Verbs.Add(refillInternalsO2); args.Verbs.Add(refillInternalsO2);
@@ -259,7 +257,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-internals-refill-nitrogen-description"), Message = Loc.GetString("admin-trick-internals-refill-nitrogen-description"),
Priority = (int) TricksVerbPriorities.RefillNitrogen, Priority = (int)TricksVerbPriorities.RefillNitrogen,
}; };
args.Verbs.Add(refillInternalsN2); args.Verbs.Add(refillInternalsN2);
@@ -274,7 +272,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-internals-refill-plasma-description"), Message = Loc.GetString("admin-trick-internals-refill-plasma-description"),
Priority = (int) TricksVerbPriorities.RefillPlasma, Priority = (int)TricksVerbPriorities.RefillPlasma,
}; };
args.Verbs.Add(refillInternalsPlasma); args.Verbs.Add(refillInternalsPlasma);
} }
@@ -289,7 +287,7 @@ public sealed partial class AdminVerbSystem
Act = () => RefillEquippedTanks(args.User, Gas.Oxygen), Act = () => RefillEquippedTanks(args.User, Gas.Oxygen),
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-internals-refill-oxygen-description"), Message = Loc.GetString("admin-trick-internals-refill-oxygen-description"),
Priority = (int) TricksVerbPriorities.RefillOxygen, Priority = (int)TricksVerbPriorities.RefillOxygen,
}; };
args.Verbs.Add(refillInternalsO2); args.Verbs.Add(refillInternalsO2);
@@ -298,10 +296,10 @@ public sealed partial class AdminVerbSystem
Text = "Refill Internals Nitrogen", Text = "Refill Internals Nitrogen",
Category = VerbCategory.Tricks, Category = VerbCategory.Tricks,
Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"), Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Tanks/red.rsi"), "icon"),
Act = () =>RefillEquippedTanks(args.User, Gas.Nitrogen), Act = () => RefillEquippedTanks(args.User, Gas.Nitrogen),
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-internals-refill-nitrogen-description"), Message = Loc.GetString("admin-trick-internals-refill-nitrogen-description"),
Priority = (int) TricksVerbPriorities.RefillNitrogen, Priority = (int)TricksVerbPriorities.RefillNitrogen,
}; };
args.Verbs.Add(refillInternalsN2); args.Verbs.Add(refillInternalsN2);
@@ -313,7 +311,7 @@ public sealed partial class AdminVerbSystem
Act = () => RefillEquippedTanks(args.User, Gas.Plasma), Act = () => RefillEquippedTanks(args.User, Gas.Plasma),
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-internals-refill-plasma-description"), Message = Loc.GetString("admin-trick-internals-refill-plasma-description"),
Priority = (int) TricksVerbPriorities.RefillPlasma, Priority = (int)TricksVerbPriorities.RefillPlasma,
}; };
args.Verbs.Add(refillInternalsPlasma); args.Verbs.Add(refillInternalsPlasma);
} }
@@ -331,7 +329,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Medium, Impact = LogImpact.Medium,
Message = Loc.GetString("admin-trick-send-to-test-arena-description"), Message = Loc.GetString("admin-trick-send-to-test-arena-description"),
Priority = (int) TricksVerbPriorities.SendToTestArena, Priority = (int)TricksVerbPriorities.SendToTestArena,
}; };
args.Verbs.Add(sendToTestArena); args.Verbs.Add(sendToTestArena);
@@ -350,7 +348,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-grant-all-access-description"), Message = Loc.GetString("admin-trick-grant-all-access-description"),
Priority = (int) TricksVerbPriorities.GrantAllAccess, Priority = (int)TricksVerbPriorities.GrantAllAccess,
}; };
args.Verbs.Add(grantAllAccess); args.Verbs.Add(grantAllAccess);
@@ -365,7 +363,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-revoke-all-access-description"), Message = Loc.GetString("admin-trick-revoke-all-access-description"),
Priority = (int) TricksVerbPriorities.RevokeAllAccess, Priority = (int)TricksVerbPriorities.RevokeAllAccess,
}; };
args.Verbs.Add(revokeAllAccess); args.Verbs.Add(revokeAllAccess);
} }
@@ -383,7 +381,7 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-grant-all-access-description"), Message = Loc.GetString("admin-trick-grant-all-access-description"),
Priority = (int) TricksVerbPriorities.GrantAllAccess, Priority = (int)TricksVerbPriorities.GrantAllAccess,
}; };
args.Verbs.Add(grantAllAccess); args.Verbs.Add(grantAllAccess);
@@ -398,11 +396,10 @@ public sealed partial class AdminVerbSystem
}, },
Impact = LogImpact.Extreme, Impact = LogImpact.Extreme,
Message = Loc.GetString("admin-trick-revoke-all-access-description"), Message = Loc.GetString("admin-trick-revoke-all-access-description"),
Priority = (int) TricksVerbPriorities.RevokeAllAccess, Priority = (int)TricksVerbPriorities.RevokeAllAccess,
}; };
args.Verbs.Add(revokeAllAccess); args.Verbs.Add(revokeAllAccess);
} }
}
if (TryComp<StackComponent>(args.Target, out var stack)) if (TryComp<StackComponent>(args.Target, out var stack))
{ {