]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
projects / space-station-14.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0d33e61)
RoomSpawner mask (#33110)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Wed, 12 Feb 2025 12:47:48 +0000 (15:47 +0300)
committerGitHub <noreply@github.com>
Wed, 12 Feb 2025 12:47:48 +0000 (15:47 +0300)
* RoolFill can now spaw rooms with any size

* tile ignoring

* upgrade interior

* simplify

* Update DungeonSystem.Rooms.cs

* center rooms

* Update RoomFillComponent.cs

* Update RoomFillComponent.cs

* Update DungeonSystem.Rooms.cs

* Remove roomfillcoponent from integration test

* Update EntityTest.cs

* remove nullable size, replaced with minsize and maxsize

* clear existing logic refactor

* delete this one

Content.IntegrationTests/Tests/EntityTest.cs patch | blob | history
Content.Server/Procedural/DungeonSystem.Rooms.cs patch | blob | history
Content.Server/Procedural/RoomFillComponent.cs patch | blob | history
Content.Server/Procedural/RoomFillSystem.cs patch | blob | history
Content.Shared/Procedural/DungeonRoomPrototype.cs patch | blob | history
Resources/Maps/Dungeon/vgroidinterior.yml patch | blob | history
Resources/Prototypes/Entities/Markers/rooms.yml patch | blob | history
Resources/Prototypes/Procedural/Themes/vgroidinterior.yml patch | blob | history

diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 5dba8ac6583005f33375532e382fa1a253c17256..6b8b59a12cb94471837d566cbdd9de63b959e7fb 100644 (file)
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -39,6 +39,7 @@ namespace Content.IntegrationTests.Tests
                     .Where(p => !p.Abstract)
                     .Where(p => !pair.IsTestPrototype(p))
                     .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
+                    .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others
                     .Select(p => p.ID)
                     .ToList();
 
@@ -101,6 +102,7 @@ namespace Content.IntegrationTests.Tests
                     .Where(p => !p.Abstract)
                     .Where(p => !pair.IsTestPrototype(p))
                     .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
+                    .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others
                     .Select(p => p.ID)
                     .ToList();
                 foreach (var protoId in protoIds)
@@ -341,6 +343,7 @@ namespace Content.IntegrationTests.Tests
                 "DebugExceptionInitialize",
                 "DebugExceptionStartup",
                 "GridFill",
+                "RoomFill",
                 "Map", // We aren't testing a map entity in this test
                 "MapGrid",
                 "Broadphase",
diff --git a/Content.Server/Procedural/DungeonSystem.Rooms.cs b/Content.Server/Procedural/DungeonSystem.Rooms.cs
index 20d64acff15e7cef1e0fe16ef0bf5e9eff9cb3a4..f74868bb52af10bd0ce8fca9812578429c7711b4 100644 (file)
--- a/Content.Server/Procedural/DungeonSystem.Rooms.cs
+++ b/Content.Server/Procedural/DungeonSystem.Rooms.cs
@@ -17,9 +17,20 @@ public sealed partial class DungeonSystem
     private readonly List<DungeonRoomPrototype> _availableRooms = new();
 
     /// <summary>
-    /// Gets a random dungeon room matching the specified area and whitelist.
+    /// Gets a random dungeon room matching the specified area, whitelist and size.
     /// </summary>
     public DungeonRoomPrototype? GetRoomPrototype(Vector2i size, Random random, EntityWhitelist? whitelist = null)
+    {
+        return GetRoomPrototype(random, whitelist, minSize: size, maxSize: size);
+    }
+
+    /// <summary>
+    /// Gets a random dungeon room matching the specified area and whitelist and size range
+    /// </summary>
+    public DungeonRoomPrototype? GetRoomPrototype(Random random,
+        EntityWhitelist? whitelist = null,
+        Vector2i? minSize = null,
+        Vector2i? maxSize = null)
     {
         // Can never be true.
         if (whitelist is { Tags: null })
@@ -31,7 +42,10 @@ public sealed partial class DungeonSystem
 
         foreach (var proto in _prototype.EnumeratePrototypes<DungeonRoomPrototype>())
         {
-            if (proto.Size != size)
+            if (minSize is not null && (proto.Size.X < minSize.Value.X || proto.Size.Y < minSize.Value.Y))
+                continue;
+
+            if (maxSize is not null && (proto.Size.X > maxSize.Value.X || proto.Size.Y > maxSize.Value.Y))
                 continue;
 
             if (whitelist == null)
@@ -115,29 +129,6 @@ public sealed partial class DungeonSystem
 
         var finalRoomRotation = roomTransform.Rotation();
 
-        // go BRRNNTTT on existing stuff
-        if (clearExisting)
-        {
-            var gridBounds = new Box2(Vector2.Transform(-room.Size/2, roomTransform), Vector2.Transform(room.Size/2, roomTransform));
-            _entitySet.Clear();
-            // Polygon skin moment
-            gridBounds = gridBounds.Enlarged(-0.05f);
-            _lookup.GetLocalEntitiesIntersecting(gridUid, gridBounds, _entitySet, LookupFlags.Uncontained);
-
-            foreach (var templateEnt in _entitySet)
-            {
-                Del(templateEnt);
-            }
-
-            if (TryComp(gridUid, out DecalGridComponent? decalGrid))
-            {
-                foreach (var decal in _decals.GetDecalsIntersecting(gridUid, gridBounds, decalGrid))
-                {
-                    _decals.RemoveDecal(gridUid, decal.Index, decalGrid);
-                }
-            }
-        }
-
         var roomCenter = (room.Offset + room.Size / 2f) * grid.TileSize;
         var tileOffset = -roomCenter + grid.TileSizeHalfVector;
         _tiles.Clear();
@@ -156,7 +147,22 @@ public sealed partial class DungeonSystem
                 if (!clearExisting && reservedTiles?.Contains(rounded) == true)
                     continue;
 
+                if (room.IgnoreTile is not null)
+                {
+                    if (_maps.TryGetTileDef(templateGrid, indices, out var tileDef) && room.IgnoreTile == tileDef.ID)
+                        continue;
+                }
+
                 _tiles.Add((rounded, tileRef.Tile));
+
+                if (clearExisting)
+                {
+                    var anchored = _maps.GetAnchoredEntities((gridUid, grid), rounded);
+                    foreach (var ent in anchored)
+                    {
+                        QueueDel(ent);
+                    }
+                }
             }
         }
 
diff --git a/Content.Server/Procedural/RoomFillComponent.cs b/Content.Server/Procedural/RoomFillComponent.cs
index 50d0fa7c0adcfd6552c9d9bd41eedb46a8692c71..d4f4078d93c179730ad46a74badf2c2fe53e769f 100644 (file)
--- a/Content.Server/Procedural/RoomFillComponent.cs
+++ b/Content.Server/Procedural/RoomFillComponent.cs
@@ -1,6 +1,4 @@
-using Content.Shared.Procedural;
 using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Procedural;
 
@@ -18,20 +16,26 @@ public sealed partial class RoomFillComponent : Component
     public bool Rotation = true;
 
     /// <summary>
-    /// Size of the room to fill.
+    /// Min size of the possible selected room.
     /// </summary>
-    [DataField(required: true)]
-    public Vector2i Size;
+    [DataField]
+    public Vector2i MinSize = new (3, 3);
+
+    /// <summary>
+    /// Max size of the possible selected room.
+    /// </summary>
+    [DataField]
+    public Vector2i MaxSize = new (10, 10);
 
     /// <summary>
     /// Rooms allowed for the marker.
     /// </summary>
     [DataField]
     public EntityWhitelist? RoomWhitelist;
-    
+
     /// <summary>
     /// Should any existing entities / decals be bulldozed first.
     /// </summary>
     [DataField]
-    public bool ClearExisting;
+    public bool ClearExisting = true;
 }
diff --git a/Content.Server/Procedural/RoomFillSystem.cs b/Content.Server/Procedural/RoomFillSystem.cs
index b539cc9780ef21e7adbb8028147044d4dd0cb07c..f4ccab23673584afc6383995afa7bcbb19cf4aa9 100644 (file)
--- a/Content.Server/Procedural/RoomFillSystem.cs
+++ b/Content.Server/Procedural/RoomFillSystem.cs
@@ -15,16 +15,12 @@ public sealed class RoomFillSystem : EntitySystem
 
     private void OnRoomFillMapInit(EntityUid uid, RoomFillComponent component, MapInitEvent args)
     {
-        // Just test things.
-        if (component.Size == Vector2i.Zero)
-            return;
-
         var xform = Transform(uid);
 
         if (xform.GridUid != null)
         {
             var random = new Random();
-            var room = _dungeon.GetRoomPrototype(component.Size, random, component.RoomWhitelist);
+            var room = _dungeon.GetRoomPrototype(random, component.RoomWhitelist, component.MinSize, component.MaxSize);
 
             if (room != null)
             {
@@ -32,7 +28,7 @@ public sealed class RoomFillSystem : EntitySystem
                 _dungeon.SpawnRoom(
                     xform.GridUid.Value,
                     mapGrid,
-                    _maps.LocalToTile(xform.GridUid.Value, mapGrid, xform.Coordinates),
+                    _maps.LocalToTile(xform.GridUid.Value, mapGrid, xform.Coordinates) - new Vector2i(room.Size.X/2,room.Size.Y/2),
                     room,
                     random,
                     null,
diff --git a/Content.Shared/Procedural/DungeonRoomPrototype.cs b/Content.Shared/Procedural/DungeonRoomPrototype.cs
index 74fa4b36e3c7900a87b64d6e3ac4d3db8f502b38..418e40f7be231e8258faa89cd7f6574dbf2feb1c 100644 (file)
--- a/Content.Shared/Procedural/DungeonRoomPrototype.cs
+++ b/Content.Shared/Procedural/DungeonRoomPrototype.cs
@@ -1,6 +1,6 @@
+using Content.Shared.Maps;
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Procedural;
@@ -10,18 +10,28 @@ public sealed partial class DungeonRoomPrototype : IPrototype
 {
     [IdDataField] public string ID { get; } = string.Empty;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("tags", customTypeSerializer:typeof(PrototypeIdListSerializer<TagPrototype>))]
-    public List<string> Tags = new();
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public List<ProtoId<TagPrototype>> Tags = new();
 
-    [DataField("size", required: true)] public Vector2i Size;
+    [DataField(required: true)]
+    public Vector2i Size;
 
     /// <summary>
     /// Path to the file to use for the room.
     /// </summary>
-    [DataField("atlas", required: true)] public ResPath AtlasPath;
+    [DataField("atlas", required: true)]
+    public ResPath AtlasPath;
 
     /// <summary>
     /// Tile offset into the atlas to use for the room.
     /// </summary>
-    [DataField("offset", required: true)] public Vector2i Offset;
+    [DataField(required: true)]
+    public Vector2i Offset;
+
+    /// <summary>
+    /// These tiles will be ignored when copying from the atlas into the actual game,
+    /// allowing you to make rooms of irregular shapes that blend seamlessly into their surroundings
+    /// </summary>
+    [DataField]
+    public ProtoId<ContentTileDefinition>? IgnoreTile;
 }
diff --git a/Resources/Maps/Dungeon/vgroidinterior.yml b/Resources/Maps/Dungeon/vgroidinterior.yml
index 2287b87e9e2f76a9d9f552410143b747b6600bb0..c0964711264f9c2d1634a55801f8dfabd3b185c9 100644 (file)
--- a/Resources/Maps/Dungeon/vgroidinterior.yml
+++ b/Resources/Maps/Dungeon/vgroidinterior.yml
@@ -35,11 +35,11 @@ entities:
           version: 6
         0,0:
           ind: 0,0
-          tiles: AgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABgAAAAAAAQAAAAAAAwAAAAAABgAAAAAAAwAAAAAABgAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAAwAAAAAABgAAAAAAAQAAAAAABgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABgAAAAAAAQAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAABAAAAAAAAwAAAAAABAAAAAAABgAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAABgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABgAAAAAAAQAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAA
+          tiles: UgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAABAAAAAAAAwAAAAAABAAAAAAAUgAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAABAAAAAAABAAAAAAABAAAAAAA
           version: 6
         0,1:
           ind: 0,1
-          tiles: BgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAABgAAAAAAAwAAAAAABgAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAA
+          tiles: UgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAUgAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -59,11 +59,11 @@ entities:
           version: 6
         1,0:
           ind: 1,0
-          tiles: BAAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAABwAAAAAACAAAAAAABwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAABwAAAAAABwAAAAAACAAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAACAAAAAAABwAAAAAABwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAABgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: BAAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAABwAAAAAACAAAAAAABwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAABwAAAAAABwAAAAAACAAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAACAAAAAAABwAAAAAABwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAUgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAWQAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAQAAAAAAAwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,1:
           ind: 1,1
-          tiles: AwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AwAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAwAAAAAABwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAWQAAAAAAWQAAAAAABwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAWQAAAAAAWQAAAAAABwAAAAAABwAAAAAABwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,2:
           ind: -1,2
@@ -172,2190 +172,2531 @@ entities:
     - type: RadiationGridResistance
 - proto: AirlockMaintLocked
   entities:
-  - uid: 75
+  - uid: 2
     components:
     - type: Transform
       pos: 20.5,6.5
       parent: 1
-  - uid: 113
+  - uid: 3
     components:
     - type: Transform
       pos: 13.5,1.5
       parent: 1
-  - uid: 207
+  - uid: 4
     components:
     - type: Transform
       pos: 14.5,8.5
       parent: 1
-  - uid: 225
+  - uid: 5
     components:
     - type: Transform
       pos: 20.5,12.5
       parent: 1
+  - uid: 442
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,19.5
+      parent: 1
+  - uid: 444
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,21.5
+      parent: 1
 - proto: AtmosFixInstantPlasmaFireMarker
   entities:
-  - uid: 233
+  - uid: 6
     components:
     - type: Transform
       pos: 8.5,14.5
       parent: 1
 - proto: Bed
   entities:
-  - uid: 71
+  - uid: 7
     components:
     - type: Transform
       pos: 21.5,9.5
       parent: 1
 - proto: BedsheetSpawner
   entities:
-  - uid: 89
+  - uid: 8
     components:
     - type: Transform
       pos: 21.5,9.5
       parent: 1
 - proto: BookshelfFilled
   entities:
-  - uid: 90
+  - uid: 9
     components:
     - type: Transform
       pos: 19.5,9.5
       parent: 1
 - proto: CableHV
   entities:
-  - uid: 3
+  - uid: 10
     components:
     - type: Transform
       pos: 8.5,2.5
       parent: 1
-  - uid: 4
+  - uid: 11
     components:
     - type: Transform
       pos: 8.5,3.5
       parent: 1
-  - uid: 5
+  - uid: 12
     components:
     - type: Transform
       pos: 8.5,4.5
       parent: 1
-  - uid: 6
+  - uid: 13
     components:
     - type: Transform
       pos: 7.5,4.5
       parent: 1
-  - uid: 7
+  - uid: 14
     components:
     - type: Transform
       pos: 9.5,4.5
       parent: 1
 - proto: ChairWood
   entities:
-  - uid: 76
+  - uid: 15
     components:
     - type: Transform
       pos: 19.45475,8.339682
       parent: 1
 - proto: CrateMaterialPlasma
   entities:
-  - uid: 232
+  - uid: 16
     components:
     - type: Transform
       pos: 8.5,14.5
       parent: 1
 - proto: GeneratorRTG
   entities:
-  - uid: 2
+  - uid: 17
     components:
     - type: Transform
       pos: 8.5,2.5
       parent: 1
 - proto: GeneratorRTGDamaged
   entities:
-  - uid: 11
+  - uid: 18
     components:
     - type: Transform
       pos: 20.5,2.5
       parent: 1
 - proto: Girder
   entities:
-  - uid: 231
+  - uid: 19
     components:
     - type: Transform
       pos: 16.5,12.5
       parent: 1
 - proto: Grille
   entities:
-  - uid: 8
+  - uid: 20
     components:
     - type: Transform
       pos: 7.5,4.5
       parent: 1
-  - uid: 9
+  - uid: 21
     components:
     - type: Transform
       pos: 8.5,4.5
       parent: 1
-  - uid: 10
+  - uid: 22
     components:
     - type: Transform
       pos: 9.5,4.5
       parent: 1
-  - uid: 175
+  - uid: 23
     components:
     - type: Transform
       pos: 12.5,15.5
       parent: 1
-  - uid: 176
+  - uid: 24
     components:
     - type: Transform
       pos: 16.5,15.5
       parent: 1
-  - uid: 177
+  - uid: 25
     components:
     - type: Transform
       pos: 13.5,16.5
       parent: 1
-  - uid: 183
+  - uid: 26
     components:
     - type: Transform
       pos: 12.5,13.5
       parent: 1
-  - uid: 184
+  - uid: 27
     components:
     - type: Transform
       pos: 13.5,12.5
       parent: 1
-  - uid: 185
+  - uid: 28
     components:
     - type: Transform
       pos: 15.5,16.5
       parent: 1
-  - uid: 214
+  - uid: 29
     components:
     - type: Transform
       pos: 12.5,14.5
       parent: 1
-  - uid: 215
+  - uid: 30
     components:
     - type: Transform
       pos: 16.5,14.5
       parent: 1
-  - uid: 216
+  - uid: 31
     components:
     - type: Transform
       pos: 14.5,16.5
       parent: 1
-  - uid: 312
+  - uid: 32
     components:
     - type: Transform
       pos: 1.5,15.5
       parent: 1
-- proto: GrilleBroken
-  entities:
-  - uid: 186
-    components:
-    - type: Transform
-      pos: 14.5,12.5
-      parent: 1
-- proto: GrilleSpawner
-  entities:
-  - uid: 133
-    components:
-    - type: Transform
-      pos: 16.5,13.5
-      parent: 1
-  - uid: 217
-    components:
-    - type: Transform
-      pos: 15.5,12.5
-      parent: 1
-- proto: IronRockDiamond
-  entities:
-  - uid: 167
+  - uid: 51
     components:
     - type: Transform
-      pos: 14.5,14.5
+      rot: -1.5707963267948966 rad
+      pos: 6.5,19.5
       parent: 1
-- proto: IronRockGold
-  entities:
-  - uid: 30
+  - uid: 52
     components:
     - type: Transform
-      pos: 13.5,7.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,19.5
       parent: 1
-  - uid: 78
+  - uid: 53
     components:
     - type: Transform
-      pos: 0.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,21.5
       parent: 1
-  - uid: 99
+  - uid: 54
     components:
     - type: Transform
-      pos: 0.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,21.5
       parent: 1
-  - uid: 283
+  - uid: 470
     components:
     - type: Transform
-      pos: 4.5,10.5
+      pos: 14.5,19.5
       parent: 1
-  - uid: 284
+  - uid: 475
     components:
     - type: Transform
-      pos: 4.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 22.5,19.5
       parent: 1
-  - uid: 289
+  - uid: 476
     components:
     - type: Transform
-      pos: 14.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 22.5,20.5
       parent: 1
-  - uid: 299
+  - uid: 477
     components:
     - type: Transform
-      pos: 15.5,7.5
+      rot: 1.5707963267948966 rad
+      pos: 22.5,21.5
       parent: 1
-  - uid: 301
+- proto: GrilleBroken
+  entities:
+  - uid: 33
     components:
     - type: Transform
-      pos: 0.5,8.5
+      pos: 14.5,12.5
       parent: 1
-  - uid: 303
+  - uid: 40
     components:
     - type: Transform
-      pos: 4.5,6.5
+      rot: 3.141592653589793 rad
+      pos: 7.5,18.5
       parent: 1
-- proto: IronRockPlasma
-  entities:
-  - uid: 100
+  - uid: 41
     components:
     - type: Transform
-      pos: 10.5,15.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,18.5
       parent: 1
-  - uid: 255
+  - uid: 45
     components:
     - type: Transform
-      pos: 9.5,16.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,18.5
       parent: 1
-  - uid: 265
+  - uid: 63
     components:
     - type: Transform
-      pos: 7.5,16.5
+      pos: 7.5,22.5
       parent: 1
-  - uid: 266
+  - uid: 64
     components:
     - type: Transform
-      pos: 6.5,13.5
+      pos: 8.5,22.5
       parent: 1
-  - uid: 282
+  - uid: 65
     components:
     - type: Transform
-      pos: 6.5,15.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,19.5
       parent: 1
-  - uid: 285
+  - uid: 66
     components:
     - type: Transform
-      pos: 18.5,12.5
+      pos: 3.5,22.5
       parent: 1
-  - uid: 286
+  - uid: 69
     components:
     - type: Transform
-      pos: 22.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 10.5,19.5
       parent: 1
-  - uid: 287
+  - uid: 70
     components:
     - type: Transform
-      pos: 4.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 10.5,21.5
       parent: 1
-  - uid: 295
+  - uid: 445
     components:
     - type: Transform
-      pos: 7.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,22.5
       parent: 1
-  - uid: 305
+  - uid: 448
     components:
     - type: Transform
-      pos: 0.5,16.5
+      pos: 14.5,21.5
       parent: 1
-  - uid: 306
+  - uid: 451
     components:
     - type: Transform
-      pos: 4.5,13.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,21.5
       parent: 1
-  - uid: 313
+  - uid: 454
     components:
     - type: Transform
-      pos: 9.5,12.5
+      pos: 15.5,21.5
       parent: 1
-  - uid: 314
+  - uid: 472
     components:
     - type: Transform
-      pos: 10.5,13.5
+      rot: 1.5707963267948966 rad
+      pos: 13.5,19.5
       parent: 1
-- proto: IronRockSilver
+- proto: GrilleSpawner
   entities:
-  - uid: 81
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 82
+  - uid: 34
     components:
     - type: Transform
-      pos: 4.5,0.5
+      pos: 16.5,13.5
       parent: 1
-  - uid: 83
+  - uid: 35
     components:
     - type: Transform
-      pos: 0.5,0.5
+      pos: 15.5,12.5
       parent: 1
-  - uid: 84
+- proto: IronRockDiamond
+  entities:
+  - uid: 36
     components:
     - type: Transform
-      pos: 0.5,4.5
+      pos: 14.5,14.5
       parent: 1
-  - uid: 281
+- proto: LandMineExplosive
+  entities:
+  - uid: 71
     components:
     - type: Transform
-      pos: 10.5,7.5
+      pos: 13.439286,14.473711
       parent: 1
-  - uid: 288
+  - uid: 72
     components:
     - type: Transform
-      pos: 10.5,6.5
+      pos: 15.486161,14.504961
       parent: 1
-  - uid: 298
+  - uid: 73
     components:
     - type: Transform
-      pos: 6.5,6.5
+      pos: 14.525224,15.4346485
       parent: 1
-  - uid: 300
+  - uid: 74
     components:
     - type: Transform
-      pos: 6.5,7.5
+      pos: 14.525224,13.442461
       parent: 1
-- proto: IronRockUranium
+- proto: PoweredLightPostSmallEmpty
   entities:
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 18.5,2.5
-      parent: 1
-  - uid: 86
-    components:
-    - type: Transform
-      pos: 20.5,0.5
-      parent: 1
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 22.5,2.5
-      parent: 1
-  - uid: 88
+  - uid: 75
     components:
     - type: Transform
-      pos: 20.5,4.5
+      pos: 16.5,0.5
       parent: 1
-- proto: LandMineExplosive
+- proto: PoweredSmallLight
   entities:
-  - uid: 164
+  - uid: 471
     components:
     - type: Transform
-      pos: 13.439286,14.473711
+      pos: 20.5,21.5
       parent: 1
-  - uid: 166
+- proto: PoweredSmallLightEmpty
+  entities:
+  - uid: 469
     components:
     - type: Transform
-      pos: 15.486161,14.504961
+      rot: -1.5707963267948966 rad
+      pos: 17.5,19.5
       parent: 1
-  - uid: 198
+- proto: Rack
+  entities:
+  - uid: 76
     components:
     - type: Transform
-      pos: 14.525224,15.4346485
+      pos: 13.5,3.5
       parent: 1
-  - uid: 199
+- proto: ReinforcedWindow
+  entities:
+  - uid: 427
     components:
     - type: Transform
-      pos: 14.525224,13.442461
+      rot: 1.5707963267948966 rad
+      pos: 22.5,19.5
       parent: 1
-- proto: PoweredLightPostSmallEmpty
-  entities:
-  - uid: 204
+  - uid: 441
     components:
     - type: Transform
-      pos: 16.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 22.5,20.5
       parent: 1
-- proto: Rack
-  entities:
-  - uid: 213
+  - uid: 453
     components:
     - type: Transform
-      pos: 13.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 22.5,21.5
       parent: 1
 - proto: SalvageCanisterSpawner
   entities:
-  - uid: 239
+  - uid: 77
     components:
     - type: Transform
       pos: 20.5,9.5
       parent: 1
-  - uid: 302
+  - uid: 78
     components:
     - type: Transform
       pos: 15.5,3.5
       parent: 1
 - proto: SalvageSpawnerEquipment
   entities:
-  - uid: 234
+  - uid: 79
     components:
     - type: Transform
       pos: 21.5,7.5
       parent: 1
-  - uid: 262
+  - uid: 80
     components:
     - type: Transform
       pos: 21.5,7.5
       parent: 1
-  - uid: 412
+  - uid: 81
     components:
     - type: Transform
       pos: 21.5,14.5
       parent: 1
-  - uid: 413
+  - uid: 82
     components:
     - type: Transform
       pos: 20.5,13.5
       parent: 1
 - proto: SalvageSpawnerEquipmentValuable
   entities:
-  - uid: 143
+  - uid: 83
     components:
     - type: Transform
       pos: 9.5,3.5
       parent: 1
-  - uid: 144
+  - uid: 84
     components:
     - type: Transform
       pos: 9.5,2.5
       parent: 1
-  - uid: 145
+  - uid: 85
     components:
     - type: Transform
       pos: 9.5,1.5
       parent: 1
-  - uid: 146
+  - uid: 86
     components:
     - type: Transform
       pos: 8.5,1.5
       parent: 1
-  - uid: 147
+  - uid: 87
     components:
     - type: Transform
       pos: 7.5,1.5
       parent: 1
-  - uid: 169
+  - uid: 88
     components:
     - type: Transform
       pos: 7.5,2.5
       parent: 1
-  - uid: 170
+  - uid: 89
     components:
     - type: Transform
       pos: 7.5,3.5
       parent: 1
-  - uid: 172
+  - uid: 90
     components:
     - type: Transform
       pos: 8.5,1.5
       parent: 1
-  - uid: 182
+  - uid: 91
     components:
     - type: Transform
       pos: 9.5,1.5
       parent: 1
-  - uid: 191
+  - uid: 92
     components:
     - type: Transform
       pos: 13.5,3.5
       parent: 1
-  - uid: 210
+  - uid: 93
     components:
     - type: Transform
       pos: 7.5,1.5
       parent: 1
-  - uid: 211
+  - uid: 94
     components:
     - type: Transform
       pos: 8.5,3.5
       parent: 1
-  - uid: 221
+  - uid: 95
     components:
     - type: Transform
       pos: 13.5,3.5
       parent: 1
-  - uid: 222
+  - uid: 96
     components:
     - type: Transform
       pos: 13.5,3.5
       parent: 1
-  - uid: 257
+  - uid: 97
     components:
     - type: Transform
       pos: 21.5,9.5
       parent: 1
-  - uid: 261
+  - uid: 98
     components:
     - type: Transform
       pos: 21.5,9.5
       parent: 1
-  - uid: 342
+  - uid: 99
     components:
     - type: Transform
       pos: 13.5,9.5
       parent: 1
-  - uid: 343
+  - uid: 100
     components:
     - type: Transform
       pos: 13.5,9.5
       parent: 1
-  - uid: 344
+  - uid: 101
     components:
     - type: Transform
       pos: 15.5,9.5
       parent: 1
-  - uid: 345
+  - uid: 102
     components:
     - type: Transform
       pos: 15.5,9.5
       parent: 1
-  - uid: 346
+  - uid: 103
     components:
     - type: Transform
       pos: 15.5,9.5
       parent: 1
-  - uid: 347
+  - uid: 104
     components:
     - type: Transform
       pos: 13.5,9.5
       parent: 1
-  - uid: 404
+  - uid: 105
     components:
     - type: Transform
       pos: 2.5,13.5
       parent: 1
-  - uid: 405
+  - uid: 106
     components:
     - type: Transform
       pos: 2.5,14.5
       parent: 1
-  - uid: 406
+  - uid: 107
     components:
     - type: Transform
       pos: 19.5,15.5
       parent: 1
-  - uid: 407
+  - uid: 108
     components:
     - type: Transform
       pos: 20.5,15.5
       parent: 1
-  - uid: 408
+  - uid: 109
     components:
     - type: Transform
       pos: 21.5,15.5
       parent: 1
-  - uid: 409
+  - uid: 110
     components:
     - type: Transform
       pos: 21.5,15.5
       parent: 1
-  - uid: 410
+  - uid: 111
     components:
     - type: Transform
       pos: 20.5,15.5
       parent: 1
-  - uid: 411
+  - uid: 112
     components:
     - type: Transform
       pos: 19.5,15.5
       parent: 1
 - proto: SalvageSpawnerScrapCommon
   entities:
-  - uid: 116
+  - uid: 37
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,20.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,20.5
+      parent: 1
+  - uid: 113
     components:
     - type: Transform
       pos: 14.5,0.5
       parent: 1
-  - uid: 120
+  - uid: 114
     components:
     - type: Transform
       pos: 12.5,0.5
       parent: 1
-  - uid: 123
+  - uid: 115
     components:
     - type: Transform
       pos: 15.5,2.5
       parent: 1
-  - uid: 129
+  - uid: 116
     components:
     - type: Transform
       pos: 13.5,0.5
       parent: 1
-  - uid: 130
+  - uid: 117
     components:
     - type: Transform
       pos: 15.5,0.5
       parent: 1
-  - uid: 131
+  - uid: 118
     components:
     - type: Transform
       pos: 14.5,0.5
       parent: 1
-  - uid: 132
+  - uid: 119
     components:
     - type: Transform
       pos: 14.5,0.5
       parent: 1
-  - uid: 148
+  - uid: 120
     components:
     - type: Transform
       pos: 13.5,2.5
       parent: 1
-  - uid: 149
+  - uid: 121
     components:
     - type: Transform
       pos: 14.5,2.5
       parent: 1
-  - uid: 150
+  - uid: 122
     components:
     - type: Transform
       pos: 14.5,3.5
       parent: 1
-  - uid: 212
+  - uid: 123
     components:
     - type: Transform
       pos: 9.5,1.5
       parent: 1
-  - uid: 219
+  - uid: 124
     components:
     - type: Transform
       pos: 13.5,0.5
       parent: 1
-  - uid: 220
+  - uid: 125
     components:
     - type: Transform
       pos: 15.5,0.5
       parent: 1
-  - uid: 236
+  - uid: 126
     components:
     - type: Transform
       pos: 13.5,0.5
       parent: 1
-  - uid: 238
+  - uid: 127
     components:
     - type: Transform
       pos: 19.5,8.5
       parent: 1
-  - uid: 241
+  - uid: 128
     components:
     - type: Transform
       pos: 21.5,7.5
       parent: 1
-  - uid: 256
+  - uid: 129
     components:
     - type: Transform
       pos: 20.5,7.5
       parent: 1
-  - uid: 258
+  - uid: 130
     components:
     - type: Transform
       pos: 20.5,8.5
       parent: 1
-  - uid: 259
+  - uid: 131
     components:
     - type: Transform
       pos: 21.5,8.5
       parent: 1
-  - uid: 260
+  - uid: 132
     components:
     - type: Transform
       pos: 21.5,9.5
       parent: 1
-  - uid: 263
+  - uid: 133
     components:
     - type: Transform
       pos: 15.5,0.5
       parent: 1
-  - uid: 264
+  - uid: 134
     components:
     - type: Transform
       pos: 12.5,0.5
       parent: 1
-  - uid: 280
+  - uid: 135
     components:
     - type: Transform
       pos: 9.5,2.5
       parent: 1
-  - uid: 315
+  - uid: 136
     components:
     - type: Transform
       pos: 9.5,3.5
       parent: 1
-  - uid: 316
+  - uid: 137
     components:
     - type: Transform
       pos: 8.5,3.5
       parent: 1
-  - uid: 317
+  - uid: 138
     components:
     - type: Transform
       pos: 7.5,3.5
       parent: 1
-  - uid: 318
+  - uid: 139
     components:
     - type: Transform
       pos: 7.5,2.5
       parent: 1
-  - uid: 319
+  - uid: 140
     components:
     - type: Transform
       pos: 7.5,1.5
       parent: 1
-  - uid: 320
+  - uid: 141
     components:
     - type: Transform
       pos: 8.5,1.5
       parent: 1
-  - uid: 321
+  - uid: 142
     components:
     - type: Transform
       pos: 2.5,1.5
       parent: 1
-  - uid: 322
+  - uid: 143
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 323
+  - uid: 144
     components:
     - type: Transform
       pos: 2.5,3.5
       parent: 1
-  - uid: 324
+  - uid: 145
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 1
-  - uid: 325
+  - uid: 146
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 326
+  - uid: 147
     components:
     - type: Transform
       pos: 3.5,2.5
       parent: 1
-  - uid: 351
+  - uid: 148
     components:
     - type: Transform
       pos: 13.5,9.5
       parent: 1
-  - uid: 352
+  - uid: 149
     components:
     - type: Transform
       pos: 14.5,9.5
       parent: 1
-  - uid: 353
+  - uid: 150
     components:
     - type: Transform
       pos: 15.5,9.5
       parent: 1
-  - uid: 363
+  - uid: 151
     components:
     - type: Transform
       pos: 2.5,9.5
       parent: 1
-  - uid: 364
+  - uid: 152
     components:
     - type: Transform
       pos: 2.5,8.5
       parent: 1
-  - uid: 365
+  - uid: 153
     components:
     - type: Transform
       pos: 2.5,7.5
       parent: 1
-  - uid: 366
+  - uid: 154
     components:
     - type: Transform
       pos: 13.5,15.5
       parent: 1
-  - uid: 367
+  - uid: 155
     components:
     - type: Transform
       pos: 14.5,15.5
       parent: 1
-  - uid: 368
+  - uid: 156
     components:
     - type: Transform
       pos: 15.5,15.5
       parent: 1
-  - uid: 369
+  - uid: 157
     components:
     - type: Transform
       pos: 15.5,14.5
       parent: 1
-  - uid: 370
+  - uid: 158
     components:
     - type: Transform
       pos: 15.5,13.5
       parent: 1
-  - uid: 371
+  - uid: 159
     components:
     - type: Transform
       pos: 14.5,13.5
       parent: 1
-  - uid: 372
+  - uid: 160
     components:
     - type: Transform
       pos: 13.5,13.5
       parent: 1
-  - uid: 373
+  - uid: 161
     components:
     - type: Transform
       pos: 13.5,14.5
       parent: 1
-  - uid: 374
+  - uid: 162
     components:
     - type: Transform
       pos: 13.5,15.5
       parent: 1
-  - uid: 375
+  - uid: 163
     components:
     - type: Transform
       pos: 14.5,15.5
       parent: 1
-  - uid: 376
+  - uid: 164
     components:
     - type: Transform
       pos: 15.5,15.5
       parent: 1
-  - uid: 377
+  - uid: 165
     components:
     - type: Transform
       pos: 15.5,14.5
       parent: 1
-  - uid: 378
+  - uid: 166
     components:
     - type: Transform
       pos: 15.5,13.5
       parent: 1
-  - uid: 379
+  - uid: 167
     components:
     - type: Transform
       pos: 14.5,13.5
       parent: 1
-  - uid: 380
+  - uid: 168
     components:
     - type: Transform
       pos: 13.5,13.5
       parent: 1
-  - uid: 381
+  - uid: 169
     components:
     - type: Transform
       pos: 13.5,14.5
       parent: 1
-  - uid: 417
+  - uid: 170
     components:
     - type: Transform
       pos: 19.5,14.5
       parent: 1
-  - uid: 418
+  - uid: 171
     components:
     - type: Transform
       pos: 19.5,15.5
       parent: 1
-  - uid: 419
+  - uid: 172
     components:
     - type: Transform
       pos: 20.5,14.5
       parent: 1
-  - uid: 420
+  - uid: 173
     components:
     - type: Transform
       pos: 20.5,15.5
       parent: 1
-  - uid: 421
+  - uid: 174
     components:
     - type: Transform
       pos: 21.5,14.5
       parent: 1
-  - uid: 422
+  - uid: 175
     components:
     - type: Transform
       pos: 21.5,15.5
       parent: 1
-  - uid: 423
+  - uid: 176
     components:
     - type: Transform
       pos: 20.5,13.5
       parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,20.5
+      parent: 1
+  - uid: 438
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,20.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,19.5
+      parent: 1
+  - uid: 468
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,21.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,19.5
+      parent: 1
 - proto: SalvageSpawnerScrapCommon75
   entities:
-  - uid: 398
+  - uid: 177
     components:
     - type: Transform
       pos: 2.5,13.5
       parent: 1
-  - uid: 399
+  - uid: 178
     components:
     - type: Transform
       pos: 2.5,14.5
       parent: 1
-  - uid: 400
+  - uid: 179
     components:
     - type: Transform
       pos: 2.5,15.5
       parent: 1
-  - uid: 401
+  - uid: 180
     components:
     - type: Transform
       pos: 3.5,15.5
       parent: 1
 - proto: SalvageSpawnerScrapValuable
   entities:
-  - uid: 25
+  - uid: 181
     components:
     - type: Transform
       pos: 21.5,8.5
       parent: 1
-  - uid: 118
+  - uid: 182
     components:
     - type: Transform
       pos: 20.5,7.5
       parent: 1
-  - uid: 119
+  - uid: 183
     components:
     - type: Transform
       pos: 21.5,7.5
       parent: 1
-  - uid: 171
+  - uid: 184
     components:
     - type: Transform
       pos: 9.5,3.5
       parent: 1
-  - uid: 208
+  - uid: 185
     components:
     - type: Transform
       pos: 8.5,3.5
       parent: 1
-  - uid: 209
+  - uid: 186
     components:
     - type: Transform
       pos: 7.5,3.5
       parent: 1
-  - uid: 235
+  - uid: 187
     components:
     - type: Transform
       pos: 19.5,8.5
       parent: 1
-  - uid: 240
+  - uid: 188
     components:
     - type: Transform
       pos: 20.5,8.5
       parent: 1
-  - uid: 389
+  - uid: 189
     components:
     - type: Transform
       pos: 8.5,9.5
       parent: 1
-  - uid: 390
+  - uid: 190
     components:
     - type: Transform
       pos: 8.5,8.5
       parent: 1
-  - uid: 414
+  - uid: 191
     components:
     - type: Transform
       pos: 19.5,14.5
       parent: 1
-  - uid: 415
+  - uid: 192
     components:
     - type: Transform
       pos: 20.5,14.5
       parent: 1
-  - uid: 416
+  - uid: 193
     components:
     - type: Transform
       pos: 21.5,14.5
       parent: 1
+  - uid: 478
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,19.5
+      parent: 1
 - proto: SalvageSpawnerScrapValuable75
   entities:
-  - uid: 121
+  - uid: 42
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,20.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,20.5
+      parent: 1
+  - uid: 194
     components:
     - type: Transform
       pos: 13.5,2.5
       parent: 1
-  - uid: 122
+  - uid: 195
     components:
     - type: Transform
       pos: 14.5,2.5
       parent: 1
-  - uid: 124
+  - uid: 196
     components:
     - type: Transform
       pos: 14.5,2.5
       parent: 1
-  - uid: 327
+  - uid: 197
     components:
     - type: Transform
       pos: 2.5,1.5
       parent: 1
-  - uid: 328
+  - uid: 198
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 329
+  - uid: 199
     components:
     - type: Transform
       pos: 2.5,3.5
       parent: 1
-  - uid: 330
+  - uid: 200
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 1
-  - uid: 331
+  - uid: 201
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 332
+  - uid: 202
     components:
     - type: Transform
       pos: 3.5,2.5
       parent: 1
-  - uid: 333
+  - uid: 203
     components:
     - type: Transform
       pos: 2.5,3.5
       parent: 1
-  - uid: 334
+  - uid: 204
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 335
+  - uid: 205
     components:
     - type: Transform
       pos: 2.5,1.5
       parent: 1
-  - uid: 336
+  - uid: 206
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 1
-  - uid: 337
+  - uid: 207
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 338
+  - uid: 208
     components:
     - type: Transform
       pos: 3.5,2.5
       parent: 1
-  - uid: 382
+  - uid: 209
     components:
     - type: Transform
       pos: 8.5,7.5
       parent: 1
-  - uid: 383
+  - uid: 210
     components:
     - type: Transform
       pos: 8.5,8.5
       parent: 1
-  - uid: 384
+  - uid: 211
     components:
     - type: Transform
       pos: 8.5,9.5
       parent: 1
-  - uid: 385
+  - uid: 212
     components:
     - type: Transform
       pos: 7.5,9.5
       parent: 1
-  - uid: 386
+  - uid: 213
     components:
     - type: Transform
       pos: 8.5,9.5
       parent: 1
-  - uid: 387
+  - uid: 214
     components:
     - type: Transform
       pos: 9.5,9.5
       parent: 1
-  - uid: 388
+  - uid: 215
     components:
     - type: Transform
       pos: 2.5,8.5
       parent: 1
-  - uid: 402
+  - uid: 216
     components:
     - type: Transform
       pos: 3.5,15.5
       parent: 1
-  - uid: 403
+  - uid: 217
     components:
     - type: Transform
       pos: 3.5,15.5
       parent: 1
+  - uid: 425
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,20.5
+      parent: 1
+  - uid: 433
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,19.5
+      parent: 1
+  - uid: 436
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,19.5
+      parent: 1
+  - uid: 459
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,21.5
+      parent: 1
 - proto: SalvageSpawnerTreasure
   entities:
-  - uid: 188
+  - uid: 218
     components:
     - type: Transform
       pos: 15.5,2.5
       parent: 1
-  - uid: 348
+  - uid: 219
     components:
     - type: Transform
       pos: 13.5,9.5
       parent: 1
-  - uid: 349
+  - uid: 220
     components:
     - type: Transform
       pos: 14.5,9.5
       parent: 1
-  - uid: 350
+  - uid: 221
     components:
     - type: Transform
       pos: 15.5,9.5
       parent: 1
-  - uid: 360
+  - uid: 222
     components:
     - type: Transform
       pos: 2.5,9.5
       parent: 1
-  - uid: 361
+  - uid: 223
     components:
     - type: Transform
       pos: 2.5,8.5
       parent: 1
-  - uid: 362
+  - uid: 224
     components:
     - type: Transform
       pos: 2.5,7.5
       parent: 1
-  - uid: 393
+  - uid: 225
     components:
     - type: Transform
       pos: 8.5,7.5
       parent: 1
-  - uid: 394
+  - uid: 226
     components:
     - type: Transform
       pos: 14.5,9.5
       parent: 1
 - proto: SalvageSpawnerTreasureValuable
   entities:
-  - uid: 189
+  - uid: 43
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,20.5
+      parent: 1
+  - uid: 227
     components:
     - type: Transform
       pos: 14.5,3.5
       parent: 1
-  - uid: 190
+  - uid: 228
     components:
     - type: Transform
       pos: 14.5,3.5
       parent: 1
-  - uid: 237
+  - uid: 229
     components:
     - type: Transform
       pos: 19.5,7.5
       parent: 1
-  - uid: 242
+  - uid: 230
     components:
     - type: Transform
       pos: 20.5,8.5
       parent: 1
-  - uid: 304
+  - uid: 231
     components:
     - type: Transform
       pos: 19.5,7.5
       parent: 1
-  - uid: 339
+  - uid: 232
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 340
+  - uid: 233
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 341
+  - uid: 234
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 354
+  - uid: 235
     components:
     - type: Transform
       pos: 2.5,9.5
       parent: 1
-  - uid: 355
+  - uid: 236
     components:
     - type: Transform
       pos: 2.5,8.5
       parent: 1
-  - uid: 356
+  - uid: 237
     components:
     - type: Transform
       pos: 2.5,7.5
       parent: 1
-  - uid: 357
+  - uid: 238
     components:
     - type: Transform
       pos: 2.5,7.5
       parent: 1
-  - uid: 358
+  - uid: 239
     components:
     - type: Transform
       pos: 2.5,8.5
       parent: 1
-  - uid: 359
+  - uid: 240
     components:
     - type: Transform
       pos: 2.5,9.5
       parent: 1
-  - uid: 391
+  - uid: 241
     components:
     - type: Transform
       pos: 8.5,8.5
       parent: 1
-  - uid: 392
+  - uid: 242
     components:
     - type: Transform
       pos: 8.5,9.5
       parent: 1
-  - uid: 395
+  - uid: 243
     components:
     - type: Transform
       pos: 1.5,13.5
       parent: 1
-  - uid: 396
+  - uid: 244
     components:
     - type: Transform
       pos: 1.5,13.5
       parent: 1
-  - uid: 397
+  - uid: 245
     components:
     - type: Transform
       pos: 1.5,13.5
       parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,19.5
+      parent: 1
 - proto: ShuttersWindow
   entities:
-  - uid: 65
+  - uid: 246
     components:
     - type: Transform
       pos: 15.5,1.5
       parent: 1
 - proto: SignMaterials
   entities:
-  - uid: 136
+  - uid: 247
     components:
     - type: Transform
       pos: 14.5,1.5
       parent: 1
 - proto: SignRadiationMed
   entities:
-  - uid: 193
+  - uid: 248
     components:
     - type: Transform
       pos: 19.5,2.5
       parent: 1
-  - uid: 203
+  - uid: 249
     components:
     - type: Transform
       pos: 20.5,3.5
       parent: 1
-  - uid: 205
+  - uid: 250
     components:
     - type: Transform
       pos: 21.5,2.5
       parent: 1
-  - uid: 226
+  - uid: 251
     components:
     - type: Transform
       pos: 20.5,1.5
       parent: 1
 - proto: SignSecureMedRed
   entities:
-  - uid: 178
+  - uid: 252
     components:
     - type: Transform
       pos: 12.5,12.5
       parent: 1
-  - uid: 187
+  - uid: 253
     components:
     - type: Transform
       pos: 12.5,16.5
       parent: 1
-  - uid: 218
+  - uid: 254
     components:
     - type: Transform
       pos: 16.5,16.5
       parent: 1
+- proto: TableStone
+  entities:
+  - uid: 466
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,19.5
+      parent: 1
+  - uid: 467
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,19.5
+      parent: 1
 - proto: TableWood
   entities:
-  - uid: 74
+  - uid: 255
     components:
     - type: Transform
       pos: 19.5,7.5
       parent: 1
 - proto: WallReinforced
   entities:
-  - uid: 28
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 8.5,21.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 9.5,20.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 9.5,21.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 1.5,19.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 2.5,19.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 3.5,19.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 5.5,19.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 4.5,19.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 9.5,19.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 8.5,19.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 1.5,20.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 5.5,21.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 4.5,21.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 7.5,21.5
+      parent: 1
+  - uid: 256
     components:
     - type: Transform
       pos: 7.5,14.5
       parent: 1
-  - uid: 29
+  - uid: 257
     components:
     - type: Transform
       pos: 8.5,12.5
       parent: 1
-  - uid: 39
+  - uid: 258
     components:
     - type: Transform
       pos: 10.5,4.5
       parent: 1
-  - uid: 40
+  - uid: 259
     components:
     - type: Transform
       pos: 10.5,2.5
       parent: 1
-  - uid: 41
+  - uid: 260
     components:
     - type: Transform
       pos: 8.5,0.5
       parent: 1
-  - uid: 42
+  - uid: 261
     components:
     - type: Transform
       pos: 7.5,0.5
       parent: 1
-  - uid: 43
+  - uid: 262
     components:
     - type: Transform
       pos: 6.5,2.5
       parent: 1
-  - uid: 44
+  - uid: 263
     components:
     - type: Transform
       pos: 6.5,3.5
       parent: 1
-  - uid: 46
+  - uid: 264
     components:
     - type: Transform
       pos: 21.5,0.5
       parent: 1
-  - uid: 50
+  - uid: 265
     components:
     - type: Transform
       pos: 19.5,0.5
       parent: 1
-  - uid: 51
+  - uid: 266
     components:
     - type: Transform
       pos: 18.5,0.5
       parent: 1
-  - uid: 52
+  - uid: 267
     components:
     - type: Transform
       pos: 22.5,0.5
       parent: 1
-  - uid: 53
+  - uid: 268
     components:
     - type: Transform
       pos: 19.5,4.5
       parent: 1
-  - uid: 55
+  - uid: 269
     components:
     - type: Transform
       pos: 22.5,3.5
       parent: 1
-  - uid: 56
+  - uid: 270
     components:
     - type: Transform
       pos: 22.5,4.5
       parent: 1
-  - uid: 57
+  - uid: 271
     components:
     - type: Transform
       pos: 22.5,1.5
       parent: 1
-  - uid: 58
+  - uid: 272
     components:
     - type: Transform
       pos: 21.5,4.5
       parent: 1
-  - uid: 59
+  - uid: 273
     components:
     - type: Transform
       pos: 18.5,3.5
       parent: 1
-  - uid: 60
+  - uid: 274
     components:
     - type: Transform
       pos: 18.5,4.5
       parent: 1
-  - uid: 63
+  - uid: 275
     components:
     - type: Transform
       pos: 18.5,1.5
       parent: 1
-  - uid: 67
+  - uid: 276
     components:
     - type: Transform
       pos: 18.5,14.5
       parent: 1
-  - uid: 70
+  - uid: 277
     components:
     - type: Transform
       pos: 8.5,15.5
       parent: 1
-  - uid: 73
+  - uid: 278
     components:
     - type: Transform
       pos: 0.5,12.5
       parent: 1
-  - uid: 77
+  - uid: 279
     components:
     - type: Transform
       pos: 10.5,12.5
       parent: 1
-  - uid: 79
+  - uid: 280
     components:
     - type: Transform
       pos: 10.5,16.5
       parent: 1
-  - uid: 80
+  - uid: 281
     components:
     - type: Transform
       pos: 6.5,16.5
       parent: 1
-  - uid: 92
+  - uid: 282
     components:
     - type: Transform
       pos: 4.5,16.5
       parent: 1
-  - uid: 96
+  - uid: 283
     components:
     - type: Transform
       pos: 6.5,14.5
       parent: 1
-  - uid: 114
+  - uid: 284
     components:
     - type: Transform
       pos: 8.5,16.5
       parent: 1
-  - uid: 115
+  - uid: 285
     components:
     - type: Transform
       pos: 6.5,12.5
       parent: 1
-  - uid: 117
+  - uid: 286
     components:
     - type: Transform
       pos: 9.5,14.5
       parent: 1
-  - uid: 137
+  - uid: 287
     components:
     - type: Transform
       pos: 16.5,8.5
       parent: 1
-  - uid: 138
+  - uid: 288
     components:
     - type: Transform
       pos: 16.5,7.5
       parent: 1
-  - uid: 152
+  - uid: 289
     components:
     - type: Transform
       pos: 16.5,10.5
       parent: 1
-  - uid: 153
+  - uid: 290
     components:
     - type: Transform
       pos: 13.5,10.5
       parent: 1
-  - uid: 154
+  - uid: 291
     components:
     - type: Transform
       pos: 14.5,10.5
       parent: 1
-  - uid: 156
+  - uid: 292
     components:
     - type: Transform
       pos: 15.5,8.5
       parent: 1
-  - uid: 174
+  - uid: 293
     components:
     - type: Transform
       pos: 16.5,16.5
       parent: 1
-  - uid: 192
+  - uid: 294
     components:
     - type: Transform
       pos: 12.5,7.5
       parent: 1
-  - uid: 223
+  - uid: 295
     components:
     - type: Transform
       pos: 12.5,8.5
       parent: 1
-  - uid: 224
+  - uid: 296
+    components:
+    - type: Transform
+      pos: 12.5,6.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: 12.5,16.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: 12.5,12.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      pos: 9.5,15.5
+      parent: 1
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 7.5,15.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 20.5,16.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 21.5,16.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 10.5,14.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 9.5,13.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 7.5,13.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 8.5,13.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 22.5,14.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 22.5,16.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      pos: 21.5,12.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 18.5,13.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 19.5,12.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      pos: 22.5,13.5
+      parent: 1
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 18.5,15.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      pos: 4.5,14.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      pos: 2.5,12.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      pos: 4.5,15.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      pos: 1.5,16.5
+      parent: 1
+  - uid: 426
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,18.5
+      parent: 1
+  - uid: 428
     components:
     - type: Transform
-      pos: 12.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 12.5,20.5
       parent: 1
-  - uid: 229
+  - uid: 429
     components:
     - type: Transform
-      pos: 12.5,16.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,18.5
       parent: 1
-  - uid: 230
+  - uid: 430
     components:
     - type: Transform
-      pos: 12.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 19.5,18.5
       parent: 1
-  - uid: 243
+  - uid: 431
     components:
     - type: Transform
-      pos: 9.5,15.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,20.5
       parent: 1
-  - uid: 244
+  - uid: 432
     components:
     - type: Transform
-      pos: 7.5,15.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,18.5
       parent: 1
-  - uid: 250
+  - uid: 434
     components:
     - type: Transform
-      pos: 20.5,16.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,20.5
       parent: 1
-  - uid: 251
+  - uid: 435
     components:
     - type: Transform
-      pos: 21.5,16.5
+      rot: -1.5707963267948966 rad
+      pos: 15.5,18.5
       parent: 1
-  - uid: 252
+  - uid: 437
     components:
     - type: Transform
-      pos: 10.5,14.5
+      rot: -1.5707963267948966 rad
+      pos: 15.5,20.5
       parent: 1
-  - uid: 253
+  - uid: 439
     components:
     - type: Transform
-      pos: 9.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 16.5,20.5
       parent: 1
-  - uid: 254
+  - uid: 440
     components:
     - type: Transform
-      pos: 7.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 16.5,18.5
       parent: 1
-  - uid: 267
+  - uid: 443
     components:
     - type: Transform
-      pos: 8.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,22.5
       parent: 1
-  - uid: 268
+  - uid: 446
     components:
     - type: Transform
-      pos: 22.5,14.5
+      rot: -1.5707963267948966 rad
+      pos: 21.5,22.5
       parent: 1
-  - uid: 269
+  - uid: 447
     components:
     - type: Transform
-      pos: 22.5,16.5
+      rot: -1.5707963267948966 rad
+      pos: 18.5,20.5
       parent: 1
-  - uid: 270
+  - uid: 449
     components:
     - type: Transform
-      pos: 21.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 20.5,22.5
       parent: 1
-  - uid: 275
+  - uid: 450
     components:
     - type: Transform
-      pos: 18.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,18.5
       parent: 1
-  - uid: 276
+  - uid: 452
     components:
     - type: Transform
-      pos: 19.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 19.5,22.5
       parent: 1
-  - uid: 278
+  - uid: 455
     components:
     - type: Transform
-      pos: 22.5,13.5
+      rot: -1.5707963267948966 rad
+      pos: 18.5,22.5
       parent: 1
-  - uid: 279
+  - uid: 456
     components:
     - type: Transform
-      pos: 18.5,15.5
+      rot: -1.5707963267948966 rad
+      pos: 18.5,18.5
       parent: 1
-  - uid: 292
+  - uid: 457
     components:
     - type: Transform
-      pos: 3.5,14.5
+      rot: -1.5707963267948966 rad
+      pos: 18.5,19.5
       parent: 1
-  - uid: 293
+  - uid: 458
     components:
     - type: Transform
-      pos: 4.5,14.5
+      rot: -1.5707963267948966 rad
+      pos: 17.5,18.5
       parent: 1
-  - uid: 294
+  - uid: 460
     components:
     - type: Transform
-      pos: 1.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 21.5,18.5
       parent: 1
-  - uid: 296
+  - uid: 461
     components:
     - type: Transform
-      pos: 1.5,14.5
+      rot: -1.5707963267948966 rad
+      pos: 20.5,18.5
       parent: 1
-  - uid: 309
+  - uid: 462
     components:
     - type: Transform
-      pos: 2.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 17.5,22.5
       parent: 1
-  - uid: 310
+  - uid: 463
     components:
     - type: Transform
-      pos: 4.5,15.5
+      rot: -1.5707963267948966 rad
+      pos: 16.5,21.5
       parent: 1
-  - uid: 311
+  - uid: 464
     components:
     - type: Transform
-      pos: 1.5,16.5
+      rot: -1.5707963267948966 rad
+      pos: 16.5,22.5
       parent: 1
 - proto: WallReinforcedRust
   entities:
-  - uid: 32
+  - uid: 321
     components:
     - type: Transform
       pos: 6.5,1.5
       parent: 1
-  - uid: 33
+  - uid: 322
     components:
     - type: Transform
       pos: 6.5,0.5
       parent: 1
-  - uid: 34
+  - uid: 323
     components:
     - type: Transform
       pos: 10.5,3.5
       parent: 1
-  - uid: 35
+  - uid: 324
     components:
     - type: Transform
       pos: 9.5,0.5
       parent: 1
-  - uid: 36
+  - uid: 325
     components:
     - type: Transform
       pos: 10.5,0.5
       parent: 1
-  - uid: 37
+  - uid: 326
     components:
     - type: Transform
       pos: 10.5,1.5
       parent: 1
-  - uid: 38
+  - uid: 327
     components:
     - type: Transform
       pos: 6.5,4.5
       parent: 1
-  - uid: 45
+  - uid: 328
     components:
     - type: Transform
       pos: 19.5,3.5
       parent: 1
-  - uid: 47
+  - uid: 329
     components:
     - type: Transform
       pos: 20.5,3.5
       parent: 1
-  - uid: 48
+  - uid: 330
     components:
     - type: Transform
       pos: 19.5,2.5
       parent: 1
-  - uid: 49
+  - uid: 331
     components:
     - type: Transform
       pos: 21.5,3.5
       parent: 1
-  - uid: 54
+  - uid: 332
     components:
     - type: Transform
       pos: 21.5,1.5
       parent: 1
-  - uid: 61
+  - uid: 333
     components:
     - type: Transform
       pos: 19.5,1.5
       parent: 1
-  - uid: 62
+  - uid: 334
     components:
     - type: Transform
       pos: 20.5,1.5
       parent: 1
-  - uid: 64
+  - uid: 335
     components:
     - type: Transform
       pos: 21.5,2.5
       parent: 1
-  - uid: 68
+  - uid: 336
     components:
     - type: Transform
       pos: 19.5,16.5
       parent: 1
-  - uid: 69
+  - uid: 337
     components:
     - type: Transform
       pos: 19.5,13.5
       parent: 1
-  - uid: 91
+  - uid: 338
     components:
     - type: Transform
       pos: 0.5,14.5
       parent: 1
-  - uid: 95
+  - uid: 339
     components:
     - type: Transform
       pos: 18.5,16.5
       parent: 1
-  - uid: 157
+  - uid: 340
     components:
     - type: Transform
       pos: 13.5,8.5
       parent: 1
-  - uid: 158
+  - uid: 341
     components:
     - type: Transform
       pos: 12.5,9.5
       parent: 1
-  - uid: 194
+  - uid: 342
     components:
     - type: Transform
       pos: 12.5,10.5
       parent: 1
-  - uid: 195
+  - uid: 343
     components:
     - type: Transform
       pos: 16.5,9.5
       parent: 1
-  - uid: 196
+  - uid: 344
     components:
     - type: Transform
       pos: 15.5,10.5
       parent: 1
-  - uid: 206
+  - uid: 345
     components:
     - type: Transform
       pos: 16.5,6.5
       parent: 1
-  - uid: 245
+  - uid: 346
     components:
     - type: Transform
       pos: 21.5,13.5
       parent: 1
-  - uid: 277
+  - uid: 347
     components:
     - type: Transform
       pos: 22.5,15.5
       parent: 1
-  - uid: 290
+  - uid: 348
     components:
     - type: Transform
       pos: 3.5,12.5
       parent: 1
-  - uid: 291
+  - uid: 349
     components:
     - type: Transform
       pos: 2.5,16.5
       parent: 1
-  - uid: 297
+  - uid: 350
     components:
     - type: Transform
       pos: 3.5,16.5
       parent: 1
-  - uid: 307
+  - uid: 351
     components:
     - type: Transform
       pos: 3.5,13.5
       parent: 1
-  - uid: 308
+  - uid: 352
     components:
     - type: Transform
       pos: 0.5,13.5
       parent: 1
 - proto: WallSolid
   entities:
-  - uid: 14
+  - uid: 353
     components:
     - type: Transform
       pos: 4.5,1.5
       parent: 1
-  - uid: 15
+  - uid: 354
     components:
     - type: Transform
       pos: 4.5,2.5
       parent: 1
-  - uid: 17
+  - uid: 355
     components:
     - type: Transform
       pos: 3.5,3.5
       parent: 1
-  - uid: 18
+  - uid: 356
     components:
     - type: Transform
       pos: 3.5,4.5
       parent: 1
-  - uid: 19
+  - uid: 357
     components:
     - type: Transform
       pos: 2.5,4.5
       parent: 1
-  - uid: 23
+  - uid: 358
     components:
     - type: Transform
       pos: 0.5,2.5
       parent: 1
-  - uid: 26
+  - uid: 359
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 1
-  - uid: 27
+  - uid: 360
     components:
     - type: Transform
       pos: 2.5,0.5
       parent: 1
-  - uid: 31
+  - uid: 361
     components:
     - type: Transform
       pos: 21.5,6.5
       parent: 1
-  - uid: 66
+  - uid: 362
     components:
     - type: Transform
       pos: 20.5,10.5
       parent: 1
-  - uid: 72
+  - uid: 363
     components:
     - type: Transform
       pos: 22.5,8.5
       parent: 1
-  - uid: 93
+  - uid: 364
     components:
     - type: Transform
       pos: 18.5,7.5
       parent: 1
-  - uid: 94
+  - uid: 365
     components:
     - type: Transform
       pos: 18.5,6.5
       parent: 1
-  - uid: 97
+  - uid: 366
     components:
     - type: Transform
       pos: 22.5,9.5
       parent: 1
-  - uid: 98
+  - uid: 367
     components:
     - type: Transform
       pos: 21.5,10.5
       parent: 1
-  - uid: 101
+  - uid: 368
     components:
     - type: Transform
       pos: 12.5,1.5
       parent: 1
-  - uid: 104
+  - uid: 369
     components:
     - type: Transform
       pos: 12.5,4.5
       parent: 1
-  - uid: 105
+  - uid: 370
     components:
     - type: Transform
       pos: 13.5,4.5
       parent: 1
-  - uid: 108
+  - uid: 371
     components:
     - type: Transform
       pos: 16.5,4.5
       parent: 1
-  - uid: 110
+  - uid: 372
     components:
     - type: Transform
       pos: 16.5,2.5
       parent: 1
-  - uid: 111
+  - uid: 373
     components:
     - type: Transform
       pos: 16.5,1.5
       parent: 1
-  - uid: 134
+  - uid: 374
     components:
     - type: Transform
       pos: 6.5,9.5
       parent: 1
-  - uid: 135
+  - uid: 375
     components:
     - type: Transform
       pos: 6.5,8.5
       parent: 1
-  - uid: 151
+  - uid: 376
     components:
     - type: Transform
       pos: 7.5,8.5
       parent: 1
-  - uid: 155
+  - uid: 377
     components:
     - type: Transform
       pos: 7.5,6.5
       parent: 1
-  - uid: 159
+  - uid: 378
     components:
     - type: Transform
       pos: 9.5,7.5
       parent: 1
-  - uid: 160
+  - uid: 379
     components:
     - type: Transform
       pos: 10.5,8.5
       parent: 1
-  - uid: 161
+  - uid: 380
     components:
     - type: Transform
       pos: 9.5,10.5
       parent: 1
-  - uid: 162
+  - uid: 381
     components:
     - type: Transform
       pos: 8.5,10.5
       parent: 1
-  - uid: 165
+  - uid: 382
     components:
     - type: Transform
       pos: 2.5,10.5
       parent: 1
-  - uid: 168
+  - uid: 383
     components:
     - type: Transform
       pos: 3.5,8.5
       parent: 1
-  - uid: 173
+  - uid: 384
     components:
     - type: Transform
       pos: 1.5,1.5
       parent: 1
-  - uid: 179
+  - uid: 385
     components:
     - type: Transform
       pos: 1.5,8.5
       parent: 1
-  - uid: 180
+  - uid: 386
     components:
     - type: Transform
       pos: 3.5,6.5
       parent: 1
-  - uid: 181
+  - uid: 387
     components:
     - type: Transform
       pos: 1.5,7.5
       parent: 1
-  - uid: 197
+  - uid: 388
     components:
     - type: Transform
       pos: 3.5,10.5
       parent: 1
-  - uid: 200
+  - uid: 389
     components:
     - type: Transform
       pos: 2.5,6.5
       parent: 1
-  - uid: 247
+  - uid: 390
     components:
     - type: Transform
       pos: 18.5,9.5
       parent: 1
 - proto: WallSolidRust
   entities:
-  - uid: 12
+  - uid: 391
     components:
     - type: Transform
       pos: 3.5,1.5
       parent: 1
-  - uid: 13
+  - uid: 392
     components:
     - type: Transform
       pos: 3.5,0.5
       parent: 1
-  - uid: 16
+  - uid: 393
     components:
     - type: Transform
       pos: 4.5,3.5
       parent: 1
-  - uid: 20
+  - uid: 394
     components:
     - type: Transform
       pos: 1.5,4.5
       parent: 1
-  - uid: 21
+  - uid: 395
     components:
     - type: Transform
       pos: 0.5,3.5
       parent: 1
-  - uid: 22
+  - uid: 396
     components:
     - type: Transform
       pos: 1.5,3.5
       parent: 1
-  - uid: 24
+  - uid: 397
     components:
     - type: Transform
       pos: 0.5,1.5
       parent: 1
-  - uid: 102
+  - uid: 398
     components:
     - type: Transform
       pos: 12.5,3.5
       parent: 1
-  - uid: 103
+  - uid: 399
     components:
     - type: Transform
       pos: 12.5,2.5
       parent: 1
-  - uid: 106
+  - uid: 400
     components:
     - type: Transform
       pos: 15.5,4.5
       parent: 1
-  - uid: 107
+  - uid: 401
     components:
     - type: Transform
       pos: 14.5,4.5
       parent: 1
-  - uid: 109
+  - uid: 402
     components:
     - type: Transform
       pos: 16.5,3.5
       parent: 1
-  - uid: 112
+  - uid: 403
     components:
     - type: Transform
       pos: 14.5,1.5
       parent: 1
-  - uid: 125
+  - uid: 404
     components:
     - type: Transform
       pos: 9.5,6.5
       parent: 1
-  - uid: 126
+  - uid: 405
     components:
     - type: Transform
       pos: 9.5,8.5
       parent: 1
-  - uid: 127
+  - uid: 406
     components:
     - type: Transform
       pos: 7.5,10.5
       parent: 1
-  - uid: 128
+  - uid: 407
     components:
     - type: Transform
       pos: 3.5,9.5
       parent: 1
-  - uid: 139
+  - uid: 408
     components:
     - type: Transform
       pos: 10.5,9.5
       parent: 1
-  - uid: 140
+  - uid: 409
     components:
     - type: Transform
       pos: 6.5,10.5
       parent: 1
-  - uid: 141
+  - uid: 410
     components:
     - type: Transform
       pos: 3.5,7.5
       parent: 1
-  - uid: 142
+  - uid: 411
     components:
     - type: Transform
       pos: 7.5,7.5
       parent: 1
-  - uid: 163
+  - uid: 412
     components:
     - type: Transform
       pos: 8.5,6.5
       parent: 1
-  - uid: 201
+  - uid: 413
     components:
     - type: Transform
       pos: 1.5,6.5
       parent: 1
-  - uid: 202
+  - uid: 414
     components:
     - type: Transform
       pos: 10.5,10.5
       parent: 1
-  - uid: 227
+  - uid: 415
     components:
     - type: Transform
       pos: 1.5,10.5
       parent: 1
-  - uid: 228
+  - uid: 416
     components:
     - type: Transform
       pos: 1.5,9.5
       parent: 1
-  - uid: 246
+  - uid: 417
     components:
     - type: Transform
       pos: 18.5,10.5
       parent: 1
-  - uid: 248
+  - uid: 418
     components:
     - type: Transform
       pos: 19.5,10.5
       parent: 1
-  - uid: 249
+  - uid: 419
     components:
     - type: Transform
       pos: 18.5,8.5
       parent: 1
-  - uid: 271
+  - uid: 420
     components:
     - type: Transform
       pos: 22.5,6.5
       parent: 1
-  - uid: 272
+  - uid: 421
     components:
     - type: Transform
       pos: 19.5,6.5
       parent: 1
-  - uid: 273
+  - uid: 422
     components:
     - type: Transform
       pos: 22.5,10.5
       parent: 1
-  - uid: 274
+  - uid: 423
     components:
     - type: Transform
       pos: 22.5,7.5
diff --git a/Resources/Prototypes/Entities/Markers/rooms.yml b/Resources/Prototypes/Entities/Markers/rooms.yml
index e4f341daf134d468609fe3f1fa65c8a55c00954a..5e2761e0123d8f6a66c4603cbdccaef11b738925 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/rooms.yml
+++ b/Resources/Prototypes/Entities/Markers/rooms.yml
@@ -1,11 +1,9 @@
 - type: entity
   id: BaseRoomMarker
-  name: Room marker
+  name: room spawner
   parent: MarkerBase
-  suffix: Weh
   components:
   - type: RoomFill
-    size: 5,5
   - type: Sprite
     layers:
       - state: red
diff --git a/Resources/Prototypes/Procedural/Themes/vgroidinterior.yml b/Resources/Prototypes/Procedural/Themes/vgroidinterior.yml
index 237c53cbaa975e1e0e33859ba9522987af8eeef8..bd51fcb74a26ab55e9ee9712df93f64852429f39 100644 (file)
--- a/Resources/Prototypes/Procedural/Themes/vgroidinterior.yml
+++ b/Resources/Prototypes/Procedural/Themes/vgroidinterior.yml
@@ -3,6 +3,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 0,0
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -11,6 +12,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 6,0
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -19,6 +21,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 12,0
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -27,6 +30,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 18,0
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -35,6 +39,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 0,6
+  ignoreTile: FloorShuttleOrange
   tags:
     - VGRoidInterior
 
@@ -43,6 +48,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 6,6
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -51,6 +57,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 12,6
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -59,6 +66,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 18,6
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -67,6 +75,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 0,12
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -75,6 +84,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 6,12
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -83,6 +93,7 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 12,12
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
@@ -91,6 +102,25 @@
   size: 5,5
   atlas: /Maps/Dungeon/vgroidinterior.yml
   offset: 18,12
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - VGRoidInterior
+
+- type: dungeonRoom
+  id: VGRoidInterior11x5a
+  size: 11,5
+  atlas: /Maps/Dungeon/vgroidinterior.yml
+  offset: 0,18
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - VGRoidInterior
+
+- type: dungeonRoom
+  id: VGRoidInterior11x5b
+  size: 11,5
+  atlas: /Maps/Dungeon/vgroidinterior.yml
+  offset: 12,18
+  ignoreTile: FloorShuttleOrange
   tags:
   - VGRoidInterior
 
Форк Space Station 14 с переводами на русский