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

Only disable panicbunker for admins with AdminFlags.Admin (#33879)

Browse Source 
* Only disable panicbunker for admins with AdminFlags.Admin

* nicer curly braces
This commit is contained in:
slarticodefast
2024-12-18 14:15:04 +01:00
committed by GitHub
parent 6b99493e80
commit e7294bdf4f
4 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Administration/AdminData.cs
View File

@@ -31,10 +31,11 @@ namespace Content.Shared.Administration
/// Checks whether this admin has an admin flag.
/// </summary>
/// <param name="flag">The flags to check. Multiple flags can be specified, they must all be held.</param>
/// <param name="includeDeAdmin">If true then also count flags even if the admin has de-adminned.</param>
/// <returns>False if this admin is not <see cref="Active"/> or does not have all the flags specified.</returns>
public bool HasFlag(AdminFlags flag)
public bool HasFlag(AdminFlags flag, bool includeDeAdmin = false)
{
return Active && (Flags & flag) == flag;
return (includeDeAdmin || Active) && (Flags & flag) == flag;
}
/// <summary>