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

Fix exped FTL (#25823)

Browse Source 
Also fixed some other stuff I noticed.
This commit is contained in:
metalgearsloth
2024-03-04 17:24:24 +11:00
committed by GitHub
parent 4b6e5deb59
commit c23b3d804e
6 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs
View File

@@ -5,6 +5,7 @@ using Content.Shared.Shuttles.UI.MapObjects;
using Robust.Client.Graphics;
using Robust.Client.ResourceManagement;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Physics.Components;
namespace Content.Client.Shuttles.Systems;
@@ -39,6 +40,12 @@ public sealed partial class ShuttleSystem
return GetCoordinates(exclusion.Coordinates).ToMap(EntityManager, XformSystem);
case GridMapObject grid:
var gridXform = Transform(grid.Entity);
if (HasComp<MapComponent>(grid.Entity))
{
return new MapCoordinates(gridXform.LocalPosition, gridXform.MapID);
}
Entity<PhysicsComponent?, TransformComponent?> gridEnt = (grid.Entity, null, gridXform);
return new MapCoordinates(Maps.GetGridPosition(gridEnt), gridXform.MapID);
default: