Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Picking a ghostrole as an admin will now deadmin you

Browse Source
This commit is contained in:
Jabak
2024-07-29 18:36:09 +03:00
parent 899436a1da
commit 895cbab0f0
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
using Content.Server._Miracle.GulagSystem; using Content.Server._Miracle.GulagSystem;
using System.Linq; using System.Linq;
using Content.Server.Administration.Logs; using Content.Server.Administration.Logs;
using Content.Server.Administration.Managers;
using Content.Server.EUI; using Content.Server.EUI;
using Content.Server.Ghost.Roles.Components; using Content.Server.Ghost.Roles.Components;
using Content.Server.Ghost.Roles.Events; using Content.Server.Ghost.Roles.Events;
@@ -10,6 +11,7 @@ using Content.Server.Ghost.Roles.UI;
using Content.Server.Mind.Commands; using Content.Server.Mind.Commands;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Shared.Administration; using Content.Shared.Administration;
using Content.Shared.CCVar;
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.Follower; using Content.Shared.Follower;
using Content.Shared.GameTicking; using Content.Shared.GameTicking;
@@ -23,6 +25,7 @@ using Content.Shared.Roles;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Configuration;
using Robust.Shared.Console; using Robust.Shared.Console;
using Robust.Shared.Enums; using Robust.Shared.Enums;
using Robust.Shared.Player; using Robust.Shared.Player;
@@ -48,6 +51,8 @@ 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;
@@ -595,6 +600,14 @@ 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)