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-09 10:06:26 +10:00
2025-08-25 16:22:32 +03:00
2023-08-22 18:14:33 -07:00
2025-07-07 21:57:05 +02:00
2024-11-06 16:52:08 +03:00
2025-08-25 16:22:32 +03:00
2023-10-29 15:29:30 +11:00
2023-12-22 11:39:29 -08:00
2025-04-27 21:08:34 +10:00
2025-04-27 21:08:34 +10:00
2021-07-29 12:55:37 +02:00
2023-09-16 14:09:51 +10:00
2025-04-27 21:08:34 +10:00
2025-08-06 15:01:49 -07:00
2022-09-15 11:53:17 +10:00
2022-09-15 11:53:17 +10:00