Ed 0285c3896c Merge remote-tracking branch 'space-station-14/master' into 17-04-2024-upstream ...

# Conflicts:
#	Content.Client/Movement/Systems/WaddleAnimationSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Resources/Changelog/Changelog.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Textures/_CP14/Clothing/Masks/pluto-mask.rsi/meta.json
#	Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json
#	Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json
#	Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/meta.json
#	Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/zweichhender.rsi/meta.json

2024-04-17 11:16:24 +03:00

..

Pair

Minor test fixes (#25423)

2024-02-26 16:29:36 -07:00

Tests

Merge remote-tracking branch 'space-station-14/master' into 17-04-2024-upstream

2024-04-17 11:16:24 +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

Reduced Warning Count By 130 For Full Rebuilds (#26518)

2024-03-29 16:28:16 +11:00

PoolManager.Cvars.cs

Fix MapPainter (#22290)

2023-12-10 22:19:26 +11:00

PoolManager.Prototypes.cs

Remove PoolSettings.ExtraPrototypes option (#18678)

2023-08-05 14:16:48 +10:00

PoolManagerTestEventHandler.cs

Remove PoolSettings.ExtraPrototypes option (#18678)

2023-08-05 14:16:48 +10:00

PoolSettings.cs

Split PoolManager into separate classes. (#19370)

2023-08-22 22:14:01 +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