Merge branch 'master' into replace-sounds-with-sound-specifier

2021-08-10 15:05:49 -07:00
parent aa7606cf42 9f64592a40
commit a1db43ab34
183 changed files with 5472 additions and 2022 deletions
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -444,7 +444,7 @@ namespace Content.Server.Storage.Components
            EmptyContents();
        }

-        protected IEnumerable<IEntity> DetermineCollidingEntities()
+        protected virtual IEnumerable<IEntity> DetermineCollidingEntities()
        {
            var entityLookup = IoCManager.Resolve<IEntityLookup>();
            return entityLookup.GetEntitiesIntersecting(Owner);