Ed
|
5f7600b6a2
|
Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.IntegrationTests/Tests/CargoTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
# Content.Shared/Storage/Components/EntityStorageComponent.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/game_presets.yml
|
2025-09-08 13:12:50 +03:00 |
|