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

Zombie Diona Fixes (#25404)

Browse Source 
No reform, zombie nymphs
This commit is contained in:
LankLTE
2024-02-26 15:31:37 -08:00
committed by GitHub
parent bd99c0dcdb
commit cc865c547b
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Species/Systems/ReformSystem.cs
View File

@@ -4,12 +4,11 @@ using Content.Shared.DoAfter;
using Content.Shared.Popups;
using Content.Shared.Stunnable;
using Content.Shared.Mind;
using Content.Shared.Humanoid;
using Content.Shared.Zombies;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Timing;
using Robust.Shared.Serialization.Manager;
namespace Content.Shared.Species;
@@ -23,8 +22,6 @@ public sealed partial class ReformSystem : EntitySystem
[Dependency] private readonly SharedStunSystem _stunSystem = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly SharedMindSystem _mindSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
[Dependency] private readonly ISerializationManager _serializationManager = default!;
public override void Initialize()
{
@@ -35,6 +32,8 @@ public sealed partial class ReformSystem : EntitySystem
SubscribeLocalEvent<ReformComponent, ReformEvent>(OnReform);
SubscribeLocalEvent<ReformComponent, ReformDoAfterEvent>(OnDoAfter);
SubscribeLocalEvent<ReformComponent, EntityZombifiedEvent>(OnZombified);
}
private void OnMapInit(EntityUid uid, ReformComponent comp, MapInitEvent args)
@@ -95,12 +94,17 @@ public sealed partial class ReformSystem : EntitySystem
// This transfers the mind to the new entity
if (_mindSystem.TryGetMind(uid, out var mindId, out var mind))
_mindSystem.TransferTo(mindId, child, mind: mind);
_mindSystem.TransferTo(mindId, child, mind: mind);
// Delete the old entity
QueueDel(uid);
}
private void OnZombified(EntityUid uid, ReformComponent comp, ref EntityZombifiedEvent args)
{
_actionsSystem.RemoveAction(uid, comp.ActionEntity); // Zombies can't reform
}
public sealed partial class ReformEvent : InstantActionEvent { }
[Serializable, NetSerializable]