rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make wide attacks optional for now (#8924)

Browse source
This commit is contained in:
metalgearsloth 2022-06-17 15:52:09 +10:00 • committed by GitHub
parent 08a4c7b835
commit 5a216be730
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs
View file

@ -28,7 +28,7 @@ namespace Content.Server.Weapon.Melee.Components
[ViewVariables(VVAccess.ReadWrite)]
[DataField("arc")]
public string Arc { get; set; } = "default";
public string? Arc { get; set; } = "default";
[ViewVariables(VVAccess.ReadWrite)]
[DataField("arcwidth")]

2
Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
View file

@ -124,6 +124,8 @@ namespace Content.Server.Weapon.Melee
private void OnWideAttack(EntityUid owner, MeleeWeaponComponent comp, WideAttackEvent args)
{
if (string.IsNullOrEmpty(comp.Arc)) return;
args.Handled = true;
var curTime = _gameTiming.CurTime;