Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-23 00:27:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream

Browse Source
This commit is contained in:
Spatison
2025-07-21 21:15:30 +10:00
committed by GitHub
parent 9854f225cf 6402c3ddca
commit a6ec414625
12 changed files with 223 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
View File

@@ -1,11 +1,15 @@
using Content.Server._White.Chemistry.Components;
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
using Content.Server.Chemistry.Components;
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Server.Explosion.Components;
using Content.Shared._White.Blocking;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Inventory;
using Content.Shared.Popups;
using Content.Shared.Projectiles;
using Content.Shared.StepTrigger.Systems;
using Content.Shared.Tag;
using Content.Shared.Weapons.Melee.Events;
using Robust.Shared.Collections;
@@ -29,8 +33,11 @@ public sealed class SolutionInjectOnCollideSystem : EntitySystem
base.Initialize();
SubscribeLocalEvent<SolutionInjectOnProjectileHitComponent, ProjectileHitEvent>(HandleProjectileHit);
SubscribeLocalEvent<SolutionInjectOnEmbedComponent, EmbedEvent>(HandleEmbed);
//WWDP edit start
SubscribeLocalEvent<MeleeChemicalInjectorComponent, MeleeHitEvent>(HandleMeleeHit,
after: new[] {typeof(MeleeBlockSystem)}); // WD EDIT
after: new[] {typeof(MeleeBlockSystem)});
SubscribeLocalEvent<SolutionInjectOnTriggerComponent, StepTriggerAttemptEvent>(HandleTrigger);
//WWDP edit end
}
private void HandleProjectileHit(Entity<SolutionInjectOnProjectileHitComponent> entity, ref ProjectileHitEvent args)
@@ -43,6 +50,13 @@ public sealed class SolutionInjectOnCollideSystem : EntitySystem
DoInjection((entity.Owner, entity.Comp), args.Embedded, args.Shooter);
}
//WWDP edit start
private void HandleTrigger(Entity<SolutionInjectOnTriggerComponent> entity, ref StepTriggerAttemptEvent args)
{
DoInjection((entity.Owner, entity.Comp), args.Tripper, args.Source);
}
//WWDP edit end
private void HandleMeleeHit(Entity<MeleeChemicalInjectorComponent> entity, ref MeleeHitEvent args)
{
if (args.Handled) // WD EDIT