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

ECS and cleanup body system, merge body templates and presets into body prototypes (#11991)

Browse Source 
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
This commit is contained in:
DrSmugleaf
2022-10-23 00:46:28 +02:00
committed by GitHub
parent 9a38736c3c
commit f323fb7644
140 changed files with 2478 additions and 2571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Morgue/MorgueSystem.cs
View File

@@ -1,9 +1,9 @@
using Content.Server.Morgue.Components;
using Content.Shared.Morgue;
using Content.Shared.Examine;
using Robust.Server.GameObjects;
using Content.Server.Storage.Components;
using Content.Shared.Body.Components;
using Content.Shared.Examine;
using Content.Shared.Morgue;
using Robust.Server.GameObjects;
namespace Content.Server.Morgue;
@@ -61,7 +61,7 @@ public sealed class MorgueSystem : EntitySystem
foreach (var ent in storage.Contents.ContainedEntities)
{
if (!hasMob && HasComp<SharedBodyComponent>(ent))
if (!hasMob && HasComp<BodyComponent>(ent))
hasMob = true;
if (HasComp<ActorComponent?>(ent))