Morb0 c44d509701 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png		2024-03-29 11:43:30 +03:00
..
Pair	Minor test fixes (#25423)	2024-02-26 16:29:36 -07:00
Tests	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-29 11:43:30 +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