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-04-20 17:01:50 -04:00
2025-04-21 14:25:22 -04:00
2025-07-07 21:57:05 +02:00
2025-04-20 17:01:50 -04:00
2025-07-21 11:27:53 +03:00
2024-05-12 09:18:21 +10:00
2025-03-17 11:54:43 +03:00
2024-07-24 09:11:31 +03:00
2022-09-22 17:19:00 -05:00
2025-07-04 22:55:45 +02:00
2023-01-25 08:29:41 -08:00
2025-08-06 21:55:49 +02:00
2023-09-28 16:20:29 -07:00
2025-08-04 12:44:29 +03:00