juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ed-10-06-2025-upstream-sync

Browse Source
This commit is contained in:
Ed
2025-06-15 21:44:16 +03:00
parent 5328714752 5046ad1aeb
commit 62cd6bfe9b
230 changed files with 4770 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Inventory/InventorySystem.Relay.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared._CP14.MagicEssence;
using Content.Shared._CP14.MagicSpell.Events;
using Content.Shared._CP14.Skill;
using Content.Shared.Armor;
using Content.Shared.Atmos;
using Content.Shared.Chat;
@@ -39,6 +40,7 @@ public partial class InventorySystem
//CP14 Relayed events
SubscribeLocalEvent<InventoryComponent, CP14MagicEssenceScanEvent>(RelayInventoryEvent);
SubscribeLocalEvent<InventoryComponent, CP14CalculateManacostEvent>(RelayInventoryEvent);
SubscribeLocalEvent<InventoryComponent, CP14SkillScanEvent>(RelayInventoryEvent);
//CP14 End
SubscribeLocalEvent<InventoryComponent, DamageModifyEvent>(RelayInventoryEvent);