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

Melee special examine (#11168)

Browse Source 
Co-authored-by: CommieFlowers <rasmus.cedergren@hotmail.com>
This commit is contained in:
rolfero
2022-09-11 08:39:36 +02:00
committed by GitHub
parent 895841ade3
commit 4b23521af5
14 changed files with 101 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Abilities/Boxer/BoxingSystem.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Server.Abilities.Boxer
{
base.Initialize();
SubscribeLocalEvent<BoxerComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<BoxerComponent, MeleeHitEvent>(ApplyBoxerModifiers);
SubscribeLocalEvent<BoxerComponent, ItemMeleeDamageEvent>(GetDamageModifiers);
SubscribeLocalEvent<BoxingGlovesComponent, StaminaMeleeHitEvent>(OnStamHit);
}
@@ -29,7 +29,7 @@ namespace Content.Server.Abilities.Boxer
if (TryComp<MeleeWeaponComponent>(uid, out var meleeComp))
meleeComp.Range *= boxer.RangeBonus;
}
private void ApplyBoxerModifiers(EntityUid uid, BoxerComponent component, MeleeHitEvent args)
private void GetDamageModifiers(EntityUid uid, BoxerComponent component, ItemMeleeDamageEvent args)
{
if (component.UnarmedModifiers == default!)
{