From 760463a67a8b06e0fad30e30c36530e988f04e44 Mon Sep 17 00:00:00 2001 From: Crude Oil <124208219+CroilBird@users.noreply.github.com> Date: Mon, 22 Dec 2025 22:01:56 +0100 Subject: [PATCH] Port FTL arrival effect fix from https://github.com/new-frontiers-14/frontier-station-14/pull/3495 (#41951) Port FTL arrival fix from https://github.com/new-frontiers-14/frontier-station-14/pull/3495 --- Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs | 3 ++- Resources/Prototypes/Entities/Effects/shuttle.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs index 5e3029333e..57ebf13e73 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs @@ -203,7 +203,8 @@ public sealed partial class DockingSystem var spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, _transform.ToMapCoordinates(gridPosition).Position); // TODO: use tight bounds - var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetAngle, spawnPosition.Position); + var targetWorldAngle = (targetGridAngle + targetAngle).Reduced(); + var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetWorldAngle, spawnPosition.Position); // Check if there's no intersecting grids (AKA oh god it's docking at cargo). grids.Clear(); diff --git a/Resources/Prototypes/Entities/Effects/shuttle.yml b/Resources/Prototypes/Entities/Effects/shuttle.yml index 4dae76a48a..9b1fc1e4c3 100644 --- a/Resources/Prototypes/Entities/Effects/shuttle.yml +++ b/Resources/Prototypes/Entities/Effects/shuttle.yml @@ -4,7 +4,7 @@ description: Visualizer for shuttles arriving. You shouldn't see this! components: - type: Transform - noRot: true + noRot: false gridTraversal: false - type: FtlVisualizer sprite: -- 2.52.0