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

Fix crusher showing popup on swing (#19791)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-04 14:24:31 +10:00
committed by GitHub
parent 21b898afcd
commit 1f904ddb81
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Wieldable/WieldableSystem.cs
View File

@@ -6,6 +6,7 @@ using Content.Shared.Interaction.Events;
using Content.Shared.Item; using Content.Shared.Item;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using Content.Shared.Weapons.Melee;
using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Melee.Events;
using Content.Shared.Weapons.Melee.Components; using Content.Shared.Weapons.Melee.Components;
using Content.Shared.Weapons.Ranged.Components; using Content.Shared.Weapons.Ranged.Components;
@@ -59,7 +60,11 @@ public sealed class WieldableSystem : EntitySystem
!wieldable.Wielded) !wieldable.Wielded)
{ {
args.Cancelled = true; args.Cancelled = true;
args.Message = Loc.GetString("wieldable-component-requires", ("item", uid));
if (!HasComp<MeleeWeaponComponent>(uid) && !HasComp<MeleeRequiresWieldComponent>(uid))
{
args.Message = Loc.GetString("wieldable-component-requires", ("item", uid));
}
} }
} }