Morb0 64f1e79a5a Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/tips.yml # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/manifest.yml		2023-09-28 17:32:44 +03:00
..
Pair	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
Tests	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-28 17:32:44 +03:00
Content.IntegrationTests.csproj	Fix content.integration tests warnings (#17817)	2023-07-06 14:54:25 +10: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	Move minds, roles, jobs and objectives to shared (#19679)	2023-08-30 21:46:11 -07:00
PoolManager.Cvars.cs	Split PoolManager into separate classes. (#19370)	2023-08-22 22:14:01 +10: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	Fix content.integration tests warnings (#17817)	2023-07-06 14:54:25 +10:00
TestPrototypesAttribute.cs	Remove PoolSettings.ExtraPrototypes option (#18678)	2023-08-05 14:16:48 +10:00