Vigers Ray e99ff5dc82 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs # Resources/Prototypes/Entities/Structures/Machines/nuke.yml # Resources/migration.yml		2024-12-01 18:21:33 +03:00
..
UI	Localization cooldown/remaining string in alerts (#32282)	2024-09-19 00:21:53 +02:00
ActionEvents.cs	Refactor actions to be entities with components (#19900)	2023-09-08 18:16:05 -07:00
ActionsSystem.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-01 18:21:33 +03:00