Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Spent Casing Ejection Not Suck #478

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
Loading