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-05-30 19:53:56 -04:00
2024-12-16 13:24:00 +01:00
2025-08-13 15:45:51 -07:00
2025-08-25 02:03:24 +03:00
2024-02-02 00:33:57 +11:00
2025-08-13 01:00:36 +02:00
2025-03-17 11:54:43 +03:00
2025-03-17 11:54:43 +03:00
2024-08-28 10:57:12 +10:00
2025-01-29 23:05:47 -05:00