Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Muzzle flash enhancements (#9527)

Browse Source
This commit is contained in:
metalgearsloth
2022-07-14 23:03:48 +10:00
committed by GitHub
parent 2341d97ece
commit cd4b7bd85c
6 changed files with 134 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Weapon/Ranged/Systems/GunSystem.cs
View File

@@ -22,7 +22,6 @@ namespace Content.Server.Weapon.Ranged.Systems;
public sealed partial class GunSystem : SharedGunSystem
{
[Dependency] private readonly EffectSystem _effects = default!;
[Dependency] private readonly StaminaSystem _stamina = default!;
public const float DamagePitchVariation = MeleeWeaponSystem.DamagePitchVariation;
@@ -215,17 +214,14 @@ public sealed partial class GunSystem : SharedGunSystem
protected override void Popup(string message, EntityUid? uid, EntityUid? user) {}
protected override void CreateEffect(EffectSystemMessage message, EntityUid? user = null)
protected override void CreateEffect(EntityUid uid, MuzzleFlashEvent message, EntityUid? user = null)
{
// TODO: Fucking bad
var filter = Filter.Pvs(uid, entityManager: EntityManager);
if (TryComp<ActorComponent>(user, out var actor))
{
_effects.CreateParticle(message, actor.PlayerSession);
}
else
{
_effects.CreateParticle(message);
}
filter.RemovePlayer(actor.PlayerSession);
RaiseNetworkEvent(message, filter);
}
public void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound)