crystall-punk-14

Files

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

Pair

MapRenderer code fixes (#38357 )

2025-06-26 14:47:39 +02:00

Tests

Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync

2025-08-25 16:22:32 +03:00

AssemblyInfo.cs

Reduce LevelOfParallelism to 2 for integration tests (#39566 )

2025-08-11 12:43:57 -07:00

Content.IntegrationTests.csproj

Switch project files to C# 12. (#25487 )