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.

Sign up for GitHub

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

Fix Double Muzzle Flash #33981

Merged
merged 12 commits into from
Jan 30, 2025
Merged

Fix Double Muzzle Flash #33981

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e9c499d
Pass user to effects to properly fix double muzzle flash.
sleepyyapril Dec 21, 2024
0d3aa2b
Merge branch 'master' of https://github.com/space-wizards/space-stati…
sleepyyapril Dec 21, 2024
7b996d4
Use gun when user is null.
sleepyyapril Dec 21, 2024
46e8a4b
Update MuzzleFlashEvent.cs
sleepyyapril Jan 19, 2025
dd9ee8a
Update MuzzleFlashEvent.cs
sleepyyapril Jan 19, 2025
30810e0
Update GunSystem.cs
sleepyyapril Jan 19, 2025
90e23c1
Update SharedGunSystem.cs
sleepyyapril Jan 19, 2025
0f4e4f2
Merge branch 'space-wizards:master' into fix-double-flash
sleepyyapril Jan 19, 2025
1bdd7a2
Update MuzzleFlashEvent.cs
sleepyyapril Jan 19, 2025
502a401
Update SharedGunSystem.cs
sleepyyapril Jan 19, 2025
36166b1
Update SharedGunSystem.cs
sleepyyapril Jan 19, 2025
aff034e
Update Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
sleepyyapril Jan 19, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ protected void MuzzleFlash(EntityUid gun, AmmoComponent component, Angle worldAn
return;

var ev = new MuzzleFlashEvent(GetNetEntity(gun), sprite, worldAngle);
CreateEffect(gun, ev, gun);
CreateEffect(gun, ev, user);
}

public void CauseImpulse(EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid user, PhysicsComponent userPhysics)
Expand Down
Loading