tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wieldable guns not being able to cycle inhand (#27307)

Browse Source 
* Add UnwieldOverride variable that overrides unwielding inhand to enable other interactions

* Give LMGs UnwieldOverride

* logically inverted UnwieldOverride to UnwieldOnUse

* fixed typo
This commit is contained in:
WarMechanic
2024-04-26 22:31:50 +10:00
committed by GitHub
parent 80bbf19f95
commit 498109a833
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Wieldable/Components/WieldableComponent.cs
View File

@@ -26,6 +26,13 @@ public sealed partial class WieldableComponent : Component
[AutoNetworkedField, DataField("wielded")] [AutoNetworkedField, DataField("wielded")]
public bool Wielded = false; public bool Wielded = false;
/// <summary>
/// Whether using the item inhand while wielding causes the item to unwield.
/// Unwielding can conflict with other inhand actions.
/// </summary>
[DataField]
public bool UnwieldOnUse = true;
[DataField("wieldedInhandPrefix")] [DataField("wieldedInhandPrefix")]
public string? WieldedInhandPrefix = "wielded"; public string? WieldedInhandPrefix = "wielded";

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

@@ -125,7 +125,7 @@ public sealed class WieldableSystem : EntitySystem
if (!component.Wielded) if (!component.Wielded)
args.Handled = TryWield(uid, component, args.User); args.Handled = TryWield(uid, component, args.User);
else else if (component.UnwieldOnUse)
args.Handled = TryUnwield(uid, component, args.User); args.Handled = TryUnwield(uid, component, args.User);
} }

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
View File

@@ -14,6 +14,7 @@
slots: slots:
- Back - Back
- type: Wieldable - type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus - type: GunWieldBonus
minAngle: -20 minAngle: -20
maxAngle: -20 maxAngle: -20