crystall-punk-14

Files

Ed 3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml

2025-09-15 13:50:49 +03:00

Pair

MapRenderer code fixes (#38357 )

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

Tests

Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

2025-09-15 13:50:49 +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 )