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-12 10:35:30 -04:00
2024-01-29 10:32:42 +11:00
2025-08-13 12:51:46 +02:00
2025-02-24 17:05:59 +11:00
2025-08-25 16:22:32 +03:00
2025-07-25 18:53:01 +02:00
2025-08-04 12:44:29 +03:00
2025-08-08 11:22:34 -04:00
2023-10-19 12:34:31 -07:00
2025-02-23 22:43:14 +01:00
2023-08-02 16:09:08 -05:00
2025-04-19 10:26:56 -04:00