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

Remove server-sprite references from handcuffs (#13515)

Browse Source
This commit is contained in:
Leon Friedrich
2023-01-17 16:23:53 +13:00
committed by GitHub
parent e8b18d17c2
commit 44631c7723
6 changed files with 52 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/Cuffs/Components/CuffableComponent.cs
View File

@@ -18,6 +18,7 @@ using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.Player;
using Content.Server.Recycling.Components;
using Robust.Shared.Map;
namespace Content.Server.Cuffs.Components
{
@@ -271,22 +272,16 @@ namespace Content.Server.Cuffs.Components
SoundSystem.Play(cuff.EndUncuffSound.GetSound(), Filter.Pvs(Owner), Owner);
_entMan.EntitySysManager.GetEntitySystem<HandVirtualItemSystem>().DeleteInHandsMatching(user, cuffsToRemove);
_entMan.EntitySysManager.GetEntitySystem<SharedHandsSystem>().PickupOrDrop(user, cuffsToRemove);
if (cuff.BreakOnRemove)
{
cuff.Broken = true;
var meta = _entMan.GetComponent<MetaDataComponent>(cuffsToRemove);
meta.EntityName = Loc.GetString(cuff.BrokenName);
meta.EntityDescription = Loc.GetString(cuff.BrokenDesc);
if (_entMan.TryGetComponent<SpriteComponent>(cuffsToRemove, out var sprite) && cuff.BrokenState != null)
{
sprite.LayerSetState(0, cuff.BrokenState); // TODO: safety check to see if RSI contains the state?
}
_entMan.EnsureComponent<RecyclableComponent>(cuffsToRemove);
_entMan.QueueDeleteEntity(cuffsToRemove);
var trash = _entMan.SpawnEntity(cuff.BrokenPrototype, MapCoordinates.Nullspace);
_entMan.EntitySysManager.GetEntitySystem<SharedHandsSystem>().PickupOrDrop(user, trash);
}
else
{
_entMan.EntitySysManager.GetEntitySystem<SharedHandsSystem>().PickupOrDrop(user, cuffsToRemove);
}
CanStillInteract = _entMan.TryGetComponent(Owner, out HandsComponent? handsComponent) && handsComponent.SortedHands.Count() > CuffedHandCount;