Morb0 ac51af0830 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json		2024-05-26 13:10:11 +03:00
..
Pair	fix antag selection being evil (#28197)	2024-05-26 01:14:29 -04:00
Tests	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-26 13:10:11 +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	fix antag selection being evil (#28197)	2024-05-26 01:14:29 -04:00
PoolManager.Cvars.cs	New event: Approaching unknown shuttle (#24490)	2024-05-10 04:35:59 -07: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	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