diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs index 7b3c994302..cc5d99e8b2 100644 --- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs @@ -104,8 +104,6 @@ public sealed class NukeOpsTest // Maps now exist Assert.That(entMan.Count(), Is.GreaterThan(0)); Assert.That(entMan.Count(), Is.GreaterThan(0)); - Assert.That(entMan.Count(), Is.EqualTo(2)); // The main station & nukie station - Assert.That(entMan.Count(), Is.GreaterThan(3)); // Each station has at least 1 grid, plus some shuttles Assert.That(entMan.Count(), Is.EqualTo(1)); // And we now have nukie related components @@ -159,7 +157,6 @@ public sealed class NukeOpsTest { Assert.That(entMan.EntityExists(grid)); Assert.That(entMan.HasComponent(grid)); - Assert.That(entMan.HasComponent(grid)); } Assert.That(entMan.EntityExists(ruleComp.TargetStation)); @@ -180,12 +177,7 @@ public sealed class NukeOpsTest } } - Assert.That(entMan.EntityExists(nukieStationEnt)); - var nukieStation = entMan.GetComponent(nukieStationEnt!.Value); - - Assert.That(entMan.EntityExists(nukieStation.Station)); - Assert.That(nukieStation.Station, Is.Not.EqualTo(ruleComp.TargetStation)); - + Assert.That(!entMan.EntityExists(nukieStationEnt)); // its not supposed to be a station! Assert.That(server.MapMan.MapExists(gridsRule.Map)); var nukieMap = mapSys.GetMap(gridsRule.Map!.Value); @@ -195,7 +187,6 @@ public sealed class NukeOpsTest Assert.That(targetMap, Is.Not.EqualTo(nukieMap)); Assert.That(entMan.GetComponent(player).MapUid, Is.EqualTo(nukieMap)); - Assert.That(entMan.GetComponent(nukieStationEnt.Value).MapUid, Is.EqualTo(nukieMap)); Assert.That(entMan.GetComponent(nukieShuttlEnt).MapUid, Is.EqualTo(nukieMap)); // The maps are all map-initialized, including the player @@ -209,7 +200,6 @@ public sealed class NukeOpsTest Assert.That(LifeStage(player), Is.GreaterThan(EntityLifeStage.Initialized)); Assert.That(LifeStage(nukieMap), Is.GreaterThan(EntityLifeStage.Initialized)); Assert.That(LifeStage(targetMap), Is.GreaterThan(EntityLifeStage.Initialized)); - Assert.That(LifeStage(nukieStationEnt.Value), Is.GreaterThan(EntityLifeStage.Initialized)); Assert.That(LifeStage(nukieShuttlEnt), Is.GreaterThan(EntityLifeStage.Initialized)); Assert.That(LifeStage(ruleComp.TargetStation), Is.GreaterThan(EntityLifeStage.Initialized)); diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index cd14bfdc90..d1997c68ba 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -30,8 +30,7 @@ namespace Content.IntegrationTests.Tests private static readonly string[] NoSpawnMaps = { "CentComm", - "Dart", - "NukieOutpost" + "Dart" }; private static readonly string[] Grids = @@ -54,7 +53,6 @@ namespace Content.IntegrationTests.Tests "Bagel", "Origin", "CentComm", - "NukieOutpost", "Box", "Europa", "Saltern", diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index c957e0eb96..ca087c46ed 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -171,7 +171,7 @@ namespace Content.Server.GameTicking var gridIds = _map.LoadMap(targetMapId, ev.GameMap.MapPath.ToString(), ev.Options); - _metaData.SetEntityName(_mapManager.GetMapEntityId(targetMapId), $"station map - {map.MapName}"); + _metaData.SetEntityName(_mapManager.GetMapEntityId(targetMapId), map.MapName); var gridUids = gridIds.ToList(); RaiseLocalEvent(new PostGameMapLoad(map, targetMapId, gridUids, stationName)); diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs index 2a67e62e3f..5f49557bed 100644 --- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs @@ -483,7 +483,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem if (!Resolve(ent, ref ent.Comp, false)) return null; - return ent.Comp.MapGrids.Where(e => HasComp(e) && !HasComp(e)).FirstOrNull(); + return ent.Comp.MapGrids.Where(e => !HasComp(e)).FirstOrNull(); } /// diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml index 20fb68f2cc..2e7f60c91d 100644 --- a/Resources/Maps/Nonstations/nukieplanet.yml +++ b/Resources/Maps/Nonstations/nukieplanet.yml @@ -1625,8 +1625,6 @@ entities: - type: GasTileOverlay - type: SpreaderGrid - type: GridPathfinding - - type: BecomesStation - id: SyndicateOutpost - uid: 1295 components: - type: MetaData @@ -11002,13 +11000,6 @@ entities: - type: Transform pos: 18.918644,6.663283 parent: 104 -- proto: SyndicateMicrowave - entities: - - uid: 10 - components: - - type: Transform - pos: 13.5,-6.5 - parent: 104 - proto: KitchenReagentGrinder entities: - uid: 1257 @@ -13234,6 +13225,13 @@ entities: - SurveillanceCameraEntertainment nameSet: True id: Weeh +- proto: SyndicateMicrowave + entities: + - uid: 10 + components: + - type: Transform + pos: 13.5,-6.5 + parent: 104 - proto: SyndicatePersonalAI entities: - uid: 160 diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index d5cd6a3f97..3e4ea6d7b3 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -73,7 +73,7 @@ parent: BaseGameRule id: BaseNukeopsRule components: - - type: RandomMetadata #this generates the random operation name cuz it's cool. + - type: RandomMetadata #this generates the random operation name cuz it's cool. nameSegments: - operationPrefix - operationSuffix @@ -95,7 +95,7 @@ - type: GameRule minPlayers: 20 - type: LoadMapRule - gameMap: NukieOutpost + mapPath: /Maps/Nonstations/nukieplanet.yml - type: AntagSelection selectionTime: PrePlayerSpawn definitions: diff --git a/Resources/Prototypes/Maps/syndicate.yml b/Resources/Prototypes/Maps/syndicate.yml deleted file mode 100644 index abb63126d9..0000000000 --- a/Resources/Prototypes/Maps/syndicate.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: gameMap - id: NukieOutpost - mapName: Nukie Outpost - mapPath: /Maps/Nonstations/nukieplanet.yml - minPlayers: 0 - stations: - SyndicateOutpost: - stationProto: StandardNukieOutpost - components: - - type: StationNameSetup - mapNameTemplate: "Nukie Outpost"