Ed
b8b17f7b8a
Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Nutrition/Components/FoodComponent.cs
# Content.Shared/Speech/ListenEvent.cs
# Resources/Prototypes/Entities/Effects/admin_triggers.yml
2025-08-25 16:22:32 +03:00
..
2024-05-08 23:35:11 -07:00
2023-10-10 09:32:10 +03:00
2025-02-25 22:34:07 -07:00
2023-10-27 22:33:18 -04:00
2025-04-20 17:34:19 -04:00
2023-12-24 17:20:55 -08:00
2025-08-08 17:58:46 +02:00
2025-03-17 11:54:43 +03:00
2025-04-10 20:45:12 +10:00
2023-12-24 02:58:28 -07:00
2024-05-08 23:35:11 -07:00
2025-05-19 14:53:00 +03:00
2024-08-08 16:17:50 +03:00
2023-10-10 09:32:10 +03:00
2025-03-17 11:54:43 +03:00