Skip to content
This repository was archived by the owner on Dec 23, 2025. It is now read-only.

Commit 7c572ba

Browse files
authored
Merge pull request RonRonstation#294 from arenaconspiracy/atlasthree
NT-ACS Atlas Assembly IIV
2 parents 2d1ffb7 + 94a9b74 commit 7c572ba

4 files changed

Lines changed: 74769 additions & 2 deletions

File tree

Content.Benchmarks/MapLoadBenchmark.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public async Task Cleanup()
4848
PoolManager.Shutdown();
4949
}
5050

51-
public static readonly string[] MapsSource = { "Empty", "Saltern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Convex", "Saltern2", "Cluster2", "Atlas2", "Feint"}; // Ronstation edit - Saltern2, Cluster2, Atlas2, Feint
51+
public static readonly string[] MapsSource = { "Empty", "Saltern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Convex", "Saltern2", "Cluster2", "Atlas2", "Atlas3", "Feint"}; // Ronstation edit - Saltern2, Cluster2, Atlas2, Atlas3, Feint
5252
[ParamsSource(nameof(MapsSource))]
5353
public string Map;
5454

Content.IntegrationTests/Tests/PostMapInitTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public sealed class PostMapInitTest
7878
"Saltern2",
7979
"Cluster2",
8080
"Atlas2",
81-
"Feint"
81+
"Atlas3",
82+
"Feint"
8283
};
8384

8485
private static readonly ProtoId<EntityCategoryPrototype> DoNotMapCategory = "DoNotMap";

0 commit comments

Comments
 (0)