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
..
2023-10-04 10:30:11 -04:00
2025-05-18 17:47:35 +10:00
2025-03-08 16:07:42 +11:00
2025-05-30 19:53:56 -04:00
2025-08-11 23:06:28 +02:00
2025-08-25 02:03:24 +03:00
2024-08-28 10:57:12 +10:00
2024-08-28 10:57:12 +10:00
2025-08-11 23:06:28 +02:00
2025-08-11 23:06:28 +02:00
2023-09-03 22:31:10 -07:00
2025-02-23 18:23:00 +11:00
2023-09-03 22:31:10 -07:00
2023-09-03 22:31:10 -07:00
2025-04-17 21:59:41 -04:00
2023-09-03 22:31:10 -07:00
2024-08-25 22:18:42 +10:00
2025-03-08 16:07:42 +11:00
2025-03-08 16:07:42 +11:00
2025-08-25 02:03:24 +03:00
2025-02-16 19:35:32 +11:00
2024-04-29 13:22:11 +10:00