Ed c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml

2024-08-19 19:06:38 +03:00

..

Pair

Add random seed options to tests (#30735)

2024-08-09 15:25:43 +10:00

Tests

Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream

2024-08-19 19:06:38 +03:00

Content.IntegrationTests.csproj

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

2024-02-23 15:02:59 +11:00

DummyParallaxManager.cs

Update content vectors to numerics (#17759)

2023-07-08 14:08:32 +10:00

GlobalUsings.cs

Fix content.integration tests warnings (#17817)

2023-07-06 14:54:25 +10:00

PoolManager.cs

Add random seed options to tests (#30735)

2024-08-09 15:25:43 +10:00

PoolManager.Cvars.cs

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

PoolManager.Prototypes.cs

Update component query benchmarks (#27967)

2024-05-19 11:55:10 +10:00

PoolManagerTestEventHandler.cs

Update component query benchmarks (#27967)

2024-05-19 11:55:10 +10:00

PoolSettings.cs

Add random seed options to tests (#30735)

2024-08-09 15:25:43 +10:00

PoolTestLogHandler.cs

Add some tests and fix some miscellaneous bugs (#22836)

2023-12-28 10:05:20 +11:00

TestPrototypesAttribute.cs

Fix test prototypes fields being marked as unused (#20853)

2023-10-09 00:19:32 -07:00