From 0da8a5b9d00619edf805c24779cabc40096adc89 Mon Sep 17 00:00:00 2001
From: Saphire Lattice <lattice@saphi.re>
Date: Wed, 27 Oct 2021 14:12:36 +0700
Subject: [PATCH] Fix trashbags picking up atmos entities that are anchored
 (#5035)

---
 .../Storage/Components/ServerStorageComponent.cs           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Storage/Components/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs
index d7869cce62..683ec6f20c 100644
--- a/Content.Server/Storage/Components/ServerStorageComponent.cs
+++ b/Content.Server/Storage/Components/ServerStorageComponent.cs
@@ -139,6 +139,11 @@ namespace Content.Server.Storage.Components
                 return false;
             }
 
+            if (entity.Transform.Anchored)
+            {
+                return false;
+            }
+
             return true;
         }
 
@@ -512,7 +517,7 @@ namespace Content.Server.Storage.Components
             if (_areaInsert && (eventArgs.Target == null || !eventArgs.Target.HasComponent<SharedItemComponent>()))
             {
                 var validStorables = new List<IEntity>();
-                foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, _areaInsertRadius))
+                foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, _areaInsertRadius, LookupFlags.None))
                 {
                     if (entity.IsInContainer()
                         || entity == eventArgs.User