From 69ec1a873cafa297f89145cd86ae51fcd416f6d3 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 19 Jun 2024 01:02:30 -0400
Subject: [PATCH] More Exciting Shell Casings

---
 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs | 2 +-
 .../Guns/Ammunition/Cartridges/base_cartridge.yml        | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index d3aee5a48e9..f1daa700e8b 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -441,7 +441,7 @@ protected void EjectCartridge(
         {
             Angle ejectAngle = angle.Value;
             ejectAngle += 3.7f; // 212 degrees; casings should eject slightly to the right and behind of a gun
-            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec().Normalized() / 100, 5f);
+            ThrowingSystem.TryThrow(entity, ejectAngle.ToVec(), 625f);
         }
         if (playSound && TryComp<CartridgeAmmoComponent>(entity, out var cartridge))
         {
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
index e188ee8c658..3bef413dffa 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -11,10 +11,10 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.10,-0.05,0.10,0.05"
-        density: 20
+        density: 0.5
         mask:
           - ItemMask
-        restitution: 0.3  # fite me
+        restitution: 0.7  # Small and bouncy
         friction: 0.2
   - type: Tag
     tags:
@@ -23,6 +23,11 @@
     size: Tiny
   - type: SpaceGarbage
   - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Weapons/Guns/Casings/casing_fall_1.ogg
+      params:
+        volume: -1
+  - type: EmitSoundOnCollide
     sound:
       path: /Audio/Weapons/Guns/Casings/casing_fall_2.ogg
       params: