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

fix

Browse Source
This commit is contained in:
CaYpeN1
2024-03-25 21:18:12 +05:00
parent 0796ca7bee
commit afc0d5f713
12 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared._White.WeaponModules;
using Content.Shared.Actions;
using Content.Shared.Examine;
using Content.Shared.Hands;
@@ -21,6 +22,20 @@ public abstract partial class SharedGunSystem
args.PushMarkup(Loc.GetString("gun-fire-rate-examine", ("color", FireRateExamineColor),
("fireRate", $"{component.FireRateModified:0.0}")));
if (TryComp<WeaponModulesComponent>(uid, out var weaponModulesComponent))
{
if (weaponModulesComponent.Modules.Count == 0)
{
args.PushMarkup(Loc.GetString("gun-modules", ("modules", "Пусто")));
return;
}
foreach (var module in weaponModulesComponent.Modules)
{
args.PushMarkup(Loc.GetString("gun-modules", ("modules", Name(module))));
}
}
if (!TryComp<TwoModeEnergyAmmoProviderComponent>(uid, out var comp))
return;

4
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
View File

@@ -477,8 +477,8 @@ public abstract partial class SharedGunSystem : EntitySystem
protected void MuzzleFlash(EntityUid gun, AmmoComponent component, EntityUid? user = null)
{
bool cancelled = TryComp<WeaponModulesComponent>(gun, out var weaponModulesComponent) && weaponModulesComponent.UseEffect;
if(cancelled) return;
bool cancelled = TryComp<WeaponModulesComponent>(gun, out var weaponModulesComponent) && weaponModulesComponent.WeaponFireEffect; // WD EDIT
if(cancelled) return; // WD EDIT END
var attemptEv = new GunMuzzleFlashAttemptEvent();
RaiseLocalEvent(gun, ref attemptEv);