Morb0 3ab6d3ef71 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/VoiceMask/VoiceMaskComponent.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Command/captain.yml # Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml # Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/blue_circuit.png # Resources/Textures/Tiles/green_circuit.png # Resources/Textures/Tiles/steel.png		2024-10-04 19:47:54 +03:00
..
Pair	Replace obsolete Tile Access methods (#32508)	2024-09-29 01:27:47 +02:00
Tests	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-10-04 19:47:54 +03:00
AssemblyInfo.cs	Test parallelization stuff. (#31650)	2024-09-01 03:28:30 +02: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	Test parallelization stuff. (#31650)	2024-09-01 03:28:30 +02:00
PoolManager.Cvars.cs	Add interaction rate limits (#32527)	2024-09-29 22:19:00 +10:00
PoolManager.Prototypes.cs	Update component query benchmarks (#27967)	2024-05-19 11:55:10 +10:00
PoolManagerTestEventHandler.cs	Test parallelization stuff. (#31650)	2024-09-01 03:28:30 +02: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