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

..

Components

Death Nettle changes (#25253)

2025-03-29 10:35:16 +01:00

Events

Upstream sync (#846)

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

ForceSay

Upstream sync (#846)

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

Prototypes

Cleanup: Remove redundant prototype name specifications (#35793)

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

Systems

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

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

DamageModifierSet.cs

fix cauterization (#23264)

2024-01-01 00:08:25 -08:00

DamageSpecifier.cs

Only auto-enable internals when necessary (#28248)

2024-05-31 12:28:11 +10:00

DamageSpecifierDictionarySerializer.cs

Add SaveLoadSavePrototype test (#18859)

2023-08-08 17:27:16 +10:00

DamageVisualizerKeys.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10:00