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

Fix zipties/makeshift cuffs dropping multiple broken entities on removal (#23095)

Browse Source
This commit is contained in:
Nemanja
2023-12-28 18:50:08 -05:00
committed by GitHub
parent 194e9e790f
commit 526b966f09
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -621,7 +621,7 @@ namespace Content.Shared.Cuffs
if (!Resolve(target, ref cuffable) || !Resolve(cuffsToRemove, ref cuff))
return;
if (TerminatingOrDeleted(cuffsToRemove) || TerminatingOrDeleted(target))
if (cuff.Removing || TerminatingOrDeleted(cuffsToRemove) || TerminatingOrDeleted(target))
return;
if (user != null)
@@ -632,6 +632,7 @@ namespace Content.Shared.Cuffs
return;
}
cuff.Removing = true;
_audio.PlayPredicted(cuff.EndUncuffSound, target, user);
_container.Remove(cuffsToRemove, cuffable.Container);
@@ -688,6 +689,7 @@ namespace Content.Shared.Cuffs
}
}
}
cuff.Removing = false;
}
#region ActionBlocker