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

Revert "Fix unintentional inventory relayed event handling " (#12182)

Browse Source
This commit is contained in:
Emisse
2022-10-24 09:06:04 -06:00
committed by GitHub
parent 145471be2d
commit 80fd37041f
9 changed files with 15 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Electrocution/SharedElectrocutionSystem.cs
View File

@@ -1,4 +1,3 @@
using Content.Shared.Inventory;
using Robust.Shared.GameStates;
namespace Content.Shared.Electrocution
@@ -10,8 +9,6 @@ namespace Content.Shared.Electrocution
base.Initialize();
SubscribeLocalEvent<InsulatedComponent, ElectrocutionAttemptEvent>(OnInsulatedElectrocutionAttempt);
// as long as legally distinct electric-mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
SubscribeLocalEvent<InsulatedComponent, InventoryRelayedEvent<ElectrocutionAttemptEvent>>((e, c, ev) => OnInsulatedElectrocutionAttempt(e, c, ev.Args));
SubscribeLocalEvent<InsulatedComponent, ComponentGetState>(OnInsulatedGetState);
SubscribeLocalEvent<InsulatedComponent, ComponentHandleState>(OnInsulatedHandleState);
}