VigersRay 31b2d24e30 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/MagicMirror/MagicMirrorComponent.cs # Resources/Prototypes/Catalog/Fills/Lockers/misc.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png # Resources/migration.yml		2024-07-31 03:54:09 +03:00
..
Pair	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
Tests	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-31 03:54:09 +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	Make tests automatically reset modified cvars (#28219)	2024-05-31 12:44:35 +10:00
PoolManager.Cvars.cs	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10: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