From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Date: Mon, 29 Apr 2024 13:12:29 +0000 (-0700)
Subject: Make bullets inherit the velocity of the grid, not the gun or player (#27484)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6b5e99f5eb885faae202078167d8402350446f5a;p=space-station-14.git

Make bullets inherit the velocity of the grid, not the gun or player (#27484)
---

diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index f5f4e3f199..7449b0c59e 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -105,7 +105,7 @@ public sealed partial class GunSystem : SharedGunSystem
         // Update shot based on the recoil
         toMap = fromMap.Position + angle.ToVec() * mapDirection.Length();
         mapDirection = toMap - fromMap.Position;
-        var gunVelocity = Physics.GetMapLinearVelocity(gunUid);
+        var gunVelocity = Physics.GetMapLinearVelocity(fromEnt);
 
         // I must be high because this was getting tripped even when true.
         // DebugTools.Assert(direction != Vector2.Zero);