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

Convert suicide to ecs (#8091)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
wrexbe
2022-05-12 05:05:16 -07:00
committed by GitHub
parent 6903209a31
commit 089e40a061
15 changed files with 362 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Toilet/ToiletComponent.cs
View File

@@ -1,15 +1,11 @@
using Content.Server.Act;
using Content.Server.Chat.Managers;
using Content.Shared.Sound;
using Content.Shared.Tools;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Server.Toilet
{
[RegisterComponent]
public sealed class ToiletComponent : Component, ISuicideAct
public sealed class ToiletComponent : Component
{
[DataField("pryLidTime")]
public float PryLidTime = 1f;
@@ -23,12 +19,5 @@ namespace Content.Server.Toilet
public bool LidOpen = false;
public bool IsSeatUp = false;
public bool IsPrying = false;
// todo: move me to ECS
SuicideKind ISuicideAct.Suicide(EntityUid victim, IChatManager chat)
{
return EntitySystem.Get<ToiletSystem>().Suicide(Owner, victim, this);
}
}
}

7
Content.Server/Toilet/ToiletSystem.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Content.Shared.Examine;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Toilet;
using Content.Shared.Tools.Components;
using Robust.Shared.Audio;
@@ -35,10 +36,16 @@ namespace Content.Server.Toilet
SubscribeLocalEvent<ToiletComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<ToiletComponent, InteractHandEvent>(OnInteractHand);
SubscribeLocalEvent<ToiletComponent, ExaminedEvent>(OnExamine);
SubscribeLocalEvent<ToiletComponent, SuicideEvent>(OnSuicide);
SubscribeLocalEvent<ToiletPryFinished>(OnToiletPried);
SubscribeLocalEvent<ToiletPryInterrupted>(OnToiletInterrupt);
}
private void OnSuicide(EntityUid uid, ToiletComponent component, SuicideEvent args)
{
Suicide(component.Owner, uid, component);
}
private void OnInit(EntityUid uid, ToiletComponent component, ComponentInit args)
{
EntityManager.EnsureComponent<SecretStashComponent>(uid);