diff --git a/Content.Server/Procedural/DungeonSystem.Rooms.cs b/Content.Server/Procedural/DungeonSystem.Rooms.cs index 7ccf875d95f..43c7e225bda 100644 --- a/Content.Server/Procedural/DungeonSystem.Rooms.cs +++ b/Content.Server/Procedural/DungeonSystem.Rooms.cs @@ -185,6 +185,14 @@ public void SpawnRoom( var anchored = templateXform.Anchored; _transform.SetLocalRotation(ent, childRot, childXform); + // ADT - чиним тестер + if (grid == null || gridUid == childXform.GridUid) + { + Log.Debug("Спавнер данжа находится в космосе?"); + return; + } + // ADT - конец фикса + // If the templated entity was anchored then anchor us too. if (anchored && !childXform.Anchored) _transform.AnchorEntity((ent, childXform), (gridUid, grid)); diff --git a/Content.Server/RandomMetadata/RandomMetadataSystem.cs b/Content.Server/RandomMetadata/RandomMetadataSystem.cs index e287b54c8f7..a2620437a5f 100644 --- a/Content.Server/RandomMetadata/RandomMetadataSystem.cs +++ b/Content.Server/RandomMetadata/RandomMetadataSystem.cs @@ -55,6 +55,10 @@ public string GetRandomFromSegments(List segments, string? separator) else if (_prototype.TryIndex(segment, out var proto)) { var random = _random.Pick(proto.Values); + // ADT - фиксики тестов + if (random == null) + continue; + // ADT - конец фикса if (Loc.TryGetString(random, out var localizedSegment)) outputSegments.Add(localizedSegment); else