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

Only show disarm fail if target is a mob (#11603)

Browse Source
This commit is contained in:
metalgearsloth
2022-09-30 02:46:54 +10:00
committed by GitHub
parent c919f79c4c
commit 301254fef8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ using Content.Client.CombatMode;
using Content.Client.Gameplay; using Content.Client.Gameplay;
using Content.Client.Hands; using Content.Client.Hands;
using Content.Client.Weapons.Melee.Components; using Content.Client.Weapons.Melee.Components;
using Content.Shared.MobState.Components;
using Content.Shared.Weapons.Melee; using Content.Shared.Weapons.Melee;
using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Melee.Events;
using Robust.Client.Animations; using Robust.Client.Animations;
@@ -207,7 +208,7 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
// If target doesn't have hands then we can't disarm so will let the player know it's pointless. // If target doesn't have hands then we can't disarm so will let the player know it's pointless.
if (!HasComp<HandsComponent>(ev.Target!.Value)) if (!HasComp<HandsComponent>(ev.Target!.Value))
{ {
if (Timing.IsFirstTimePredicted) if (Timing.IsFirstTimePredicted && HasComp<MobStateComponent>(ev.Target.Value))
PopupSystem.PopupEntity(Loc.GetString("disarm-action-disarmable", ("targetName", ev.Target.Value)), ev.Target.Value, Filter.Local()); PopupSystem.PopupEntity(Loc.GetString("disarm-action-disarmable", ("targetName", ev.Target.Value)), ev.Target.Value, Filter.Local());
return false; return false;