Morb0 d6403daf00 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json		2024-05-11 01:41:28 +03:00
..
Pair	Add NukeOps Test (#27207)	2024-04-24 15:38:43 +10:00
Tests	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-11 01:41:28 +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	New event: Approaching unknown shuttle (#24490)	2024-05-10 04:35:59 -07: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