Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

Events

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

VirtualItem

Pulled item interaction fix (#34587)

2025-02-11 14:29:37 +11:00

InventoryComponent.cs

Borg type switching. (#32586)

2024-11-14 11:08:35 -06:00

InventorySystem.cs

Reflection refactor (#19253)

2023-08-25 12:48:27 +10:00

InventorySystem.Equip.cs

Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync

2024-11-23 01:48:24 +03:00

InventorySystem.Helpers.cs

Fix references to obsolete TryGetContainingContainer override (#34912)

2025-02-11 06:08:17 +01:00

InventorySystem.Relay.cs

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

InventorySystem.Slots.cs

Borg type switching. (#32586)

2024-11-14 11:08:35 -06:00

InventoryTemplatePrototype.cs

Cleanup: Remove redundant prototype name specifications (#35793)

2025-03-19 19:30:31 +01:00

SelfEquipOnlyComponent.cs

Cursed Mask (#29659)

2024-08-10 11:14:58 -04:00

SelfEquipOnlySystem.cs

Cursed Mask (#29659)

2024-08-10 11:14:58 -04:00

SlotFlags.cs

Spellcaster slowdown, mole nerf, new shoulder slot, healing staff (#538)

2024-11-05 19:05:40 +03:00