Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

32
Content.Shared/Body/Events/MechanismBodyEvents.cs
View File

@@ -1,6 +1,4 @@
using Content.Shared.Body.Components;
namespace Content.Shared.Body.Events
namespace Content.Shared.Body.Events
{
// All of these events are raised on a mechanism entity when added/removed to a body in different
// ways.
@@ -10,9 +8,9 @@ namespace Content.Shared.Body.Events
/// </summary>
public sealed class AddedToBodyEvent : EntityEventArgs
{
public SharedBodyComponent Body;
public EntityUid Body;
public AddedToBodyEvent(SharedBodyComponent body)
public AddedToBodyEvent(EntityUid body)
{
Body = body;
}
@@ -23,9 +21,9 @@ namespace Content.Shared.Body.Events
/// </summary>
public sealed class AddedToPartEvent : EntityEventArgs
{
public SharedBodyPartComponent Part;
public EntityUid Part;
public AddedToPartEvent(SharedBodyPartComponent part)
public AddedToPartEvent(EntityUid part)
{
Part = part;
}
@@ -36,10 +34,10 @@ namespace Content.Shared.Body.Events
/// </summary>
public sealed class AddedToPartInBodyEvent : EntityEventArgs
{
public SharedBodyComponent Body;
public SharedBodyPartComponent Part;
public EntityUid Body;
public EntityUid Part;
public AddedToPartInBodyEvent(SharedBodyComponent body, SharedBodyPartComponent part)
public AddedToPartInBodyEvent(EntityUid body, EntityUid part)
{
Body = body;
Part = part;
@@ -51,9 +49,9 @@ namespace Content.Shared.Body.Events
/// </summary>
public sealed class RemovedFromBodyEvent : EntityEventArgs
{
public SharedBodyComponent Old;
public EntityUid Old;
public RemovedFromBodyEvent(SharedBodyComponent old)
public RemovedFromBodyEvent(EntityUid old)
{
Old = old;
}
@@ -64,9 +62,9 @@ namespace Content.Shared.Body.Events
/// </summary>
public sealed class RemovedFromPartEvent : EntityEventArgs
{
public SharedBodyPartComponent Old;
public EntityUid Old;
public RemovedFromPartEvent(SharedBodyPartComponent old)
public RemovedFromPartEvent(EntityUid old)
{
Old = old;
}
@@ -77,10 +75,10 @@ namespace Content.Shared.Body.Events
/// </summary>
public sealed class RemovedFromPartInBodyEvent : EntityEventArgs
{
public SharedBodyComponent OldBody;
public SharedBodyPartComponent OldPart;
public EntityUid OldBody;
public EntityUid OldPart;
public RemovedFromPartInBodyEvent(SharedBodyComponent oldBody, SharedBodyPartComponent oldPart)
public RemovedFromPartInBodyEvent(EntityUid oldBody, EntityUid oldPart)
{
OldBody = oldBody;
OldPart = oldPart;