From 9882f4682563196b2b6f65838a02d5c9e922c9f8 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Fri, 6 Aug 2021 17:52:42 +0200
Subject: [PATCH] Fix PlaceableSurface incorrect coordinate usage. It set world
 position to entity coordinate positions...

---
 Content.Server/Placeable/PlaceableSurfaceComponent.cs | 4 ++--
 Resources/Changelog/Parts/tables.yml                  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Changelog/Parts/tables.yml

diff --git a/Content.Server/Placeable/PlaceableSurfaceComponent.cs b/Content.Server/Placeable/PlaceableSurfaceComponent.cs
index e1ab83f897..1d83c21e0c 100644
--- a/Content.Server/Placeable/PlaceableSurfaceComponent.cs
+++ b/Content.Server/Placeable/PlaceableSurfaceComponent.cs
@@ -95,9 +95,9 @@ namespace Content.Server.Placeable
             }
             handComponent.Drop(eventArgs.Using);
             if (_placeCentered)
-                eventArgs.Using.Transform.WorldPosition = eventArgs.Target.Transform.WorldPosition + _positionOffset;
+                eventArgs.Using.Transform.LocalPosition = eventArgs.Target.Transform.LocalPosition + _positionOffset;
             else
-                eventArgs.Using.Transform.WorldPosition = eventArgs.ClickLocation.Position;
+                eventArgs.Using.Transform.Coordinates = eventArgs.ClickLocation;
             return true;
         }
     }
diff --git a/Resources/Changelog/Parts/tables.yml b/Resources/Changelog/Parts/tables.yml
new file mode 100644
index 0000000000..94d6d67a09
--- /dev/null
+++ b/Resources/Changelog/Parts/tables.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Fix
+    message: Fixes a bug where items would disappear when placed in tables, in certain situations.