Cherrypicks (#356)

* Katana Dash checks based on vision rather than collision (#27793)

* Fix dash check

* unused

* obsolete function

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Fix StepTrigger blacklist not working (#26968)

* Make cuff default range again (#28576)

* Make cuff default range again

* uncuff distance

* how about ONE

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
This commit is contained in:
Aviu00
2024-06-14 14:01:02 +00:00
committed by GitHub
parent 11ceefc019
commit 894af847cd
3 changed files with 7 additions and 8 deletions

View File

@@ -545,7 +545,7 @@ namespace Content.Shared.Cuffs
BreakOnWeightlessMove = false,
BreakOnDamage = true,
NeedHand = true,
DistanceThreshold = 0.3f
DistanceThreshold = 1f // shorter than default but still feels good
};
if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
@@ -650,7 +650,7 @@ namespace Content.Shared.Cuffs
BreakOnDamage = true,
NeedHand = true,
RequireCanInteract = false, // Trust in UncuffAttemptEvent
DistanceThreshold = 0.3f
DistanceThreshold = 1f // shorter than default but still feels good
};
if (!_doAfter.TryStartDoAfter(doAfterEventArgs))