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

Cargo shuttle changes (#14363)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-23 16:10:49 +11:00
committed by GitHub
parent 7f4bb7fe8a
commit 569f30b721
26 changed files with 523 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Shuttles/DockCommand.cs
View File

@@ -9,6 +9,8 @@ namespace Content.Server.Shuttles;
[AdminCommand(AdminFlags.Mapping)]
public sealed class DockCommand : IConsoleCommand
{
[Dependency] private readonly IEntityManager _entManager = default!;
public string Command => "dock";
public string Description => $"Attempts to dock 2 airlocks together. Doesn't check whether it is valid.";
public string Help => $"{Command} <airlock entityuid1> <airlock entityuid2>";
@@ -32,21 +34,19 @@ public sealed class DockCommand : IConsoleCommand
return;
}
var entManager = IoCManager.Resolve<IEntityManager>();
if (!entManager.TryGetComponent(airlock1, out DockingComponent? dock1))
if (!_entManager.TryGetComponent(airlock1, out DockingComponent? dock1))
{
shell.WriteError($"No docking component found on {airlock1}");
return;
}
if (!entManager.TryGetComponent(airlock2, out DockingComponent? dock2))
if (!_entManager.TryGetComponent(airlock2, out DockingComponent? dock2))
{
shell.WriteError($"No docking component found on {airlock2}");
return;
}
var dockSystem = EntitySystem.Get<DockingSystem>();
dockSystem.Dock(dock1, dock2);
var dockSystem = _entManager.System<DockingSystem>();
dockSystem.Dock(airlock1, dock1, airlock2, dock2);
}
}