juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream

Browse Source
This commit is contained in:
Ed
2024-06-02 11:01:34 +03:00
parent b032c38917 ba04f94e48
commit 6a5fae3403
518 changed files with 20010 additions and 13172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs
View File

@@ -87,7 +87,7 @@ public sealed partial class MeleeWeaponSystem
case WeaponArcAnimation.None:
var (mapPos, mapRot) = TransformSystem.GetWorldPositionRotation(userXform);
var worldPos = mapPos + (mapRot - userXform.LocalRotation).RotateVec(localPos);
var newLocalPos = TransformSystem.GetInvWorldMatrix(xform.ParentUid).Transform(worldPos);
var newLocalPos = Vector2.Transform(worldPos, TransformSystem.GetInvWorldMatrix(xform.ParentUid));
TransformSystem.SetLocalPositionNoLerp(animationUid, newLocalPos, xform);
if (arcComponent.Fadeout)
_animation.Play(animationUid, GetFadeAnimation(sprite, 0f, 0.15f), FadeAnimationKey);