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

Make PKA require wielding (#16638)

Browse Source
This commit is contained in:
metalgearsloth
2023-06-01 12:27:19 +10:00
committed by GitHub
parent f9df5f761c
commit 6537e683b0
8 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Weapons/Melee/Components/MeleeRequiresWieldComponent.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.Wieldable;
using Robust.Shared.GameStates;
namespace Content.Shared.Weapons.Melee.Components;
@@ -5,7 +6,7 @@ namespace Content.Shared.Weapons.Melee.Components;
/// <summary>
/// Indicates that this meleeweapon requires wielding to be useable.
/// </summary>
[RegisterComponent, NetworkedComponent]
[RegisterComponent, NetworkedComponent, Access(typeof(WieldableSystem))]
public sealed class MeleeRequiresWieldComponent : Component
{

3
Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
View File

@@ -1,3 +1,4 @@
using Content.Shared.Wieldable;
using Robust.Shared.GameStates;
namespace Content.Shared.Weapons.Ranged.Components;
@@ -5,7 +6,7 @@ namespace Content.Shared.Weapons.Ranged.Components;
/// <summary>
/// Indicates that this gun requires wielding to be useable.
/// </summary>
[RegisterComponent, NetworkedComponent]
[RegisterComponent, NetworkedComponent, Access(typeof(WieldableSystem))]
public sealed class GunRequiresWieldComponent : Component
{

20
Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs Normal file
View File

@@ -0,0 +1,20 @@
using Content.Shared.Wieldable;
using Robust.Shared.GameStates;
namespace Content.Shared.Weapons.Ranged.Components;
/// <summary>
/// Applies an accuracy bonus upon wielding.
/// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(WieldableSystem))]
public sealed partial class GunWieldBonusComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("minAngle"), AutoNetworkedField]
public Angle MinAngle = Angle.FromDegrees(-43);
/// <summary>
/// Angle bonus applied upon being wielded.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("maxAngle"), AutoNetworkedField]
public Angle MaxAngle = Angle.FromDegrees(-43);
}

3
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
View File

@@ -29,6 +29,9 @@ public abstract partial class SharedGunSystem
private void OnBallisticUse(EntityUid uid, BallisticAmmoProviderComponent component, UseInHandEvent args)
{
if (args.Handled)
return;
ManualCycle(uid, component, Transform(uid).MapPosition, args.User);
args.Handled = true;
}