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-12-11 14:49:02 +03:00
2025-07-23 17:18:19 +02:00
2025-08-04 13:10:54 -07:00
2025-08-05 17:13:04 +02:00
2025-07-03 18:11:31 -07:00
2025-05-14 20:06:37 +02:00
2024-01-17 01:49:21 -08:00
2025-07-03 18:00:34 +02:00
2025-05-23 14:12:20 -04:00
2025-06-01 22:01:43 -07:00