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

HOTFIX: fix minibomb implant and syndicats not exploding (#34923)

Browse Source 
fix minibomb implant not exploding
This commit is contained in:
slarticodefast
2025-02-06 16:17:58 +01:00
committed by GitHub
parent cd91effefb
commit 11e5d59171
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/Implants/ImplantedSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Body.Components;
using Content.Shared.Implants.Components;
using Content.Shared.Storage;
using Robust.Shared.Containers;
namespace Content.Server.Implants;
@@ -13,21 +14,26 @@ public sealed partial class ImplanterSystem
SubscribeLocalEvent<ImplantedComponent, BeingGibbedEvent>(OnGibbed);
}
private void OnImplantedInit(EntityUid uid, ImplantedComponent component, ComponentInit args)
private void OnImplantedInit(Entity<ImplantedComponent> ent, ref ComponentInit args)
{
component.ImplantContainer = _container.EnsureContainer<Container>(uid, ImplanterComponent.ImplantSlotId);
component.ImplantContainer.OccludesLight = false;
ent.Comp.ImplantContainer = _container.EnsureContainer<Container>(ent.Owner, ImplanterComponent.ImplantSlotId);
ent.Comp.ImplantContainer.OccludesLight = false;
}
private void OnShutdown(EntityUid uid, ImplantedComponent component, ComponentShutdown args)
private void OnShutdown(Entity<ImplantedComponent> ent, ref ComponentShutdown args)
{
//If the entity is deleted, get rid of the implants
_container.CleanContainer(component.ImplantContainer);
_container.CleanContainer(ent.Comp.ImplantContainer);
}
private void OnGibbed(Entity<ImplantedComponent> ent, ref BeingGibbedEvent args)
{
//If the entity is gibbed, get rid of the implants
_container.CleanContainer(ent.Comp.ImplantContainer);
// Drop the storage implant contents before the implants are deleted by the body being gibbed
foreach (var implant in ent.Comp.ImplantContainer.ContainedEntities)
{
if (TryComp<StorageComponent>(implant, out var storage))
_container.EmptyContainer(storage.Container, destination: Transform(ent).Coordinates);
}
}
}

1
Content.Shared/Implants/Components/ImplantedComponent.cs
View File

@@ -10,5 +10,6 @@ namespace Content.Shared.Implants.Components;
[RegisterComponent, NetworkedComponent]
public sealed partial class ImplantedComponent : Component
{
[ViewVariables(VVAccess.ReadOnly)]
public Container ImplantContainer = default!;
}