diff --git a/Content.Server/Observer/Ghost.cs b/Content.Server/Observer/Ghost.cs index 493ac615b9..80480b958a 100644 --- a/Content.Server/Observer/Ghost.cs +++ b/Content.Server/Observer/Ghost.cs @@ -4,6 +4,7 @@ using Content.Server.GameObjects.Components.Observer; using Content.Server.Interfaces.GameTicking; using Content.Server.Players; using Content.Shared.GameObjects.Components.Damage; +using Content.Shared.GameObjects.Components.Mobs; using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Player; using Robust.Shared.Interfaces.GameObjects; @@ -67,7 +68,12 @@ namespace Content.Server.Observer var ghostComponent = ghost.GetComponent(); ghostComponent.CanReturnToBody = canReturn; - if(canReturn) + if (player.AttachedEntity.TryGetComponent(out ServerOverlayEffectsComponent overlayComponent)) + { + overlayComponent?.RemoveOverlay(SharedOverlayID.CircleMaskOverlay); + } + + if (canReturn) mind.Visit(ghost); else mind.TransferTo(ghost);