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-07-07 21:57:05 +02:00
2025-04-16 13:02:41 +02:00
2024-06-05 16:23:23 -04:00
2025-06-21 11:23:19 -04:00
2025-06-26 16:50:49 -07:00
2025-06-26 16:50:49 -07:00
2025-06-26 16:50:49 -07:00
2024-06-05 16:23:23 -04:00
2025-08-22 18:46:28 +03:00
2025-08-12 15:21:42 -07:00
2024-06-05 16:23:23 -04:00
2022-05-13 17:59:03 +10:00
2024-08-25 22:18:42 +10:00
2025-05-20 01:08:55 -04:00