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

Disposals air + new atmos expose event (#6798)

Browse Source 
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
mirrorcult
2022-02-19 17:42:01 -07:00
committed by GitHub
parent f23386ac55
commit 3e6bf54727
7 changed files with 77 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -47,6 +47,9 @@ namespace Content.Server.Disposal.Unit.EntitySystems
foreach (var entity in holder.Container.ContainedEntities.ToArray())
{
if (HasComp<BeingDisposedComponent>(entity))
RemComp <BeingDisposedComponent>(entity);
if (EntityManager.TryGetComponent(entity, out IPhysBody? physics))
{
physics.CanCollide = true;
@@ -101,6 +104,12 @@ namespace Content.Server.Disposal.Unit.EntitySystems
return false;
}
foreach (var ent in holder.Container.ContainedEntities)
{
var comp = EnsureComp<BeingDisposedComponent>(ent);
comp.Holder = holder.Owner;
}
// Insert into next tube
holderTransform.Coordinates = new EntityCoordinates(toUid, Vector2.Zero);
if (!to.Contents.Insert(holder.Owner))