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
..
2025-08-25 16:22:32 +03:00
2025-01-21 23:57:12 +03:00
2025-08-07 23:57:58 +03:00
2025-06-21 11:06:49 +02:00
2025-05-28 12:50:31 -04:00
2025-06-10 11:33:34 +03:00
2025-07-21 11:27:53 +03:00
2025-02-25 17:40:39 +01:00
2022-10-22 10:51:03 +11:00
2025-07-22 12:29:17 +02:00
2023-12-23 01:13:45 +11:00
2025-08-08 15:27:46 -04:00
2025-05-20 13:07:52 +02:00
2023-03-12 21:02:14 -04:00
2025-06-09 10:36:04 -04:00
2025-05-28 12:50:31 -04:00
2025-08-12 15:21:42 -07:00
2025-08-12 15:21:42 -07:00
2025-07-07 21:57:05 +02:00
2025-08-12 15:21:42 -07:00
2025-06-03 14:39:39 +03:00
2024-01-19 09:25:40 +11:00
2025-03-21 00:57:04 +11:00
2025-08-04 13:10:54 -07:00
2025-05-28 12:50:31 -04:00
2023-04-02 01:00:48 +11:00
2025-07-22 12:29:17 +02:00