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

Gun tweaks (#8320)

Browse Source
This commit is contained in:
metalgearsloth
2022-05-22 12:31:46 +10:00
committed by GitHub
parent c3fa24ccd8
commit 6e94d08b17
6 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/CombatMode/SharedCombatModeSystem.cs
View File

@@ -65,10 +65,8 @@ namespace Content.Shared.CombatMode
{
var entity = eventArgs.SenderSession.AttachedEntity;
if (entity == default || !EntityManager.TryGetComponent(entity, out SharedCombatModeComponent? combatModeComponent))
{
if (entity == null || !EntityManager.TryGetComponent(entity, out SharedCombatModeComponent? combatModeComponent))
return;
}
combatModeComponent.IsInCombatMode = ev.Active;
}

16
Content.Shared/Interaction/Events/MeleeAttackAttemptEvent.cs Normal file
View File

@@ -0,0 +1,16 @@
namespace Content.Shared.Interaction.Events;
/// <summary>
/// Raised on directed a weapon when being used in a melee attack.
/// </summary>
[ByRefEvent]
public struct MeleeAttackAttemptEvent
{
public bool Cancelled = false;
public readonly EntityUid User;
public MeleeAttackAttemptEvent(EntityUid user)
{
User = user;
}
}