VigersRay 47cdabdaed Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/StatusEffect/StatusEffectsSystem.cs # Resources/Audio/Effects/attributions.yml # Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml		2024-09-19 16:09:00 +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-08-28 19:12:01 +03:00