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

Content ecs containers (#22484)

Browse Source
This commit is contained in:
TemporalOroboros
2023-12-27 21:30:03 -08:00
committed by GitHub
parent 1d06539432
commit 7a77d6d5dd
72 changed files with 172 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Cuffs/SharedCuffableSystem.cs
View File

@@ -384,7 +384,7 @@ namespace Content.Shared.Cuffs
var container = cuffable.Container;
var entity = container.ContainedEntities[^1];
container.Remove(entity);
_container.Remove(entity, container);
_transform.SetWorldPosition(entity, _transform.GetWorldPosition(owner));
}
@@ -448,7 +448,7 @@ namespace Content.Shared.Cuffs
// Success!
_hands.TryDrop(user, handcuff);
component.Container.Insert(handcuff);
_container.Insert(handcuff, component.Container);
UpdateHeldItems(target, handcuff, component);
return true;
}
@@ -634,7 +634,7 @@ namespace Content.Shared.Cuffs
_audio.PlayPredicted(cuff.EndUncuffSound, target, user);
cuffable.Container.Remove(cuffsToRemove);
_container.Remove(cuffsToRemove, cuffable.Container);
if (_net.IsServer)
{