Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Mortician's Menagerie (#2391)

Browse Source 
* Body bags!

* Morgue Trays and the Crematorium!
Reorganised body bags to be under Morgue, not Medical

* Fix. Things outside of EntityStorageComponents now use the Try*Storage() not just *Storage() methods - Allows mobs to be trapped in a morgue/crematorium whose tray can't open.

* Fix tests. Modernise component dependency and nullability.

* Update Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
Remie Richards
2020-10-28 22:51:43 +00:00
committed by GitHub
parent 6a0aa9b72f
commit cc6acae145
38 changed files with 1225 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Server/GameObjects/EntitySystems/MorgueSystem.cs Normal file
View File

@@ -0,0 +1,27 @@
using Content.Server.GameObjects.Components.Morgue;
using JetBrains.Annotations;
using Robust.Shared.GameObjects.Systems;
namespace Content.Server.GameObjects.EntitySystems
{
[UsedImplicitly]
public class MorgueSystem : EntitySystem
{
private float _accumulatedFrameTime;
public override void Update(float frameTime)
{
_accumulatedFrameTime += frameTime;
if (_accumulatedFrameTime >= 10)
{
foreach (var morgue in ComponentManager.EntityQuery<MorgueEntityStorageComponent>())
{
morgue.Update();
}
_accumulatedFrameTime -= 10;
}
}
}
}

16
Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs
View File

@@ -61,5 +61,21 @@ namespace Content.Server.GameObjects.EntitySystems
hands.Drop(heldItem.Owner, doMobChecks);
}
}
//TODO: RotationState can be null and I want to burn all lifeforms in the universe for this!!!
//If you use these it's atleast slightly less painful (null is treated as false)
public bool IsStanding(IEntity entity)
{
return entity.TryGetComponent<AppearanceComponent>(out var appearance)
&& appearance.TryGetData<RotationState>(RotationVisuals.RotationState, out var rotation)
&& rotation == RotationState.Vertical;
}
public bool IsDown(IEntity entity)
{
return entity.TryGetComponent<AppearanceComponent>(out var appearance)
&& appearance.TryGetData<RotationState>(RotationVisuals.RotationState, out var rotation)
&& rotation == RotationState.Horizontal;
}
}
}