tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes morgue (almost) (#4375)

Browse Source 
* fixes morgue (almost)

* yes

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
This commit is contained in:
Paul Ritter
2021-08-01 06:13:46 +02:00
committed by GitHub
parent f2a3987343
commit d14b82a1e6
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
View File

@@ -1,3 +1,4 @@
using System.Collections.Generic;
using Content.Server.Storage.Components;
using Content.Shared.Body.Components;
using Content.Shared.Directions;
@@ -12,6 +13,7 @@ using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Player;
@@ -132,6 +134,20 @@ namespace Content.Server.Morgue.Components
}
}
protected override IEnumerable<IEntity> DetermineCollidingEntities()
{
if (_tray == null)
{
yield break;
}
var entityLookup = IoCManager.Resolve<IEntityLookup>();
foreach (var entity in entityLookup.GetEntitiesIntersecting(_tray))
{
yield return entity;
}
}
//Called every 10 seconds
public void Update()
{