From 78e5e96a3c78090312523af21cb6527855ec4000 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Mon, 31 Oct 2022 15:56:17 +1300 Subject: [PATCH] Engine update (#12307) --- .../Disposal/Unit/EntitySystems/DisposableSystem.cs | 5 ++--- RobustToolbox | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs index 273e98c290..b562deff01 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs @@ -105,7 +105,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems } // Insert into next tube - holderTransform.Coordinates = new EntityCoordinates(toUid, Vector2.Zero); if (!to.Contents.Insert(holder.Owner)) { ExitDisposals(holderUid, holder, holderTransform); @@ -117,7 +116,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems holder.PreviousTube = holder.CurrentTube; holder.PreviousDirection = holder.CurrentDirection; } - holderTransform.Coordinates = toTransform.Coordinates; holder.CurrentTube = to; holder.CurrentDirection = to.NextDirection(holder); holder.StartingTime = 0.1f; @@ -168,7 +166,8 @@ namespace Content.Server.Disposal.Unit.EntitySystems var destination = holder.CurrentDirection.ToVec(); var newPosition = destination * progress; - EntityManager.GetComponent(holder.Owner).Coordinates = origin.Offset(newPosition); + // This is some supreme shit code. + EntityManager.GetComponent(holder.Owner).Coordinates = origin.Offset(newPosition).WithEntityId(currentTube.Owner); ; continue; } diff --git a/RobustToolbox b/RobustToolbox index df7933b890..03acded657 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit df7933b890cc6f86c280e6b68c3498a34c9c6e50 +Subproject commit 03acded657f709d9ce2ccec75b034837e140b435