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

fix shove regression (#12316)

Browse Source
This commit is contained in:
Rane
2022-11-08 16:10:59 -05:00
committed by GitHub
parent 20032b5ecc
commit 6c95c8d165
12 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
View File

@@ -5,6 +5,7 @@ using Content.Client.Weapons.Melee.Components;
using Content.Shared.MobState.Components;
using Content.Shared.Weapons.Melee;
using Content.Shared.Weapons.Melee.Events;
using Content.Shared.StatusEffect;
using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
@@ -218,9 +219,13 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
return false;
}
// If target doesn't have hands then we can't disarm so will let the player know it's pointless.
// They need to either have hands...
if (!HasComp<HandsComponent>(ev.Target!.Value))
{
// or just be able to be shoved over.
if (TryComp<StatusEffectsComponent>(ev.Target!.Value, out var status) && status.AllowedEffects.Contains("KnockedDown"))
return true;
if (Timing.IsFirstTimePredicted && HasComp<MobStateComponent>(ev.Target.Value))
PopupSystem.PopupEntity(Loc.GetString("disarm-action-disarmable", ("targetName", ev.Target.Value)), ev.Target.Value, Filter.Local());