diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index e77e8047af..8559294e41 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -209,7 +209,10 @@ public abstract partial class SharedProjectileSystem : EntitySystem if (component.Offset != Vector2.Zero) { - _transform.SetLocalPosition(uid, xform.LocalPosition + xform.LocalRotation.RotateVec(component.Offset), + var rotation = xform.LocalRotation; + if (TryComp(uid, out var throwingAngleComp)) + rotation += throwingAngleComp.Angle; + _transform.SetLocalPosition(uid, xform.LocalPosition + rotation.RotateVec(component.Offset), xform); } diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 71d53bdd1c..6989d81647 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -5,7 +5,7 @@ description: Definition of a Classic. Keeping murder affordable since 200,000 BCE. components: - type: EmbeddableProjectile - offset: 0.15,0.15 + offset: -0.15,0.0 - type: EmbedPassiveDamage - type: ThrowingAngle angle: 225 @@ -18,10 +18,10 @@ fix1: shape: !type:PolygonShape vertices: - - -0.40,-0.30 - - -0.30,-0.40 - - 0.40,0.30 - - 0.30,0.40 + - -0.40,-0.30 + - -0.30,-0.40 + - 0.40,0.30 + - 0.30,0.40 density: 20 mask: - ItemMask @@ -220,10 +220,10 @@ fix1: shape: !type:PolygonShape vertices: - - -0.40,-0.30 - - -0.30,-0.40 - - 0.40,0.30 - - 0.30,0.40 + - -0.40,-0.30 + - -0.30,-0.40 + - 0.40,0.30 + - 0.30,0.40 density: 20 mask: - ItemMask