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-08-22 18:14:33 -07:00
2025-06-09 10:36:04 -04:00
2023-08-22 18:14:33 -07:00
2024-02-26 14:36:19 +11:00
2025-06-09 10:36:04 -04:00
2025-08-06 12:53:38 -04:00
2025-07-20 15:45:59 +03:00
2023-08-22 18:14:33 -07:00
2023-10-31 13:39:12 -07:00
2023-09-05 07:55:10 +10:00