From 5aafe89d95c338ab1322e752f8bd9fa4021f6432 Mon Sep 17 00:00:00 2001 From: Acruid Date: Sun, 1 Sep 2019 17:08:15 -0700 Subject: [PATCH] Set the max size of a Storage to a constant, regardless of the physical size of the Storage. This lets lockers eat objects larger than themselves (like mobs). This resolves https://github.com/space-wizards/space-station-14/issues/294. --- .../Components/Items/Storage/EntityStorageComponent.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index 7ea736315b..887266aafb 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -22,6 +22,8 @@ namespace Content.Server.GameObjects.Components { public override string Name => "EntityStorage"; + private const float MaxSize = 1.0f; // maximum width or height of an entity allowed inside the storage. + private int StorageCapacityMax; private bool IsCollidableWhenOpen; private Container Contents; @@ -116,8 +118,8 @@ namespace Content.Server.GameObjects.Components var collidableComponent = Owner.GetComponent(); if(entity.TryGetComponent(out var entityCollidableComponent)) { - if(collidableComponent.WorldAABB.Size.X < entityCollidableComponent.WorldAABB.Size.X - || collidableComponent.WorldAABB.Size.Y < entityCollidableComponent.WorldAABB.Size.Y) + if(MaxSize < entityCollidableComponent.WorldAABB.Size.X + || MaxSize < entityCollidableComponent.WorldAABB.Size.Y) { return false; }