Update GhostSystem.cs

Content.Client/Ghost/GhostSystem.cs

@@ -113,6 +113,10 @@ namespace Content.Client.Ghost
             _actions.RemoveAction(uid, component.ToggleFoVActionEntity);
             _actions.RemoveAction(uid, component.ToggleGhostsActionEntity);
             _actions.RemoveAction(uid, component.ToggleGhostHearingActionEntity);
+            //CP14
+            _actions.RemoveAction(uid, component.CP14ZLevelUpActionEntity);
+            _actions.RemoveAction(uid, component.CP14ZLevelDownActionEntity);
+            //CP14 end
 
             if (uid != _playerManager.LocalEntity)
                 return;

Content.Server/Ghost/GhostSystem.cs

@@ -213,13 +213,13 @@ namespace Content.Server.Ghost
 
         private void OnMapInit(EntityUid uid, GhostComponent component, MapInitEvent args)
         {
-            //if (_actions.AddAction(uid, ref component.BooActionEntity, out var act, component.BooAction)
-            //    && act.UseDelay != null)
-            //{
-            //    var start = _gameTiming.CurTime;
-            //    var end = start + act.UseDelay.Value;
-            //    _actions.SetCooldown(component.BooActionEntity.Value, start, end);
-            //}
+            if (_actions.AddAction(uid, ref component.BooActionEntity, out var act, component.BooAction)
+                && act.UseDelay != null)
+            {
+                var start = _gameTiming.CurTime;
+                var end = start + act.UseDelay.Value;
+                _actions.SetCooldown(component.BooActionEntity.Value, start, end);
+            }
 
             _actions.AddAction(uid, ref component.ToggleGhostHearingActionEntity, component.ToggleGhostHearingAction);
             _actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction);

Resources/Maps/_CP14/comoss.yml

@@ -109,7 +109,7 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: EgAAAAAIEgAAAAAEEgAAAAAFAgAAAAAFAgAAAAAPBAAAAAANBAAAAAALBAAAAAABBAAAAAAABAAAAAAICQAAAAAIBAAAAAANBwAAAAABBwAAAAACBQAAAAABBgAAAAABEgAAAAACHQAAAAAAHAAAAAABAgAAAAABAgAAAAAOBQAAAAACBQAAAAABBgAAAAADBgAAAAABBAAAAAAEHQAAAAACBAAAAAANBQAAAAABBQAAAAADBQAAAAAABQAAAAAAEgAAAAAIHAAAAAAABAAAAAANBAAAAAAJBAAAAAABBAAAAAABBQAAAAAABgAAAAADBgAAAAACBAAAAAAMHAAAAAAFBAAAAAAHBwAAAAABBQAAAAACBQAAAAADBwAAAAADEgAAAAAEHAAAAAACBAAAAAAKBwAAAAACBwAAAAADBwAAAAABBwAAAAABBQAAAAABBQAAAAADBAAAAAAEAgAAAAADBAAAAAAABgAAAAAABgAAAAACBQAAAAABBgAAAAACEgAAAAACAgAAAAAKBAAAAAAHBgAAAAABBgAAAAAABwAAAAAABwAAAAADBwAAAAACBwAAAAABBAAAAAAIHAAAAAAFBAAAAAABBwAAAAABBgAAAAAABwAAAAABBQAAAAAAEgAAAAAIAgAAAAADBAAAAAALBgAAAAABBgAAAAADBwAAAAABBQAAAAADBQAAAAAABQAAAAADBAAAAAAIAgAAAAAABAAAAAANBwAAAAACBwAAAAAABQAAAAADBQAAAAADEgAAAAAAAgAAAAAMBAAAAAAFBAAAAAALBAAAAAAIBAAAAAAFBAAAAAAGBQAAAAAABAAAAAALBAAAAAADAgAAAAAMBAAAAAAJBAAAAAAKBAAAAAAMBAAAAAAABAAAAAAGEgAAAAAFAgAAAAAHAgAAAAAMAgAAAAADAgAAAAACAgAAAAAIAgAAAAABAgAAAAANAgAAAAALAgAAAAAAAgAAAAAPAgAAAAACAgAAAAAOAgAAAAAPAgAAAAAAAgAAAAAEEgAAAAAGEgAAAAAGEgAAAAAEEgAAAAAEEgAAAAADEgAAAAAAEgAAAAAIEgAAAAAEEgAAAAACEgAAAAADEgAAAAAHEgAAAAAIEgAAAAAFEgAAAAAGEgAAAAAFEgAAAAAIEgAAAAADEgAAAAAFEgAAAAAAEgAAAAAIEgAAAAAGEgAAAAADEgAAAAAGEgAAAAAEEgAAAAAIEgAAAAAAEgAAAAAEEgAAAAAEEgAAAAABEgAAAAAHEgAAAAAEEgAAAAADAgAAAAAMAgAAAAAGHQAAAAABHAAAAAAEAgAAAAANAgAAAAAKAgAAAAAOAgAAAAACHAAAAAADHgAAAAAFHAAAAAABAgAAAAABAgAAAAAFAgAAAAAPAgAAAAADAgAAAAAGBAAAAAALBAAAAAAGBAAAAAAKBAAAAAAKBAAAAAAGBAAAAAAFBAAAAAAHAgAAAAAGBAAAAAACBAAAAAACBAAAAAADBAAAAAAKBAAAAAACBQAAAAACBAAAAAAFBAAAAAAMBQAAAAACBQAAAAABBgAAAAADBQAAAAADBwAAAAADBQAAAAACBAAAAAANHgAAAAABBAAAAAABBgAAAAABBgAAAAACBQAAAAACBQAAAAABBwAAAAAABwAAAAAABAAAAAAMBQAAAAAABQAAAAABBgAAAAACBQAAAAAABwAAAAADBwAAAAAABAAAAAAMAgAAAAADBAAAAAAJBgAAAAAABQAAAAACBQAAAAAABgAAAAADBwAAAAADBwAAAAAABAAAAAAFBQAAAAABBgAAAAADBQAAAAACBQAAAAACBwAAAAABBgAAAAABBAAAAAAAHAAAAAADBAAAAAADBQAAAAAABwAAAAACBQAAAAABBQAAAAAABQAAAAAABgAAAAACBAAAAAAEBgAAAAACBQAAAAACBAAAAAADBAAAAAAHBAAAAAADBAAAAAADBAAAAAAAHAAAAAABBAAAAAAABAAAAAANBAAAAAAGBQAAAAACBQAAAAACBQAAAAACBAAAAAADBAAAAAAL
+          tiles: EgAAAAAIEgAAAAAEEgAAAAAFAgAAAAAFAgAAAAAPBAAAAAANBAAAAAALBAAAAAABBAAAAAAABAAAAAAICQAAAAAIBAAAAAANBwAAAAABBwAAAAACBQAAAAABBgAAAAABEgAAAAACHQAAAAAAHAAAAAABAgAAAAABAgAAAAAOBQAAAAACBQAAAAABBgAAAAADBgAAAAABBAAAAAAEHQAAAAACBAAAAAANBQAAAAABBQAAAAADBQAAAAAABQAAAAAAEgAAAAAIHAAAAAAABAAAAAANBAAAAAAJBAAAAAABBAAAAAABBQAAAAAABgAAAAADBgAAAAACBAAAAAAMHAAAAAAFBAAAAAAHBwAAAAABBQAAAAACBQAAAAADBwAAAAADEgAAAAAEHAAAAAACBAAAAAAKBwAAAAACBwAAAAADBwAAAAABBwAAAAABBQAAAAABBQAAAAADBAAAAAAEAgAAAAADBAAAAAAABgAAAAAABgAAAAACBQAAAAABBgAAAAACEgAAAAACAgAAAAAKBAAAAAAHBgAAAAABBgAAAAAABwAAAAAABwAAAAADBwAAAAACBwAAAAABBAAAAAAIHAAAAAAFBAAAAAABBwAAAAABBgAAAAAABwAAAAABBQAAAAAAEgAAAAAIAgAAAAADBAAAAAALBgAAAAABBgAAAAADBwAAAAABBQAAAAADBQAAAAAABQAAAAADBAAAAAAIAgAAAAAABAAAAAANBwAAAAACBwAAAAAABQAAAAADBQAAAAADEgAAAAAAAgAAAAAMBAAAAAAFBAAAAAALBAAAAAAIBAAAAAAFBAAAAAAGBQAAAAAABAAAAAALBAAAAAADAgAAAAAMBAAAAAAJBAAAAAAKBAAAAAAMBAAAAAAABAAAAAAGEgAAAAAFAgAAAAAHAgAAAAAMAgAAAAADAgAAAAACAgAAAAAIAgAAAAABAgAAAAANAgAAAAALAgAAAAAAAgAAAAAPAgAAAAACAgAAAAAOAgAAAAAPAgAAAAAAAgAAAAAEEgAAAAAGEgAAAAAGEgAAAAAEEgAAAAAEEgAAAAADEgAAAAAAEgAAAAAIEgAAAAAEEgAAAAACEgAAAAADEgAAAAAHEgAAAAAIEgAAAAAFEgAAAAAGEgAAAAAFEgAAAAAIEgAAAAADEgAAAAAFEgAAAAAAEgAAAAAIEgAAAAAGEgAAAAADEgAAAAAGEgAAAAAEEgAAAAAIEgAAAAAAEgAAAAAEEgAAAAAEEgAAAAABEgAAAAAHEgAAAAAEEgAAAAADAgAAAAAMAgAAAAAGHQAAAAABHAAAAAAEAgAAAAANAgAAAAAKAgAAAAAOAgAAAAACHAAAAAADHgAAAAAFHAAAAAABAgAAAAABAgAAAAAFAgAAAAAPAgAAAAADAgAAAAAGBAAAAAALBAAAAAAGBAAAAAAKBAAAAAAKBAAAAAAGBAAAAAAFBAAAAAAHEgAAAAAABAAAAAACBAAAAAACBAAAAAADBAAAAAAKBAAAAAACBQAAAAACBAAAAAAFBAAAAAAMBQAAAAACBQAAAAABBgAAAAADBQAAAAADBwAAAAADBQAAAAACBAAAAAANEgAAAAAABAAAAAABBgAAAAABBgAAAAACBQAAAAACBQAAAAABBwAAAAAABwAAAAAABAAAAAAMBQAAAAAABQAAAAABBgAAAAACBQAAAAAABwAAAAADBwAAAAAABAAAAAAMEgAAAAAABAAAAAAJBgAAAAAABQAAAAACBQAAAAAABgAAAAADBwAAAAADBwAAAAAABAAAAAAFBQAAAAABBgAAAAADBQAAAAACBQAAAAACBwAAAAABBgAAAAABBAAAAAAAHAAAAAADBAAAAAADBQAAAAAABwAAAAACBQAAAAABBQAAAAAABQAAAAAABgAAAAACBAAAAAAEBgAAAAACBQAAAAACBAAAAAADBAAAAAAHBAAAAAADBAAAAAADBAAAAAAAHAAAAAABBAAAAAAABAAAAAANBAAAAAAGBQAAAAACBQAAAAACBQAAAAACBAAAAAADBAAAAAAL
           version: 6
         0,-1:
           ind: 0,-1
@@ -129,7 +129,7 @@ entities:
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: EgAAAAADHAAAAAACBAAAAAAFBQAAAAAABQAAAAAABQAAAAADBQAAAAAABQAAAAAABAAAAAAKAgAAAAAEBAAAAAACAwAAAAACAwAAAAAEAwAAAAAFAwAAAAAFBAAAAAAFEgAAAAAAAgAAAAANBAAAAAAGBQAAAAADBQAAAAAABQAAAAABBQAAAAAABQAAAAACBAAAAAAAAgAAAAAFBAAAAAALAwAAAAAHAwAAAAABAwAAAAAHAwAAAAAFBAAAAAAHEgAAAAAAAgAAAAAKBAAAAAAKBQAAAAAABAAAAAAFBAAAAAAGBAAAAAAJBAAAAAAABAAAAAAMAgAAAAACBAAAAAACAwAAAAAIAwAAAAAHAwAAAAAGAwAAAAAIBAAAAAAGEgAAAAAFHAAAAAAFAgAAAAAFAgAAAAANAgAAAAAJAgAAAAAOAgAAAAAGAgAAAAAGAgAAAAAIAgAAAAALBAAAAAAEAwAAAAAGAwAAAAAABQAAAAAAAwAAAAAFBAAAAAACEgAAAAABEgAAAAADEgAAAAAGEgAAAAADEgAAAAACEgAAAAAGEgAAAAAAEgAAAAAFEgAAAAAGEgAAAAAFEgAAAAAEAwAAAAAEAwAAAAABAwAAAAADAwAAAAAFAwAAAAAFEgAAAAAFEgAAAAAAEgAAAAAIEgAAAAAGEgAAAAAGEgAAAAAEEgAAAAAHEgAAAAAEEgAAAAADEgAAAAAIEgAAAAAEAwAAAAAEAwAAAAAAAwAAAAACAwAAAAAAAwAAAAACEgAAAAAFHgAAAAAEHQAAAAAAHAAAAAAAHQAAAAAFHAAAAAADHAAAAAAAHAAAAAACHAAAAAACHAAAAAAABAAAAAAFAwAAAAAFAwAAAAAGAwAAAAAHBQAAAAADBQAAAAABEgAAAAAIHQAAAAADBAAAAAAMAQAAAAAAAQAAAAADAQAAAAAEAQAAAAAEAQAAAAACBAAAAAAEAgAAAAAIBAAAAAAEAwAAAAAFAwAAAAAIAwAAAAACAwAAAAABAwAAAAABEgAAAAAHHQAAAAACAQAAAAAAAQAAAAABAQAAAAACAQAAAAADAQAAAAACEgAAAAAFAgAAAAAAAgAAAAAHBAAAAAAEAwAAAAAEAwAAAAAAAwAAAAAAAwAAAAAEAwAAAAAAEgAAAAADHgAAAAAFAQAAAAACAQAAAAAEAQAAAAAEAQAAAAACAQAAAAAAAQAAAAAAAgAAAAAGAgAAAAAIBAAAAAAEAwAAAAADAwAAAAAGAwAAAAAHAwAAAAADAwAAAAACEgAAAAAHHgAAAAAEAQAAAAAAAQAAAAACAQAAAAADAQAAAAAEAQAAAAABAQAAAAAAAgAAAAANAgAAAAAKBAAAAAAEBAAAAAAHBAAAAAAABAAAAAAKBAAAAAANAwAAAAABEgAAAAAEHQAAAAACAQAAAAADEgAAAAADAQAAAAAEAQAAAAACAQAAAAAEAQAAAAADAgAAAAACAgAAAAABBAAAAAALBQAAAAACBQAAAAADBQAAAAACBQAAAAABBQAAAAADEgAAAAAEHAAAAAAFBAAAAAALBAAAAAAGAQAAAAACAQAAAAAAAQAAAAACBAAAAAAJBAAAAAACAgAAAAADBAAAAAAABQAAAAACBQAAAAADBQAAAAADBQAAAAABBQAAAAACEgAAAAAFHAAAAAADBAAAAAACAQAAAAABAQAAAAACAQAAAAAEAQAAAAABAQAAAAAABAAAAAAKAgAAAAAOBAAAAAANBQAAAAAABQAAAAADBQAAAAAABQAAAAAABQAAAAADEgAAAAAGHQAAAAACAQAAAAACAQAAAAAAAQAAAAADAQAAAAADAQAAAAAAAQAAAAAAAgAAAAACAgAAAAAJBAAAAAAFBAAAAAACBAAAAAAIBAAAAAAMBAAAAAAFBQAAAAAAEgAAAAAEAQAAAAAEAQAAAAAEAQAAAAAAAQAAAAAEAQAAAAABAQAAAAAAAQAAAAADAgAAAAAIAgAAAAANBAAAAAAEBQAAAAAABQAAAAACBQAAAAADBQAAAAAABQAAAAAC
+          tiles: EgAAAAADHAAAAAACBAAAAAAFBQAAAAAABQAAAAAABQAAAAADBQAAAAAABQAAAAAABAAAAAAKEgAAAAAABAAAAAACAwAAAAACAwAAAAAEAwAAAAAFAwAAAAAFBAAAAAAFEgAAAAAAAgAAAAANBAAAAAAGBQAAAAADBQAAAAAABQAAAAABBQAAAAAABQAAAAACBAAAAAAAEgAAAAAABAAAAAALAwAAAAAHAwAAAAABAwAAAAAHAwAAAAAFBAAAAAAHEgAAAAAAAgAAAAAKBAAAAAAKBQAAAAAABAAAAAAFBAAAAAAGBAAAAAAJBAAAAAAABAAAAAAMAgAAAAACBAAAAAACAwAAAAAIAwAAAAAHAwAAAAAGAwAAAAAIBAAAAAAGEgAAAAAFHAAAAAAFAgAAAAAFAgAAAAANAgAAAAAJAgAAAAAOAgAAAAAGAgAAAAAGAgAAAAAIAgAAAAALBAAAAAAEAwAAAAAGAwAAAAAABQAAAAAAAwAAAAAFBAAAAAACEgAAAAABEgAAAAADEgAAAAAGEgAAAAADEgAAAAACEgAAAAAGEgAAAAAAEgAAAAAFEgAAAAAGEgAAAAAFEgAAAAAEAwAAAAAEAwAAAAABAwAAAAADAwAAAAAFAwAAAAAFEgAAAAAFEgAAAAAAEgAAAAAIEgAAAAAGEgAAAAAGEgAAAAAEEgAAAAAHEgAAAAAEEgAAAAADEgAAAAAIEgAAAAAEAwAAAAAEAwAAAAAAAwAAAAACAwAAAAAAAwAAAAACEgAAAAAFHgAAAAAEHQAAAAAAHAAAAAAAHQAAAAAFHAAAAAADHAAAAAAAHAAAAAACHAAAAAACHAAAAAAABAAAAAAFAwAAAAAFAwAAAAAGAwAAAAAHBQAAAAADBQAAAAABEgAAAAAIHQAAAAADBAAAAAAMAQAAAAAAAQAAAAADAQAAAAAEAQAAAAAEAQAAAAACBAAAAAAEAgAAAAAIBAAAAAAEAwAAAAAFAwAAAAAIAwAAAAACAwAAAAABAwAAAAABEgAAAAAHHQAAAAACAQAAAAAAAQAAAAABAQAAAAACAQAAAAADAQAAAAACEgAAAAAFAgAAAAAAAgAAAAAHBAAAAAAEAwAAAAAEAwAAAAAAAwAAAAAAAwAAAAAEAwAAAAAAEgAAAAADHgAAAAAFAQAAAAACAQAAAAAEAQAAAAAEAQAAAAACAQAAAAAAAQAAAAAAAgAAAAAGAgAAAAAIBAAAAAAEAwAAAAADAwAAAAAGAwAAAAAHAwAAAAADAwAAAAACEgAAAAAHHgAAAAAEAQAAAAAAAQAAAAACAQAAAAADAQAAAAAEAQAAAAABAQAAAAAAAgAAAAANAgAAAAAKBAAAAAAEBAAAAAAHBAAAAAAABAAAAAAKBAAAAAANAwAAAAABEgAAAAAEHQAAAAACAQAAAAADEgAAAAADAQAAAAAEAQAAAAACAQAAAAAEAQAAAAADAgAAAAACAgAAAAABBAAAAAALBQAAAAACBQAAAAADBQAAAAACBQAAAAABBQAAAAADEgAAAAAEHAAAAAAFBAAAAAALBAAAAAAGAQAAAAACAQAAAAAAAQAAAAACBAAAAAAJBAAAAAACAgAAAAADBAAAAAAABQAAAAACBQAAAAADBQAAAAADBQAAAAABBQAAAAACEgAAAAAFHAAAAAADBAAAAAACAQAAAAABAQAAAAACAQAAAAAEAQAAAAABAQAAAAAABAAAAAAKAgAAAAAOBAAAAAANBQAAAAAABQAAAAADBQAAAAAABQAAAAAABQAAAAADEgAAAAAGHQAAAAACAQAAAAACAQAAAAAAAQAAAAADAQAAAAADAQAAAAAAAQAAAAAAAgAAAAACAgAAAAAJBAAAAAAFBAAAAAACBAAAAAAIBAAAAAAMBAAAAAAFBQAAAAAAEgAAAAAEAQAAAAAEAQAAAAAEAQAAAAAAAQAAAAAEAQAAAAABAQAAAAAAAQAAAAADAgAAAAAIAgAAAAANBAAAAAAEBQAAAAAABQAAAAACBQAAAAADBQAAAAAABQAAAAAC
           version: 6
         -2,-2:
           ind: -2,-2
@@ -145,7 +145,7 @@ entities:
           version: 6
         1,0:
           ind: 1,0
-          tiles: BQAAAAACBwAAAAACBAAAAAAAHAAAAAAEEgAAAAAIEgAAAAAGAgAAAAADBAAAAAADBQAAAAAABgAAAAABBAAAAAAKBAAAAAALBAAAAAANHAAAAAACHAAAAAABHAAAAAABBQAAAAACBQAAAAACBAAAAAACAgAAAAAHEgAAAAAEEgAAAAADAgAAAAAFBAAAAAAKBwAAAAAABwAAAAACBwAAAAACBwAAAAADBAAAAAAMHgAAAAAEHAAAAAADHAAAAAACBwAAAAABBgAAAAAABAAAAAAFAgAAAAAHEgAAAAADEgAAAAABAgAAAAAIBAAAAAAFEwAAAAADBwAAAAAABQAAAAAABwAAAAACBAAAAAANHgAAAAAEHAAAAAAFHAAAAAAFBwAAAAABBQAAAAAABAAAAAAFAgAAAAAMEgAAAAABEgAAAAAIAgAAAAAABAAAAAAGEwAAAAADEwAAAAADBQAAAAABEwAAAAACBAAAAAANHgAAAAACHAAAAAADHAAAAAAEBgAAAAADBgAAAAADBQAAAAADAgAAAAAMEgAAAAADEgAAAAADAgAAAAAMBgAAAAACBQAAAAABBQAAAAAABQAAAAADBQAAAAAABAAAAAABHgAAAAAFHAAAAAADHAAAAAABBgAAAAACBgAAAAADBAAAAAAJAgAAAAAPEgAAAAAFEgAAAAAAAgAAAAAPBAAAAAAFBQAAAAADBQAAAAADBQAAAAADBQAAAAACBAAAAAANHAAAAAABHAAAAAAFHAAAAAACBQAAAAACBAAAAAAGBAAAAAAIHAAAAAADEgAAAAAEEgAAAAAAHAAAAAADBAAAAAADBAAAAAAMBAAAAAALBAAAAAALBAAAAAANBAAAAAAEHAAAAAACHAAAAAAAHAAAAAACAgAAAAAOAgAAAAACHAAAAAAEHgAAAAABEgAAAAADEgAAAAAHHAAAAAABHAAAAAAFHAAAAAABAgAAAAAIAgAAAAANAgAAAAADAgAAAAALHAAAAAAFHAAAAAAEHAAAAAAEEgAAAAAGEgAAAAADEgAAAAABEgAAAAAGEgAAAAACEgAAAAAFEgAAAAADEgAAAAAIEgAAAAAAEgAAAAAGEgAAAAAFEgAAAAACEgAAAAAFEgAAAAAIEgAAAAAGEgAAAAAHEgAAAAAFEgAAAAAFEgAAAAACEgAAAAADEgAAAAAIEgAAAAAHEgAAAAAHEgAAAAAGEgAAAAAFEgAAAAAGEgAAAAAAEgAAAAACEgAAAAAGEgAAAAAGEgAAAAAGEgAAAAAFAgAAAAAMAgAAAAAIAgAAAAAMAgAAAAALHAAAAAADAgAAAAAEAgAAAAABHgAAAAAAHAAAAAAAAgAAAAANHAAAAAABHAAAAAADHAAAAAABHAAAAAABHAAAAAAAHAAAAAACAgAAAAAGBAAAAAAGBwAAAAACBAAAAAAABAAAAAALBAAAAAADBAAAAAAIBAAAAAAFHAAAAAABBAAAAAAEBAAAAAAABAAAAAAGBAAAAAAEAwAAAAADBAAAAAAIBAAAAAAKHgAAAAADBAAAAAACBwAAAAADBgAAAAAABQAAAAABBgAAAAABBAAAAAAFBAAAAAAJHAAAAAAABAAAAAADDQAAAAAADQAAAAAAAwAAAAADAwAAAAAFAwAAAAAFBAAAAAALHAAAAAABBAAAAAAIBQAAAAADBQAAAAAABgAAAAAABwAAAAABBwAAAAABBAAAAAADHAAAAAAEBAAAAAACDQAAAAAADQAAAAAAAwAAAAAIAwAAAAAFAwAAAAAABAAAAAABHAAAAAACBAAAAAACBgAAAAADBgAAAAACBQAAAAAABwAAAAABBwAAAAACBAAAAAABHAAAAAAFBAAAAAAEDQAAAAAADQAAAAAABAAAAAAABAAAAAAJAwAAAAAIBAAAAAAEAgAAAAAFBAAAAAABBgAAAAACBgAAAAABBQAAAAADBQAAAAADBQAAAAAABAAAAAANHAAAAAAABAAAAAABDQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAA
+          tiles: BQAAAAACBwAAAAACBAAAAAAAHAAAAAAEEgAAAAAIEgAAAAAGAgAAAAADBAAAAAADBQAAAAAABgAAAAABBAAAAAAKBAAAAAALBAAAAAANHAAAAAACHAAAAAABHAAAAAABBQAAAAACBQAAAAACBAAAAAACAgAAAAAHEgAAAAAEEgAAAAADAgAAAAAFBAAAAAAKBwAAAAAABwAAAAACBwAAAAACBwAAAAADBAAAAAAMHgAAAAAEHAAAAAADHAAAAAACBwAAAAABBgAAAAAABAAAAAAFAgAAAAAHEgAAAAADEgAAAAABAgAAAAAIBAAAAAAFEwAAAAADBwAAAAAABQAAAAAABwAAAAACBAAAAAANHgAAAAAEHAAAAAAFHAAAAAAFBwAAAAABBQAAAAAABAAAAAAFAgAAAAAMEgAAAAABEgAAAAAIAgAAAAAABAAAAAAGEwAAAAADEwAAAAADBQAAAAABEwAAAAACBAAAAAANHgAAAAACHAAAAAADHAAAAAAEBgAAAAADBgAAAAADBQAAAAADAgAAAAAMEgAAAAADEgAAAAADAgAAAAAMBgAAAAACBQAAAAABBQAAAAAABQAAAAADBQAAAAAABAAAAAABHgAAAAAFHAAAAAADHAAAAAABBgAAAAACBgAAAAADBAAAAAAJAgAAAAAPEgAAAAAFEgAAAAAAAgAAAAAPBAAAAAAFBQAAAAADBQAAAAADBQAAAAADBQAAAAACBAAAAAANHAAAAAABHAAAAAAFHAAAAAACBQAAAAACBAAAAAAGBAAAAAAIHAAAAAADEgAAAAAEEgAAAAAAHAAAAAADBAAAAAADBAAAAAAMBAAAAAALBAAAAAALBAAAAAANBAAAAAAEHAAAAAACHAAAAAAAEgAAAAAAAgAAAAAOAgAAAAACHAAAAAAEHgAAAAABEgAAAAADEgAAAAAHHAAAAAABHAAAAAAFHAAAAAABAgAAAAAIAgAAAAANAgAAAAADAgAAAAALHAAAAAAFHAAAAAAEEgAAAAAAEgAAAAAGEgAAAAADEgAAAAABEgAAAAAGEgAAAAACEgAAAAAFEgAAAAADEgAAAAAIEgAAAAAAEgAAAAAGEgAAAAAFEgAAAAACEgAAAAAFEgAAAAAIEgAAAAAGEgAAAAAHEgAAAAAFEgAAAAAFEgAAAAACEgAAAAADEgAAAAAIEgAAAAAHEgAAAAAHEgAAAAAGEgAAAAAFEgAAAAAGEgAAAAAAEgAAAAACEgAAAAAGEgAAAAAGEgAAAAAGEgAAAAAFAgAAAAAMAgAAAAAIAgAAAAAMAgAAAAALHAAAAAADAgAAAAAEAgAAAAABHgAAAAAAHAAAAAAAAgAAAAANHAAAAAABHAAAAAADHAAAAAABHAAAAAABHAAAAAAAHAAAAAACAgAAAAAGBAAAAAAGBwAAAAACBAAAAAAABAAAAAALBAAAAAADBAAAAAAIHAAAAAAAHAAAAAABBAAAAAAEBAAAAAAABAAAAAAGBAAAAAAEAwAAAAADBAAAAAAIBAAAAAAKHgAAAAADBAAAAAACBwAAAAADBgAAAAAABQAAAAABBgAAAAABBAAAAAAFBAAAAAAJHAAAAAAABAAAAAADDQAAAAAADQAAAAAAAwAAAAADAwAAAAAFAwAAAAAFBAAAAAALHAAAAAABBAAAAAAIBQAAAAADBQAAAAAABgAAAAAABwAAAAABBwAAAAABBAAAAAADHAAAAAAEBAAAAAACDQAAAAAADQAAAAAAAwAAAAAIAwAAAAAFAwAAAAAABAAAAAABHAAAAAACBAAAAAACBgAAAAADBgAAAAACBQAAAAAABwAAAAABBwAAAAACBAAAAAABHAAAAAAFBAAAAAAEDQAAAAAADQAAAAAABAAAAAAABAAAAAAJAwAAAAAIBAAAAAAEAgAAAAAFBAAAAAABBgAAAAACBgAAAAABBQAAAAADBQAAAAADBQAAAAAABAAAAAANHAAAAAAABAAAAAABDQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
@@ -337,7 +337,7 @@ entities:
           version: 6
         2,0:
           ind: 2,0
-          tiles: CQAAAAAICQAAAAADCQAAAAAECQAAAAANCQAAAAAGCQAAAAAJCQAAAAADCQAAAAAKCQAAAAALCQAAAAALCQAAAAALCQAAAAANCQAAAAANCQAAAAACCQAAAAAACQAAAAAFCQAAAAAMCQAAAAAECQAAAAAACQAAAAAJCQAAAAAFCQAAAAAACQAAAAANCQAAAAAKCQAAAAAKCQAAAAALCQAAAAAACQAAAAALCQAAAAAMCQAAAAAKCQAAAAALCQAAAAALCQAAAAAECQAAAAAKCQAAAAAECQAAAAANCQAAAAAECQAAAAAHCQAAAAABCQAAAAAFCQAAAAAKCQAAAAAJCQAAAAABCQAAAAAJCQAAAAAMCQAAAAANCQAAAAALCQAAAAAFCQAAAAAICQAAAAAICQAAAAAGCQAAAAAGCQAAAAAGCQAAAAAKCQAAAAAFCQAAAAABCQAAAAAECQAAAAAICQAAAAABCQAAAAABCQAAAAAJCQAAAAANCQAAAAAJCQAAAAAKCQAAAAAMCQAAAAADHAAAAAABHAAAAAAFCQAAAAAMCQAAAAAACQAAAAACCQAAAAAJCQAAAAAFCQAAAAAACQAAAAALCQAAAAAKCQAAAAAECQAAAAADCQAAAAAFCQAAAAAHHAAAAAADHAAAAAADHAAAAAAEHAAAAAADHAAAAAACCQAAAAAMCQAAAAAICQAAAAANCQAAAAAECQAAAAAKCQAAAAANCQAAAAAACQAAAAAGCQAAAAANCQAAAAABCQAAAAAIHAAAAAAAHAAAAAADHAAAAAAEHAAAAAAEHAAAAAAFCQAAAAABCQAAAAAECQAAAAAKCQAAAAACCQAAAAADCQAAAAAICQAAAAAACQAAAAACCQAAAAAGCQAAAAAACQAAAAADHAAAAAAEHAAAAAAFHAAAAAAEHAAAAAACHAAAAAADHAAAAAAEHAAAAAAAHAAAAAAFHAAAAAAEHAAAAAACCQAAAAAHCQAAAAALCQAAAAAKCQAAAAAECQAAAAANCQAAAAABEgAAAAABEgAAAAABEgAAAAAFEgAAAAACEgAAAAABEgAAAAACEgAAAAABHAAAAAABHAAAAAAEHAAAAAAFCQAAAAAICQAAAAADCQAAAAAICQAAAAAECQAAAAANAgAAAAAGEgAAAAAFEgAAAAAFEgAAAAAGEgAAAAAAEgAAAAAEEgAAAAADEgAAAAAHEgAAAAADAgAAAAADCQAAAAAJCQAAAAAIAgAAAAAACQAAAAACAgAAAAABAgAAAAACCQAAAAANHAAAAAADHAAAAAABHAAAAAAEHAAAAAAFHAAAAAAAHAAAAAADHAAAAAADHAAAAAABCQAAAAACCQAAAAAGCQAAAAAKCQAAAAAACQAAAAAHCQAAAAAMCQAAAAABCQAAAAAAHAAAAAADHAAAAAAFHAAAAAAEHAAAAAAEHAAAAAADHAAAAAAAHAAAAAAACQAAAAAECQAAAAACCQAAAAALCQAAAAAJCQAAAAAICQAAAAANCQAAAAANCQAAAAADCQAAAAANHAAAAAADHAAAAAAAHAAAAAACHAAAAAAFHAAAAAADCQAAAAAACQAAAAAGCQAAAAAHCQAAAAAGCQAAAAANCQAAAAADCQAAAAALCQAAAAAECQAAAAAFCQAAAAACCQAAAAAKBAAAAAAFBAAAAAANBAAAAAAMHAAAAAAFCQAAAAALCQAAAAADCQAAAAAGCQAAAAAHCQAAAAABCQAAAAAMCQAAAAAACQAAAAACCQAAAAACCQAAAAAICQAAAAADCQAAAAANDQAAAAAADQAAAAAABAAAAAAGHAAAAAABCQAAAAACCQAAAAAHCQAAAAAHCQAAAAANCQAAAAAJCQAAAAADCQAAAAADCQAAAAACCQAAAAAACQAAAAANCQAAAAACCQAAAAACDQAAAAAADQAAAAAABAAAAAABHAAAAAAFCQAAAAABCQAAAAABCQAAAAAFCQAAAAAJCQAAAAABCQAAAAACCQAAAAAACQAAAAAGCQAAAAABCQAAAAABCQAAAAAACQAAAAAM
+          tiles: CQAAAAAICQAAAAADCQAAAAAECQAAAAANCQAAAAAGCQAAAAAJCQAAAAADCQAAAAAKCQAAAAALCQAAAAALCQAAAAALCQAAAAANCQAAAAANCQAAAAACCQAAAAAACQAAAAAFCQAAAAAMCQAAAAAECQAAAAAACQAAAAAJCQAAAAAFCQAAAAAACQAAAAANCQAAAAAKCQAAAAAKCQAAAAALCQAAAAAACQAAAAALCQAAAAAMCQAAAAAKCQAAAAALCQAAAAALCQAAAAAECQAAAAAKCQAAAAAECQAAAAANCQAAAAAECQAAAAAHCQAAAAABCQAAAAAFCQAAAAAKCQAAAAAJCQAAAAABCQAAAAAJCQAAAAAMCQAAAAANCQAAAAALCQAAAAAFCQAAAAAICQAAAAAICQAAAAAGCQAAAAAGCQAAAAAGCQAAAAAKCQAAAAAFCQAAAAABCQAAAAAECQAAAAAICQAAAAABCQAAAAABCQAAAAAJCQAAAAANCQAAAAAJCQAAAAAKCQAAAAAMCQAAAAADHAAAAAABHAAAAAAFCQAAAAAMCQAAAAAACQAAAAACCQAAAAAJCQAAAAAFCQAAAAAACQAAAAALCQAAAAAKCQAAAAAECQAAAAADCQAAAAAFCQAAAAAHHAAAAAADHAAAAAADHAAAAAAEHAAAAAADHAAAAAACCQAAAAAMCQAAAAAICQAAAAANCQAAAAAECQAAAAAKCQAAAAANCQAAAAAACQAAAAAGCQAAAAANCQAAAAABCQAAAAAIEgAAAAAAHAAAAAADHAAAAAAEHAAAAAAEHAAAAAAFCQAAAAABCQAAAAAECQAAAAAKCQAAAAACCQAAAAADCQAAAAAICQAAAAAACQAAAAACCQAAAAAGCQAAAAAACQAAAAADEgAAAAAAHAAAAAAFHAAAAAAEHAAAAAACHAAAAAADHAAAAAAEHAAAAAAAHAAAAAAFHAAAAAAEHAAAAAACCQAAAAAHCQAAAAALCQAAAAAKCQAAAAAECQAAAAANCQAAAAABEgAAAAABEgAAAAABEgAAAAAFEgAAAAACEgAAAAABEgAAAAACEgAAAAABHAAAAAABHAAAAAAEHAAAAAAFCQAAAAAICQAAAAADCQAAAAAICQAAAAAECQAAAAANAgAAAAAGEgAAAAAFEgAAAAAFEgAAAAAGEgAAAAAAEgAAAAAEEgAAAAADEgAAAAAHEgAAAAADAgAAAAADCQAAAAAJCQAAAAAIAgAAAAAACQAAAAACAgAAAAABAgAAAAACCQAAAAANHAAAAAADHAAAAAABHAAAAAAEHAAAAAAFHAAAAAAAHAAAAAADHAAAAAADHAAAAAABCQAAAAACCQAAAAAGCQAAAAAKCQAAAAAACQAAAAAHCQAAAAAMCQAAAAABCQAAAAAAHAAAAAADHAAAAAAFHAAAAAAEHAAAAAAEHAAAAAADHAAAAAAAHAAAAAAACQAAAAAECQAAAAACCQAAAAALCQAAAAAJCQAAAAAICQAAAAANCQAAAAANCQAAAAADCQAAAAANHAAAAAADHAAAAAAAHAAAAAACHAAAAAAFHAAAAAADCQAAAAAACQAAAAAGCQAAAAAHCQAAAAAGCQAAAAANCQAAAAADCQAAAAALCQAAAAAECQAAAAAFCQAAAAACCQAAAAAKBAAAAAAFBAAAAAANBAAAAAAMHAAAAAAFCQAAAAALCQAAAAADCQAAAAAGCQAAAAAHCQAAAAABCQAAAAAMCQAAAAAACQAAAAACCQAAAAACCQAAAAAICQAAAAADCQAAAAANDQAAAAAADQAAAAAABAAAAAAGHAAAAAABCQAAAAACCQAAAAAHCQAAAAAHCQAAAAANCQAAAAAJCQAAAAADCQAAAAADCQAAAAACCQAAAAAACQAAAAANCQAAAAACCQAAAAACDQAAAAAADQAAAAAABAAAAAABHAAAAAAFCQAAAAABCQAAAAABCQAAAAAFCQAAAAAJCQAAAAABCQAAAAACCQAAAAAACQAAAAAGCQAAAAABCQAAAAABCQAAAAAACQAAAAAM
           version: 6
         3,0:
           ind: 3,0
@@ -2927,14 +2927,14 @@ entities:
   - uid: 2067
     components:
     - type: Transform
-      pos: -12.702304,-10.516837
+      pos: -15.460066,-12.501402
       parent: 2
 - proto: CelloInstrument
   entities:
   - uid: 2074
     components:
     - type: Transform
-      pos: -13.248646,-10.450171
+      pos: -17.239126,-10.453636
       parent: 2
 - proto: ContrabassInstrument
   entities:
@@ -2966,16 +2966,6 @@ entities:
       parent: 2
 - proto: CP14BarrelWater
   entities:
-  - uid: 458
-    components:
-    - type: Transform
-      pos: -12.476003,-12.072022
-      parent: 2
-  - uid: 526
-    components:
-    - type: Transform
-      pos: -13.032779,-11.464826
-      parent: 2
   - uid: 883
     components:
     - type: Transform
@@ -3066,6 +3056,16 @@ entities:
     - type: Transform
       pos: 7.5084343,-30.39766
       parent: 2
+  - uid: 7079
+    components:
+    - type: Transform
+      pos: -17.550323,-12.827489
+      parent: 2
+  - uid: 8404
+    components:
+    - type: Transform
+      pos: -17.17914,-12.276514
+      parent: 2
   - uid: 8660
     components:
     - type: Transform
@@ -3142,13 +3142,12 @@ entities:
   - uid: 466
     components:
     - type: Transform
-      pos: -12.288021,-11.065651
+      pos: -16.565128,-10.377857
       parent: 2
   - uid: 481
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.46799,-10.357254
+      pos: -16.023783,-12.497766
       parent: 2
   - uid: 1049
     components:
@@ -35838,12 +35837,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 36.5,26.5
       parent: 2
-  - uid: 8947
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 32.5,4.5
-      parent: 2
   - uid: 8950
     components:
     - type: Transform
@@ -48653,11 +48646,6 @@ entities:
     - type: Transform
       pos: 25.5,-14.5
       parent: 2
-  - uid: 11958
-    components:
-    - type: Transform
-      pos: 31.5,4.5
-      parent: 2
   - uid: 11959
     components:
     - type: Transform
@@ -48814,11 +48802,6 @@ entities:
     - type: Transform
       pos: 31.5,-6.5
       parent: 2
-  - uid: 11993
-    components:
-    - type: Transform
-      pos: 30.5,6.5
-      parent: 2
   - uid: 11994
     components:
     - type: Transform
@@ -48829,11 +48812,6 @@ entities:
     - type: Transform
       pos: 30.5,-8.5
       parent: 2
-  - uid: 11996
-    components:
-    - type: Transform
-      pos: 31.5,5.5
-      parent: 2
   - uid: 11997
     components:
     - type: Transform
@@ -48854,16 +48832,6 @@ entities:
     - type: Transform
       pos: 30.5,-9.5
       parent: 2
-  - uid: 12001
-    components:
-    - type: Transform
-      pos: 32.5,5.5
-      parent: 2
-  - uid: 12002
-    components:
-    - type: Transform
-      pos: 30.5,5.5
-      parent: 2
   - uid: 12003
     components:
     - type: Transform
@@ -48874,11 +48842,6 @@ entities:
     - type: Transform
       pos: 31.5,-1.5
       parent: 2
-  - uid: 12009
-    components:
-    - type: Transform
-      pos: 30.5,4.5
-      parent: 2
   - uid: 12010
     components:
     - type: Transform
@@ -48904,11 +48867,6 @@ entities:
     - type: Transform
       pos: 31.5,-0.5
       parent: 2
-  - uid: 12015
-    components:
-    - type: Transform
-      pos: 31.5,6.5
-      parent: 2
   - uid: 12016
     components:
     - type: Transform
@@ -48924,11 +48882,6 @@ entities:
     - type: Transform
       pos: 31.5,-12.5
       parent: 2
-  - uid: 12033
-    components:
-    - type: Transform
-      pos: 32.5,6.5
-      parent: 2
   - uid: 12034
     components:
     - type: Transform
@@ -48939,16 +48892,6 @@ entities:
     - type: Transform
       pos: 31.5,0.5
       parent: 2
-  - uid: 12036
-    components:
-    - type: Transform
-      pos: 33.5,5.5
-      parent: 2
-  - uid: 12037
-    components:
-    - type: Transform
-      pos: 33.5,6.5
-      parent: 2
   - uid: 12049
     components:
     - type: Transform
@@ -51460,6 +51403,11 @@ entities:
       parent: 2
 - proto: CP14Bucket
   entities:
+  - uid: 8
+    components:
+    - type: Transform
+      pos: -16.605494,-11.916695
+      parent: 2
   - uid: 1412
     components:
     - type: Transform
@@ -51547,11 +51495,6 @@ entities:
     - type: Transform
       pos: -21.266685,-13.346388
       parent: 2
-  - uid: 8665
-    components:
-    - type: Transform
-      pos: -13.1008215,-12.1579
-      parent: 2
 - proto: CP14CashConverter
   entities:
   - uid: 1498
@@ -52072,11 +52015,6 @@ entities:
     - type: Transform
       pos: -10.5,-29.5
       parent: 2
-  - uid: 2049
-    components:
-    - type: Transform
-      pos: -10.5,-2.5
-      parent: 2
 - proto: CP14Crossbolt
   entities:
   - uid: 7785
@@ -52506,12 +52444,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 24.5,-7.5
       parent: 2
-  - uid: 1847
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-43.5
-      parent: 2
   - uid: 2031
     components:
     - type: Transform
@@ -52599,42 +52531,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,-42.5
       parent: 2
-  - uid: 11837
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-44.5
-      parent: 2
-  - uid: 11881
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-42.5
-      parent: 2
-  - uid: 11899
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-19.5
-      parent: 2
-  - uid: 11900
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-24.5
-      parent: 2
-  - uid: 11901
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-23.5
-      parent: 2
-  - uid: 11902
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-18.5
-      parent: 2
 - proto: CP14CurtainsRedOpened
   entities:
   - uid: 2030
@@ -53136,6 +53032,57 @@ entities:
     - type: Transform
       pos: -17.307873,25.845118
       parent: 2
+- proto: CP14DungeonEntranceAutoLink
+  entities:
+  - uid: 1483
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 2
+  - uid: 1709
+    components:
+    - type: Transform
+      pos: 9.5,-31.5
+      parent: 2
+  - uid: 2049
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-17.5
+      parent: 2
+  - uid: 2068
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-18.5
+      parent: 2
+  - uid: 2398
+    components:
+    - type: Transform
+      pos: 7.5,12.5
+      parent: 2
+  - uid: 4168
+    components:
+    - type: Transform
+      pos: 32.5,6.5
+      parent: 2
+  - uid: 5522
+    components:
+    - type: Transform
+      pos: 31.5,6.5
+      parent: 2
+  - uid: 8895
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-11.5
+      parent: 2
+  - uid: 11881
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-10.5
+      parent: 2
 - proto: CP14Eggshells
   entities:
   - uid: 7176
@@ -53233,12 +53180,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,22.5
       parent: 2
-  - uid: 1483
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,22.5
-      parent: 2
   - uid: 1492
     components:
     - type: Transform
@@ -53781,6 +53722,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -25.5,11.5
       parent: 2
+  - uid: 1847
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-19.5
+      parent: 2
   - uid: 1855
     components:
     - type: Transform
@@ -54066,6 +54013,11 @@ entities:
     - type: Transform
       pos: -32.5,-10.5
       parent: 2
+  - uid: 2069
+    components:
+    - type: Transform
+      pos: 19.5,-16.5
+      parent: 2
   - uid: 7761
     components:
     - type: Transform
@@ -54102,11 +54054,6 @@ entities:
     - type: Transform
       pos: -10.5,5.5
       parent: 2
-  - uid: 966
-    components:
-    - type: Transform
-      pos: 7.5,11.5
-      parent: 2
   - uid: 1353
     components:
     - type: Transform
@@ -54531,12 +54478,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,20.5
       parent: 2
-  - uid: 788
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,22.5
-      parent: 2
   - uid: 796
     components:
     - type: Transform
@@ -54561,11 +54502,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -12.5,-35.5
       parent: 2
-  - uid: 8908
-    components:
-    - type: Transform
-      pos: 7.5,13.5
-      parent: 2
 - proto: CP14FrameWoodenCrushedMedium
   entities:
   - uid: 783
@@ -54598,11 +54534,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,23.5
       parent: 2
-  - uid: 8895
-    components:
-    - type: Transform
-      pos: 7.5,12.5
-      parent: 2
 - proto: CP14GatherableBloodFlower
   entities:
   - uid: 1477
@@ -54727,16 +54658,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.38916,2.9071255
       parent: 2
-  - uid: 1080
-    components:
-    - type: Transform
-      pos: -10.493692,-1.968279
-      parent: 2
-  - uid: 1709
-    components:
-    - type: Transform
-      pos: 29.607096,3.7329216
-      parent: 2
   - uid: 1784
     components:
     - type: Transform
@@ -54849,11 +54770,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.4524803,-9.036629
       parent: 2
-  - uid: 4168
-    components:
-    - type: Transform
-      pos: 29.43522,4.3422966
-      parent: 2
   - uid: 4169
     components:
     - type: Transform
@@ -54991,7 +54907,7 @@ entities:
   - uid: 7177
     components:
     - type: Transform
-      pos: -14.063668,-12.5180435
+      pos: -14.685212,-12.377714
       parent: 2
   - uid: 12950
     components:
@@ -55418,11 +55334,6 @@ entities:
     - type: Transform
       pos: 22.5,21.5
       parent: 2
-  - uid: 962
-    components:
-    - type: Transform
-      pos: 7.5,22.5
-      parent: 2
   - uid: 989
     components:
     - type: Transform
@@ -55483,6 +55394,12 @@ entities:
     - type: Transform
       pos: -27.5,-70.5
       parent: 2
+  - uid: 2372
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,22.5
+      parent: 2
   - uid: 2395
     components:
     - type: Transform
@@ -57421,33 +57338,37 @@ entities:
       parent: 2
 - proto: CP14SpawnPointInnkeeper
   entities:
-  - uid: 2396
-    components:
-    - type: Transform
-      pos: -13.5,-11.5
-      parent: 2
-  - uid: 2397
-    components:
-    - type: Transform
-      pos: -14.5,-13.5
-      parent: 2
-  - uid: 2398
-    components:
-    - type: Transform
-      pos: -15.5,-11.5
-      parent: 2
-  - uid: 2399
-    components:
-    - type: Transform
-      pos: -16.5,-13.5
-      parent: 2
-- proto: CP14SpellScrollBeerCreation
-  entities:
-  - uid: 5522
+  - uid: 7080
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -13.689171,-10.332035
+      pos: -5.5,-20.5
+      parent: 2
+  - uid: 8665
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,-21.5
+      parent: 2
+  - uid: 12009
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-14.5
+      parent: 2
+  - uid: 12015
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-14.5
+      parent: 2
+- proto: CP14SpellScrollBeerCreation
+  entities:
+  - uid: 8947
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.03523,-10.305983
       parent: 2
 - proto: CP14SpellScrollFlashLight
   entities:
@@ -58335,16 +58256,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-13.5
       parent: 2
-  - uid: 2068
-    components:
-    - type: Transform
-      pos: -12.5,-10.5
-      parent: 2
-  - uid: 2069
-    components:
-    - type: Transform
-      pos: -13.5,-10.5
-      parent: 2
   - uid: 2071
     components:
     - type: Transform
@@ -58500,12 +58411,6 @@ entities:
     - type: Transform
       pos: 6.5,-18.5
       parent: 2
-  - uid: 8404
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -14.5,-12.5
-      parent: 2
   - uid: 8405
     components:
     - type: Transform
@@ -58949,6 +58854,21 @@ entities:
     - type: Transform
       pos: 16.5,-44.5
       parent: 2
+  - uid: 11918
+    components:
+    - type: Transform
+      pos: 23.5,-42.5
+      parent: 2
+  - uid: 11919
+    components:
+    - type: Transform
+      pos: 23.5,-43.5
+      parent: 2
+  - uid: 11934
+    components:
+    - type: Transform
+      pos: 23.5,-44.5
+      parent: 2
 - proto: CP14Wallet
   entities:
   - uid: 8017
@@ -60667,14 +60587,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 1178
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -12.5,-12.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 1179
     components:
     - type: Transform
@@ -60707,6 +60619,14 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 8908
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-12.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: CP14WallSkulls
   entities:
   - uid: 421
@@ -60889,11 +60809,6 @@ entities:
     - type: Transform
       pos: 7.5,27.5
       parent: 2
-  - uid: 8
-    components:
-    - type: Transform
-      pos: 6.5,23.5
-      parent: 2
   - uid: 9
     components:
     - type: Transform
@@ -60962,12 +60877,12 @@ entities:
   - uid: 22
     components:
     - type: Transform
-      pos: -2.5,24.5
+      pos: 30.5,5.5
       parent: 2
   - uid: 23
     components:
     - type: Transform
-      pos: -3.5,24.5
+      pos: 30.5,6.5
       parent: 2
   - uid: 24
     components:
@@ -60992,7 +60907,7 @@ entities:
   - uid: 28
     components:
     - type: Transform
-      pos: 7.5,23.5
+      pos: 32.5,4.5
       parent: 2
   - uid: 29
     components:
@@ -61152,7 +61067,7 @@ entities:
   - uid: 60
     components:
     - type: Transform
-      pos: -4.5,24.5
+      pos: 32.5,5.5
       parent: 2
   - uid: 61
     components:
@@ -62979,6 +62894,16 @@ entities:
     - type: Transform
       pos: -33.5,31.5
       parent: 2
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 31.5,5.5
+      parent: 2
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 29.5,5.5
+      parent: 2
   - uid: 676
     components:
     - type: Transform
@@ -63039,6 +62964,31 @@ entities:
     - type: Transform
       pos: -22.5,26.5
       parent: 2
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 29.5,6.5
+      parent: 2
+  - uid: 962
+    components:
+    - type: Transform
+      pos: 33.5,5.5
+      parent: 2
+  - uid: 966
+    components:
+    - type: Transform
+      pos: 33.5,6.5
+      parent: 2
+  - uid: 1080
+    components:
+    - type: Transform
+      pos: 30.5,4.5
+      parent: 2
+  - uid: 1178
+    components:
+    - type: Transform
+      pos: 31.5,4.5
+      parent: 2
   - uid: 1237
     components:
     - type: Transform
@@ -71471,6 +71421,16 @@ entities:
     - type: Transform
       pos: -10.5,-5.5
       parent: 2
+  - uid: 2396
+    components:
+    - type: Transform
+      pos: 7.5,11.5
+      parent: 2
+  - uid: 2399
+    components:
+    - type: Transform
+      pos: 9.5,-32.5
+      parent: 2
   - uid: 2401
     components:
     - type: Transform
@@ -71566,6 +71526,11 @@ entities:
     - type: Transform
       pos: 23.5,-14.5
       parent: 2
+  - uid: 7061
+    components:
+    - type: Transform
+      pos: 6.5,22.5
+      parent: 2
   - uid: 7141
     components:
     - type: Transform
@@ -71771,6 +71736,31 @@ entities:
     - type: Transform
       pos: 25.5,16.5
       parent: 2
+  - uid: 11899
+    components:
+    - type: Transform
+      pos: 6.5,23.5
+      parent: 2
+  - uid: 11900
+    components:
+    - type: Transform
+      pos: -2.5,24.5
+      parent: 2
+  - uid: 11901
+    components:
+    - type: Transform
+      pos: -3.5,24.5
+      parent: 2
+  - uid: 11902
+    components:
+    - type: Transform
+      pos: 7.5,23.5
+      parent: 2
+  - uid: 11917
+    components:
+    - type: Transform
+      pos: -4.5,24.5
+      parent: 2
   - uid: 11940
     components:
     - type: Transform
@@ -71781,6 +71771,26 @@ entities:
     - type: Transform
       pos: 23.5,-37.5
       parent: 2
+  - uid: 11958
+    components:
+    - type: Transform
+      pos: 23.5,-18.5
+      parent: 2
+  - uid: 11993
+    components:
+    - type: Transform
+      pos: 23.5,-23.5
+      parent: 2
+  - uid: 11996
+    components:
+    - type: Transform
+      pos: 23.5,-24.5
+      parent: 2
+  - uid: 12001
+    components:
+    - type: Transform
+      pos: 23.5,-19.5
+      parent: 2
   - uid: 12019
     components:
     - type: Transform
@@ -73795,6 +73805,11 @@ entities:
       layers:
       - sprite: _CP14/Structures/Wallpaper/wallpaper_green.rsi
         state: top
+  - uid: 2397
+    components:
+    - type: Transform
+      pos: 8.5,22.5
+      parent: 2
   - uid: 2404
     components:
     - type: Transform
@@ -74193,6 +74208,11 @@ entities:
     - type: Transform
       pos: 23.5,13.5
       parent: 2
+  - uid: 12002
+    components:
+    - type: Transform
+      pos: -12.5,-12.5
+      parent: 2
   - uid: 12874
     components:
     - type: Transform
@@ -74455,24 +74475,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,-13.5
       parent: 2
-  - uid: 7061
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-42.5
-      parent: 2
-  - uid: 7079
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-43.5
-      parent: 2
-  - uid: 7080
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,-44.5
-      parent: 2
   - uid: 7160
     components:
     - type: Transform
@@ -74521,30 +74523,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 33.5,13.5
       parent: 2
-  - uid: 11917
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-18.5
-      parent: 2
-  - uid: 11918
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-23.5
-      parent: 2
-  - uid: 11919
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-24.5
-      parent: 2
-  - uid: 11934
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,-19.5
-      parent: 2
 - proto: CP14WindowWooden
   entities:
   - uid: 433
@@ -75927,12 +75905,6 @@ entities:
     - type: Transform
       pos: 20.5,-31.5
       parent: 2
-  - uid: 2372
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -14.5,-10.5
-      parent: 2
   - uid: 4076
     components:
     - type: Transform
@@ -75945,6 +75917,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,-5.5
       parent: 2
+  - uid: 11837
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-12.5
+      parent: 2
   - uid: 12021
     components:
     - type: Transform

Resources/Prototypes/_CP14/Entities/Structures/Furniture/pallets.yml

@@ -12,6 +12,9 @@
     drawdepth: FloorTiles
   - type: Transform
     anchored: true
+  - type: Tag
+    tags:
+      - Catwalk
 
 - type: entity
   id: CP14WoodenPallet

Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml

@@ -13,11 +13,11 @@
   - type: Physics
     bodyType: Static
   - type: Sprite
-    sprite: /Textures/_CP14/Structures/Dungeon/holes.rsi
+    sprite: /Textures/_CP14/Structures/Dungeon/ladders.rsi
     drawdepth: FloorTiles
     layers:
-    - state: hole_big
-    - state: ladder_big_top_part
+    - state: ladder
+    - state: down
   - type: Fixtures
     fixtures:
       portalFixture:
@@ -42,10 +42,11 @@
   components:
   - type: Sprite
     noRot: true
-    sprite: /Textures/_CP14/Structures/Dungeon/holes.rsi
-    drawdepth: Mobs
+    sprite: /Textures/_CP14/Structures/Dungeon/ladders.rsi
+    drawdepth: FloorTiles
     layers:
-    - state: ladder_bottom_part
+    - state: ladder
+    - state: top
   - type: PointLight
     color: White
     radius: 3

Resources/Prototypes/_CP14/Maps/arenas.yml

@@ -64,6 +64,11 @@
             CP14Banker: [3, 4]
             CP14Guard: [8, 8]
             CP14GuardCommander: [1, 1]
+        - type: CP14StationZLevels
+          defaultMapLevel: 0
+          levels:
+            -1:
+              path: /Maps/_CP14/comoss_d.yml
         - type: CP14StationKeyDistribution
           keys:
           - TavernDorms1

Resources/Prototypes/_CP14/Procedural/biome_template_caves.yml

@@ -109,12 +109,12 @@
         - CP14WallStone
     #Copper
     - !type:BiomeEntityLayer
-      threshold: 0.5
+      threshold: 0.7
       noise:
         seed: 20
         noiseType: OpenSimplex2
         fractalType: FBm
-        frequency: 3
+        frequency: 2
       allowedTiles:
         - CP14FloorBase
       entities:

Resources/Textures/_CP14/Structures/Dungeon/ladders.rsi/meta.json

@@ -0,0 +1,21 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "by TheShuEd (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "ladder",
+      "directions": 4
+    },
+    {
+      "name": "top"
+    },
+    {
+      "name": "down"
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Dungeon/rift.rsi/meta.json

@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CLA",
-  "copyright": "by TheShuEd (discord)",
-  "size": {
-    "x": 48,
-    "y": 48
-  },
-  "states": [
-    {
-      "name": "rift"
-    }
-  ]
-}