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

Commit 2d1ffb7

Browse files
authored
Merge pull request RonRonstation#307 from arenaconspiracy/feintstation
NT-TE Feint Station
2 parents 8910aca + 6af7ca7 commit 2d1ffb7

5 files changed

Lines changed: 124847 additions & 3 deletions

File tree

Content.Benchmarks/MapLoadBenchmark.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +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" }; // Ronstation edit - Saltern2, Cluster2, and Atlas2
52-
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
5352
[ParamsSource(nameof(MapsSource))]
5453
public string Map;
5554

Content.IntegrationTests/Tests/PostMapInitTest.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public sealed class PostMapInitTest
7777
"Exo",
7878
"Saltern2",
7979
"Cluster2",
80-
"Atlas2"
80+
"Atlas2",
81+
"Feint"
8182
};
8283

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

0 commit comments

Comments
 (0)