diff --git a/Content.Server/Administration/AdminVerbSystem.cs b/Content.Server/Administration/AdminVerbSystem.cs index 42e8c75164..35ec58cdc1 100644 --- a/Content.Server/Administration/AdminVerbSystem.cs +++ b/Content.Server/Administration/AdminVerbSystem.cs @@ -85,7 +85,6 @@ namespace Content.Server.Administration // TODO VERB ICON control mob icon verb.Act = () => { - targetMind.Mind?.TransferTo(null); player.ContentData()?.Mind?.TransferTo(args.Target, ghostCheckOverride: true); }; args.Verbs.Add(verb); diff --git a/Content.Server/Administration/Commands/ControlMob.cs b/Content.Server/Administration/Commands/ControlMob.cs index 8802931b64..36cb8a4e50 100644 --- a/Content.Server/Administration/Commands/ControlMob.cs +++ b/Content.Server/Administration/Commands/ControlMob.cs @@ -60,7 +60,6 @@ namespace Content.Server.Administration.Commands DebugTools.AssertNotNull(mind); - mindComponent.Mind?.TransferTo(null); mind!.TransferTo(target); } } diff --git a/Content.Server/Mind/Mind.cs b/Content.Server/Mind/Mind.cs index 8ad457885f..e7dcf02856 100644 --- a/Content.Server/Mind/Mind.cs +++ b/Content.Server/Mind/Mind.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; +using Content.Server.GameTicking; using Content.Server.Ghost.Components; using Content.Server.Mind.Components; using Content.Server.Objectives; @@ -254,8 +255,7 @@ namespace Content.Server.Mind } else if (component.HasMind) { - // TODO: Kick them out, maybe? - throw new ArgumentException("That entity already has a mind.", nameof(entity)); + EntitySystem.Get().OnGhostAttempt(component.Mind!, false); } if (entity.TryGetComponent(out ActorComponent? actor))