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

You can now return to a brain. Also, clean up terrible console misuse. (#4092)

Browse Source 
* You can now return to a brain. Also, clean up terrible console misuse.

* Get rid of Obsolete attribute on Ghost.Execute
This commit is contained in:
20kdc
2021-06-03 09:03:19 +01:00
committed by GitHub
parent 96d808d9fa
commit 2f821f2bc3
6 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameObjects/Components/Observer/GhostOnMoveComponent.cs
View File

@@ -1,7 +1,7 @@
#nullable enable
using System;
using Content.Server.Commands.Observer;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.Interfaces.GameTicking;
using Content.Shared.GameObjects.Components.Movement;
using Robust.Server.Console;
using Robust.Shared.Console;
@@ -17,6 +17,7 @@ namespace Content.Server.GameObjects.Components.Observer
public class GhostOnMoveComponent : Component, IRelayMoveInput, IGhostOnMove
{
public override string Name => "GhostOnMove";
[Dependency] private readonly IGameTicker _gameTicker = default!;
[DataField("canReturn")] public bool CanReturn { get; set; } = true;
@@ -26,8 +27,7 @@ namespace Content.Server.GameObjects.Components.Observer
if (Owner.HasComponent<VisitingMindComponent>()) return;
if (!Owner.TryGetComponent(out MindComponent? mind) || !mind.HasMind || mind.Mind!.IsVisitingEntity) return;
var host = IoCManager.Resolve<IServerConsoleHost>();
new Ghost().Execute(new ConsoleShell(host, session), string.Empty, Array.Empty<string>());
_gameTicker.OnGhostAttempt(mind.Mind!, CanReturn);
}
}
}