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

Fix Ninja EMP themselves. (#40968)

Browse Source 
* push

* Skibidi toiler

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-10-18 16:56:32 -07:00
committed by GitHub
parent 8837851b00
commit 24216b1bc8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Power/EntitySystems/SharedBatterySystem.cs
View File

@@ -12,12 +12,12 @@ public abstract class SharedBatterySystem : EntitySystem
SubscribeLocalEvent<BatteryComponent, EmpPulseEvent>(OnEmpPulse); SubscribeLocalEvent<BatteryComponent, EmpPulseEvent>(OnEmpPulse);
} }
private void OnEmpPulse(EntityUid uid, BatteryComponent component, ref EmpPulseEvent args) private void OnEmpPulse(Entity<BatteryComponent> entity, ref EmpPulseEvent args)
{ {
args.Affected = true; args.Affected = true;
UseCharge(uid, args.EnergyConsumption, component); UseCharge(entity, args.EnergyConsumption, entity.Comp);
// Apply a cooldown to the entity's self recharge if needed to avoid it immediately self recharging after an EMP. // Apply a cooldown to the entity's self recharge if needed to avoid it immediately self recharging after an EMP.
TrySetChargeCooldown(uid); TrySetChargeCooldown(entity);
} }
public virtual float UseCharge(EntityUid uid, float value, BatteryComponent? battery = null) public virtual float UseCharge(EntityUid uid, float value, BatteryComponent? battery = null)

4
Content.Shared/PowerCell/SharedPowerCellSystem.cs
View File

@@ -74,9 +74,9 @@ public abstract class SharedPowerCellSystem : EntitySystem
RaiseLocalEvent(uid, new PowerCellChangedEvent(true), false); RaiseLocalEvent(uid, new PowerCellChangedEvent(true), false);
} }
private void OnCellEmpAttempt(EntityUid uid, PowerCellComponent component, EmpAttemptEvent args) private void OnCellEmpAttempt(Entity<PowerCellComponent> entity, ref EmpAttemptEvent args)
{ {
var parent = Transform(uid).ParentUid; var parent = Transform(entity).ParentUid;
// relay the attempt event to the slot so it can cancel it // relay the attempt event to the slot so it can cancel it
if (HasComp<PowerCellSlotComponent>(parent)) if (HasComp<PowerCellSlotComponent>(parent))
RaiseLocalEvent(parent, ref args); RaiseLocalEvent(parent, ref args);