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-07-18 18:29:15 +03:00
2025-07-08 00:40:30 +03:00
2025-08-25 16:22:32 +03:00
2020-02-04 20:42:36 +01:00
2024-07-31 13:28:03 +03:00
2025-07-18 16:46:25 +03:00
2025-07-26 14:55:03 +03:00
2024-08-29 18:23:33 +03:00