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

Move cuffs to users hand when removed (#8862)

Browse Source 
* move cuffs to users hand when removed

* review

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Profane McBane
2022-06-16 10:42:32 +01:00
committed by GitHub
parent 6e23e314ee
commit 0594323731
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,9 +245,7 @@ namespace Content.Server.Cuffs.Components
SoundSystem.Play(cuff.EndUncuffSound.GetSound(), Filter.Pvs(Owner), Owner); SoundSystem.Play(cuff.EndUncuffSound.GetSound(), Filter.Pvs(Owner), Owner);
Container.ForceRemove(cuffsToRemove.Value); Container.ForceRemove(cuffsToRemove.Value);
var transform = _entMan.GetComponent<TransformComponent>(cuffsToRemove.Value); _entMan.EntitySysManager.GetEntitySystem<SharedHandsSystem>().PickupOrDrop(user, cuffsToRemove.Value);
transform.AttachToGridOrMap();
transform.WorldPosition = _entMan.GetComponent<TransformComponent>(Owner).WorldPosition;
if (cuff.BreakOnRemove) if (cuff.BreakOnRemove)
{ {

2
Content.Server/Cuffs/CuffableSystem.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.Popups;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Player; using Robust.Shared.Player;
using Content.Shared.Hands.EntitySystems;
namespace Content.Server.Cuffs namespace Content.Server.Cuffs
{ {
@@ -23,7 +24,6 @@ namespace Content.Server.Cuffs
SubscribeLocalEvent<HandCountChangedEvent>(OnHandCountChanged); SubscribeLocalEvent<HandCountChangedEvent>(OnHandCountChanged);
SubscribeLocalEvent<UncuffAttemptEvent>(OnUncuffAttempt); SubscribeLocalEvent<UncuffAttemptEvent>(OnUncuffAttempt);
SubscribeLocalEvent<CuffableComponent, GetVerbsEvent<Verb>>(AddUncuffVerb); SubscribeLocalEvent<CuffableComponent, GetVerbsEvent<Verb>>(AddUncuffVerb);
} }