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

Revert "Picking a ghostrole as an admin will now deadmin you. (#29790)" (#29901)

Browse Source 
This reverts commit 1a50760e67.
This commit is contained in:
metalgearsloth
2024-07-11 17:04:10 +10:00
committed by GitHub
parent e6f55fafb4
commit 03f0257ae9
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Ghost/Roles/GhostRoleSystem.cs
View File

@@ -31,9 +31,6 @@ using Robust.Shared.Utility;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using Robust.Shared.Collections; using Robust.Shared.Collections;
using Content.Server.Administration.Managers;
using Content.Shared.CCVar;
using Robust.Shared.Configuration;
namespace Content.Server.Ghost.Roles namespace Content.Server.Ghost.Roles
{ {
@@ -51,8 +48,6 @@ namespace Content.Server.Ghost.Roles
[Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IAdminManager _adminManager = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
private uint _nextRoleIdentifier; private uint _nextRoleIdentifier;
private bool _needsUpdateGhostRoleCount = true; private bool _needsUpdateGhostRoleCount = true;
@@ -592,14 +587,6 @@ namespace Content.Server.Ghost.Roles
// forced into a ghost role. // forced into a ghost role.
LeaveAllRaffles(message.Player); LeaveAllRaffles(message.Player);
CloseEui(message.Player); CloseEui(message.Player);
// The player is no longer a ghost, so they should not be adminned anymore. Deadmin them.
// Ensures that admins do not forget to deadmin themselves upon entering a ghost role.
var autoDeAdmin = _cfg.GetCVar(CCVars.AdminDeadminOnJoin);
if (autoDeAdmin && _adminManager.IsAdmin(message.Entity))
{
_adminManager.DeAdmin(message.Player);
}
} }
private void OnMindAdded(EntityUid uid, GhostTakeoverAvailableComponent component, MindAddedMessage args) private void OnMindAdded(EntityUid uid, GhostTakeoverAvailableComponent component, MindAddedMessage args)

2
Content.Shared/CCVar/CCVars.cs
View File

@@ -870,7 +870,7 @@ namespace Content.Shared.CCVar
CVarDef.Create("admin.show_pii_onban", false, CVar.SERVERONLY); CVarDef.Create("admin.show_pii_onban", false, CVar.SERVERONLY);
/// <summary> /// <summary>
/// If an admin joins a round by readying up or using the late join button, automatically /// If an admin joins a round by reading up or using the late join button, automatically
/// de-admin them. /// de-admin them.
/// </summary> /// </summary>
public static readonly CVarDef<bool> AdminDeadminOnJoin = public static readonly CVarDef<bool> AdminDeadminOnJoin =