diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
index 6804a4d8f97..87f6bcaa369 100644
--- a/Resources/Maps/shoukou.yml
+++ b/Resources/Maps/shoukou.yml
@@ -8,6 +8,7 @@ tilemap:
   12: FloorAstroGrass
   14: FloorBar
   18: FloorBlueCircuit
+  15: FloorBrassReebe
   22: FloorBrokenWood
   23: FloorCarpetClown
   24: FloorCarpetOffice
@@ -217,7 +218,7 @@ entities:
           version: 6
         2,-3:
           ind: 2,-3
-          tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAZgAAAAAAawAAAAAAZgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAIQAAAAABEgAAAAAAIQAAAAADEgAAAAAAEgAAAAAAIQAAAAADfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAIQAAAAACIQAAAAAAIQAAAAACIQAAAAABIQAAAAADfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAEgAAAAAAIQAAAAADIQAAAAABIQAAAAADIQAAAAACEgAAAAAAfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAIQAAAAACIQAAAAAAIQAAAAADIQAAAAADIQAAAAABEgAAAAAAbQAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAEgAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAADEgAAAAAAfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAIQAAAAAAIQAAAAAAIQAAAAACIQAAAAABIQAAAAAD
+          tiles: fwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAADwAAAAAADwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAZgAAAAAAawAAAAAAZgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAIQAAAAABEgAAAAAAIQAAAAADEgAAAAAAEgAAAAAAIQAAAAADfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAIQAAAAACIQAAAAAAIQAAAAACIQAAAAABIQAAAAADfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAEgAAAAAAIQAAAAADIQAAAAABIQAAAAADIQAAAAACEgAAAAAAfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAbQAAAAAAIQAAAAACIQAAAAAAIQAAAAADIQAAAAADIQAAAAABEgAAAAAAbQAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUAAAAAAAEgAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAADEgAAAAAAfwAAAAAAbAAAAAAAYwAAAAAAbAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAIQAAAAAAIQAAAAAAIQAAAAACIQAAAAABIQAAAAAD
           version: 6
         -1,-4:
           ind: -1,-4
@@ -229,7 +230,7 @@ entities:
           version: 6
         3,-1:
           ind: 3,-1
-          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAABfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAADewAAAAADfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAABewAAAAAATwAAAAADUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAABewAAAAAATwAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAACewAAAAAAewAAAAADUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAABewAAAAAATwAAAAABUAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAABfwAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACfwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAADewAAAAADfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAABewAAAAAATwAAAAADUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAABewAAAAAATwAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAACewAAAAAAewAAAAADUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAABewAAAAAATwAAAAABUAAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,0:
           ind: 3,0
@@ -249,7 +250,7 @@ entities:
           version: 6
         3,-2:
           ind: 3,-2
-          tiles: fwAAAAAAfQAAAAADewAAAAAAewAAAAADewAAAAABewAAAAAAewAAAAADfQAAAAABUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAAIAAAAAAATwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAATwAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAAIAAAAAAATwAAAAAAawAAAAAAawAAAAAAawAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAawAAAAAAawAAAAAAawAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAAYwAAAAAAYwAAAAAAZgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAJQAAAAAATwAAAAAAJQAAAAAAawAAAAAAawAAAAAAawAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAAMgAAAAAAMgAAAAAAMgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAJQAAAAAAIAAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAJQAAAAAATwAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAJQAAAAAAIAAAAAAAEgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAJQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA
+          tiles: fwAAAAAAfQAAAAADewAAAAAAewAAAAADewAAAAABewAAAAAAewAAAAADfQAAAAABUAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAEgAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAAIAAAAAAATwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAATwAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAbQAAAAAAIAAAAAAATwAAAAAAawAAAAAAawAAAAAAawAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAawAAAAAAawAAAAAAawAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAAYwAAAAAAYwAAAAAAZgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAJQAAAAAATwAAAAAAJQAAAAAAawAAAAAAawAAAAAAawAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAAMgAAAAAAMgAAAAAAMgAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAJQAAAAAAIAAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAJQAAAAAATwAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAJQAAAAAAIAAAAAAAEgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAJQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAA
           version: 6
         -1,1:
           ind: -1,1
@@ -277,7 +278,7 @@ entities:
           version: 6
         4,-2:
           ind: 4,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAIAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAATwAAAAAAUAAAAAAAfwAAAAAAJQAAAAAAIAAAAAAAJQAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAUAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAATwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAATwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAATwAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAfwAAAAAAKAAAAAAAfwAAAAAAEgAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAATwAAAAAAJQAAAAAAbQAAAAAATwAAAAAAEgAAAAAAJQAAAAAAfwAAAAAAEgAAAAAAIAAAAAAAUAAAAAAAEgAAAAAATwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAATwAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAfwAAAAAAKAAAAAAAfwAAAAAAEgAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAATwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAATwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAIAAAAAAAJQAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAJQAAAAAAfwAAAAAAJQAAAAAAIAAAAAAAJQAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAIAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAATwAAAAAAUAAAAAAAfwAAAAAAJQAAAAAAIAAAAAAAJQAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAUAAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAATwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAATwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAATwAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAfwAAAAAAKAAAAAAAfwAAAAAAEgAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAATwAAAAAAJQAAAAAAbQAAAAAATwAAAAAAEgAAAAAAJQAAAAAAfwAAAAAAEgAAAAAAIAAAAAAAUAAAAAAAEgAAAAAATwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAIAAAAAAAIAAAAAAAfwAAAAAATwAAAAAAEgAAAAAAEgAAAAAAfwAAAAAAfwAAAAAAKAAAAAAAfwAAAAAAEgAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAAATwAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAEgAAAAAATwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAIAAAAAAAJQAAAAAAfwAAAAAAIAAAAAAAIAAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAJQAAAAAAfwAAAAAAJQAAAAAAIAAAAAAAJQAAAAAAIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         3,-4:
           ind: 3,-4
@@ -309,7 +310,7 @@ entities:
           version: 6
         4,-1:
           ind: 4,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -2934,7 +2935,8 @@ entities:
           4,-1:
             0: 65291
           -8,0:
-            0: 30578
+            0: 22386
+            3: 8192
           -8,-1:
             0: 65343
           -9,0:
@@ -3040,7 +3042,8 @@ entities:
           2,-8:
             0: 65038
           2,-7:
-            0: 45294
+            0: 45262
+            4: 32
           2,-6:
             0: 14527
           2,-9:
@@ -3318,7 +3321,7 @@ entities:
             0: 52224
           -13,-12:
             2: 3840
-            3: 6
+            5: 6
           -12,-11:
             0: 65535
           -13,-11:
@@ -3327,7 +3330,7 @@ entities:
             0: 65535
           -13,-10:
             0: 47240
-            3: 48
+            5: 48
           -13,-9:
             0: 16379
           -11,-12:
@@ -3341,13 +3344,13 @@ entities:
             2: 3
           -10,-10:
             0: 63232
-            4: 14
+            6: 14
           -10,-12:
             0: 14
-            3: 3584
+            5: 3584
           -10,-11:
-            5: 14
-            6: 3584
+            7: 14
+            8: 3584
           -10,-13:
             0: 61166
           -9,-13:
@@ -3384,7 +3387,8 @@ entities:
           4,-11:
             0: 4049
           4,-9:
-            0: 61262
+            0: 28494
+            4: 32768
           -12,-15:
             2: 61440
           -12,-14:
@@ -3445,10 +3449,10 @@ entities:
           -16,-8:
             2: 4465
           -15,-11:
-            3: 65280
+            5: 65280
             0: 14
           -15,-10:
-            3: 4095
+            5: 4095
           -15,-9:
             0: 65535
           -15,-12:
@@ -3457,9 +3461,9 @@ entities:
             0: 65535
           -14,-11:
             0: 25805
-            3: 4352
+            5: 4352
           -14,-10:
-            3: 273
+            5: 273
             0: 50244
           -14,-9:
             0: 65535
@@ -4125,6 +4129,36 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.6852
+          - 81.57766
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -5799,6 +5833,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 61.5,-40.5
       parent: 2
+- proto: AirlockExternalGlassEngineeringLocked
+  entities:
+  - uid: 1451
+    components:
+    - type: Transform
+      pos: 36.5,-46.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2022:
+        - DoorStatus: DoorBolt
+  - uid: 2022
+    components:
+    - type: Transform
+      pos: 34.5,-45.5
+      parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1451:
+        - DoorStatus: DoorBolt
 - proto: AirlockExternalGlassLocked
   entities:
   - uid: 153
@@ -5852,24 +5910,6 @@ entities:
       linkedPorts:
         155:
         - DoorStatus: DoorBolt
-  - uid: 159
-    components:
-    - type: Transform
-      pos: 34.5,-43.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        160:
-        - DoorStatus: DoorBolt
-  - uid: 160
-    components:
-    - type: Transform
-      pos: 36.5,-46.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        159:
-        - DoorStatus: DoorBolt
   - uid: 15790
     components:
     - type: Transform
@@ -6930,7 +6970,7 @@ entities:
       pos: 18.5,-7.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -216175.17
+      secondsUntilStateChange: -220923.66
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -8290,12 +8330,6 @@ entities:
     - type: Transform
       pos: 32.5,14.5
       parent: 2
-  - uid: 15675
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-28.5
-      parent: 2
 - proto: BarricadeDirectional
   entities:
   - uid: 493
@@ -8340,12 +8374,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 32.5,13.5
       parent: 2
-  - uid: 15725
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-28.5
-      parent: 2
 - proto: BarSignMaidCafe
   entities:
   - uid: 500
@@ -9383,6 +9411,11 @@ entities:
     - type: Transform
       pos: -20.5,-39.5
       parent: 2
+  - uid: 14290
+    components:
+    - type: Transform
+      pos: -44.5,-19.5
+      parent: 2
   - uid: 14818
     components:
     - type: Transform
@@ -9393,6 +9426,11 @@ entities:
     - type: Transform
       pos: 67.5,-27.5
       parent: 2
+  - uid: 16000
+    components:
+    - type: Transform
+      pos: 24.5,-7.5
+      parent: 2
 - proto: BoxBeaker
   entities:
   - uid: 646
@@ -13576,21 +13614,11 @@ entities:
     - type: Transform
       pos: 8.5,-47.5
       parent: 2
-  - uid: 1449
-    components:
-    - type: Transform
-      pos: 36.5,-43.5
-      parent: 2
   - uid: 1450
     components:
     - type: Transform
       pos: 25.5,-47.5
       parent: 2
-  - uid: 1451
-    components:
-    - type: Transform
-      pos: 35.5,-43.5
-      parent: 2
   - uid: 1452
     components:
     - type: Transform
@@ -16381,11 +16409,6 @@ entities:
     - type: Transform
       pos: 31.5,-45.5
       parent: 2
-  - uid: 2010
-    components:
-    - type: Transform
-      pos: 32.5,-45.5
-      parent: 2
   - uid: 2011
     components:
     - type: Transform
@@ -16441,11 +16464,6 @@ entities:
     - type: Transform
       pos: 36.5,-45.5
       parent: 2
-  - uid: 2022
-    components:
-    - type: Transform
-      pos: 36.5,-44.5
-      parent: 2
   - uid: 2023
     components:
     - type: Transform
@@ -16769,7 +16787,7 @@ entities:
   - uid: 2095
     components:
     - type: Transform
-      pos: 34.5,-43.5
+      pos: 33.5,-45.5
       parent: 2
   - uid: 2096
     components:
@@ -20071,6 +20089,11 @@ entities:
     - type: Transform
       pos: -57.5,-44.5
       parent: 2
+  - uid: 2980
+    components:
+    - type: Transform
+      pos: 32.5,-45.5
+      parent: 2
   - uid: 3379
     components:
     - type: Transform
@@ -20106,6 +20129,36 @@ entities:
     - type: Transform
       pos: 12.5,-47.5
       parent: 2
+  - uid: 10740
+    components:
+    - type: Transform
+      pos: -33.5,8.5
+      parent: 2
+  - uid: 10790
+    components:
+    - type: Transform
+      pos: -29.5,8.5
+      parent: 2
+  - uid: 10798
+    components:
+    - type: Transform
+      pos: -28.5,8.5
+      parent: 2
+  - uid: 10799
+    components:
+    - type: Transform
+      pos: -30.5,8.5
+      parent: 2
+  - uid: 10809
+    components:
+    - type: Transform
+      pos: -32.5,8.5
+      parent: 2
+  - uid: 10810
+    components:
+    - type: Transform
+      pos: -31.5,8.5
+      parent: 2
   - uid: 11156
     components:
     - type: Transform
@@ -20706,6 +20759,21 @@ entities:
     - type: Transform
       pos: -60.5,7.5
       parent: 2
+  - uid: 15998
+    components:
+    - type: Transform
+      pos: -34.5,8.5
+      parent: 2
+  - uid: 16007
+    components:
+    - type: Transform
+      pos: 34.5,-45.5
+      parent: 2
+  - uid: 16008
+    components:
+    - type: Transform
+      pos: 35.5,-45.5
+      parent: 2
 - proto: CableApcStack1
   entities:
   - uid: 2760
@@ -20751,6 +20819,11 @@ entities:
       parent: 2
 - proto: CableHV
   entities:
+  - uid: 2010
+    components:
+    - type: Transform
+      pos: 34.5,-45.5
+      parent: 2
   - uid: 2737
     components:
     - type: Transform
@@ -21801,16 +21874,6 @@ entities:
     - type: Transform
       pos: 33.5,-45.5
       parent: 2
-  - uid: 2980
-    components:
-    - type: Transform
-      pos: 32.5,-46.5
-      parent: 2
-  - uid: 2981
-    components:
-    - type: Transform
-      pos: 32.5,-47.5
-      parent: 2
   - uid: 2982
     components:
     - type: Transform
@@ -24031,6 +24094,26 @@ entities:
     - type: Transform
       pos: -17.5,12.5
       parent: 2
+  - uid: 16009
+    components:
+    - type: Transform
+      pos: 35.5,-45.5
+      parent: 2
+  - uid: 16010
+    components:
+    - type: Transform
+      pos: 36.5,-45.5
+      parent: 2
+  - uid: 16011
+    components:
+    - type: Transform
+      pos: 36.5,-46.5
+      parent: 2
+  - uid: 16012
+    components:
+    - type: Transform
+      pos: 36.5,-47.5
+      parent: 2
 - proto: CableHVStack
   entities:
   - uid: 3380
@@ -31633,31 +31716,11 @@ entities:
     - type: Transform
       pos: 24.5,-46.5
       parent: 2
-  - uid: 4632
-    components:
-    - type: Transform
-      pos: 35.5,-44.5
-      parent: 2
-  - uid: 4633
-    components:
-    - type: Transform
-      pos: 35.5,-43.5
-      parent: 2
   - uid: 4634
     components:
     - type: Transform
       pos: 36.5,-45.5
       parent: 2
-  - uid: 4635
-    components:
-    - type: Transform
-      pos: 36.5,-44.5
-      parent: 2
-  - uid: 4636
-    components:
-    - type: Transform
-      pos: 36.5,-43.5
-      parent: 2
   - uid: 4637
     components:
     - type: Transform
@@ -34246,6 +34309,35 @@ entities:
     - type: Transform
       pos: 19.5,-32.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 4635
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
   - uid: 5064
     components:
     - type: Transform
@@ -34452,42 +34544,6 @@ entities:
       parent: 2
 - proto: ClosetSteelBase
   entities:
-  - uid: 5099
-    components:
-    - type: Transform
-      pos: -30.5,3.5
-      parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 5101
-          - 5100
-          - 5102
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
   - uid: 5103
     components:
     - type: Transform
@@ -34714,7 +34770,7 @@ entities:
   - uid: 5131
     components:
     - type: Transform
-      pos: 11.000749,-27.088202
+      pos: 9.424667,-26.22468
       parent: 2
   - uid: 5132
     components:
@@ -34740,13 +34796,30 @@ entities:
     - type: Transform
       pos: 37.357513,-30.261322
       parent: 2
-- proto: ClothingBeltKatanaSheathFilled
+- proto: ClothingBeltKatanaSheath
   entities:
-  - uid: 5134
+  - uid: 5099
     components:
+    - type: MetaData
+      desc: An ornate belt designed to hold a pair of samurai's blades, or daisho. It has beautiful engravings of Ryū or japenese dragons.
+      name: engraved katana sheaths
     - type: Transform
-      pos: 39.44033,-33.510246
+      pos: 39.473858,-33.316906
       parent: 2
+    - type: ContainerContainer
+      containers:
+        storagebase: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        katanaslot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 5101
+        wakizashislot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: 5100
 - proto: ClothingBeltMartialBlack
   entities:
   - uid: 5135
@@ -34823,6 +34896,13 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+  - uid: 4635
+    components:
+    - type: Transform
+      parent: 5063
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
   - uid: 9584
     components:
     - type: Transform
@@ -34954,6 +35034,13 @@ entities:
     - type: Transform
       pos: 5.4320927,-35.365402
       parent: 2
+- proto: ClothingHeadHatPirate
+  entities:
+  - uid: 16001
+    components:
+    - type: Transform
+      pos: -56.307682,10.922691
+      parent: 2
 - proto: ClothingHeadHatPurplesoftFlipped
   entities:
   - uid: 5161
@@ -35251,15 +35338,6 @@ entities:
     - type: Transform
       pos: 35.794537,-9.6245365
       parent: 2
-- proto: ClothingOuterCoatDetective
-  entities:
-  - uid: 5100
-    components:
-    - type: Transform
-      parent: 5099
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingOuterCoatJensen
   entities:
   - uid: 5202
@@ -35391,15 +35469,6 @@ entities:
     - type: Transform
       pos: -27.071718,-36.974934
       parent: 2
-- proto: ClothingUniformJumpskirtDetective
-  entities:
-  - uid: 5101
-    components:
-    - type: Transform
-      parent: 5099
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpskirtPrisoner
   entities:
   - uid: 5119
@@ -35432,15 +35501,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitDetective
-  entities:
-  - uid: 5102
-    components:
-    - type: Transform
-      parent: 5099
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingUniformJumpsuitEngineeringHazard
   entities:
   - uid: 5220
@@ -35449,6 +35509,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -57.718834,-4.253128
       parent: 2
+- proto: ClothingUniformJumpsuitPirate
+  entities:
+  - uid: 16002
+    components:
+    - type: Transform
+      pos: -56.370182,10.188316
+      parent: 2
 - proto: ClothingUniformJumpsuitPrisoner
   entities:
   - uid: 5120
@@ -35750,6 +35817,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -50.5,-1.5
       parent: 2
+- proto: ComputerAtmosMonitoring
+  entities:
+  - uid: 15725
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -44.5,-31.5
+      parent: 2
 - proto: ComputerCargoBounty
   entities:
   - uid: 5256
@@ -36514,6 +36589,11 @@ entities:
         - 0
 - proto: CrateEngineeringSolar
   entities:
+  - uid: 2981
+    components:
+    - type: Transform
+      pos: 33.5,-47.5
+      parent: 2
   - uid: 5354
     components:
     - type: Transform
@@ -36560,11 +36640,6 @@ entities:
         - 0
         - 0
         - 0
-  - uid: 9595
-    components:
-    - type: Transform
-      pos: 36.5,-43.5
-      parent: 2
 - proto: CrateEngineeringToolbox
   entities:
   - uid: 5356
@@ -36851,6 +36926,24 @@ entities:
     - type: Transform
       pos: 9.5,-26.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
 - proto: CrateTrashCart
   entities:
   - uid: 5376
@@ -37181,7 +37274,7 @@ entities:
       pos: 31.5,-36.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -50366.625
+      secondsUntilStateChange: -55115.11
       state: Closing
   - uid: 5409
     components:
@@ -37358,12 +37451,12 @@ entities:
     - type: Transform
       pos: 39.5,-29.5
       parent: 2
-- proto: DefaultStationBeaconCargoReception
+- proto: DefaultStationBeaconCargoBay
   entities:
-  - uid: 15336
+  - uid: 6068
     components:
     - type: Transform
-      pos: -13.5,-26.5
+      pos: -10.5,-34.5
       parent: 2
 - proto: DefaultStationBeaconChapel
   entities:
@@ -37607,10 +37700,10 @@ entities:
       parent: 2
 - proto: DefaultStationBeaconSupply
   entities:
-  - uid: 576
+  - uid: 5134
     components:
     - type: Transform
-      pos: -10.5,-34.5
+      pos: -11.5,-26.5
       parent: 2
 - proto: DefaultStationBeaconSurgery
   entities:
@@ -40325,6 +40418,14 @@ entities:
     - type: Transform
       pos: 9.5,-40.5
       parent: 2
+  - uid: 10695
+    components:
+    - type: MetaData
+      desc: A comfy-looking cat bed with stamps and empty envelopes stuffed around it.
+      name: mail cat bed
+    - type: Transform
+      pos: -9.5,-24.5
+      parent: 2
   - uid: 15064
     components:
     - type: MetaData
@@ -40645,6 +40746,13 @@ entities:
     - type: Transform
       pos: -5.3708525,7.851834
       parent: 2
+- proto: DrinkCanPack
+  entities:
+  - uid: 14925
+    components:
+    - type: Transform
+      pos: -18.50674,-40.276768
+      parent: 2
 - proto: DrinkChampagneBottleFull
   entities:
   - uid: 5960
@@ -41189,22 +41297,22 @@ entities:
   - uid: 6044
     components:
     - type: Transform
-      pos: -10.390769,5.65675
+      pos: -10.369387,5.9009027
       parent: 2
   - uid: 6045
     components:
     - type: Transform
-      pos: -10.672019,5.65675
+      pos: -10.650637,5.7915277
       parent: 2
   - uid: 6046
     components:
     - type: Transform
-      pos: 7.386877,7.710605
+      pos: 7.3375196,7.8475842
       parent: 2
   - uid: 6047
     components:
     - type: Transform
-      pos: 7.652502,7.679355
+      pos: 7.6343946,7.9257092
       parent: 2
   - uid: 6048
     components:
@@ -41318,12 +41426,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,10.5
       parent: 2
-  - uid: 6068
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,6.5
-      parent: 2
   - uid: 6069
     components:
     - type: Transform
@@ -41654,11 +41756,9 @@ entities:
   - uid: 6110
     components:
     - type: Transform
-      pos: -30.5,-25.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,5.5
       parent: 2
-    - type: PointLight
-      enabled: True
-    - type: ActiveEmergencyLight
   - uid: 6111
     components:
     - type: Transform
@@ -41804,7 +41904,8 @@ entities:
   - uid: 6130
     components:
     - type: Transform
-      pos: 52.5,-38.5
+      rot: 3.141592653589793 rad
+      pos: -29.5,-27.5
       parent: 2
   - uid: 6131
     components:
@@ -41919,11 +42020,40 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 31.5,17.5
       parent: 2
+  - uid: 6214
+    components:
+    - type: Transform
+      pos: 53.5,-38.5
+      parent: 2
+  - uid: 10750
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -59.5,7.5
+      parent: 2
+  - uid: 10803
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,-38.5
+      parent: 2
   - uid: 15794
     components:
     - type: Transform
       pos: 62.5,-40.5
       parent: 2
+  - uid: 16003
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,-45.5
+      parent: 2
+  - uid: 16004
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,-43.5
+      parent: 2
 - proto: EmergencyRollerBed
   entities:
   - uid: 6151
@@ -42374,26 +42504,6 @@ entities:
       parent: 2
 - proto: filingCabinetDrawerRandom
   entities:
-  - uid: 6214
-    components:
-    - type: Transform
-      pos: 25.5,-38.5
-      parent: 2
-  - uid: 6215
-    components:
-    - type: Transform
-      pos: -10.5,5.5
-      parent: 2
-  - uid: 6216
-    components:
-    - type: Transform
-      pos: 7.5,7.5
-      parent: 2
-  - uid: 6217
-    components:
-    - type: Transform
-      pos: 36.5,-14.5
-      parent: 2
   - uid: 6218
     components:
     - type: Transform
@@ -44368,6 +44478,20 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+  - uid: 16018
+    components:
+    - type: Transform
+      pos: 8.5,-28.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
+  - uid: 16019
+    components:
+    - type: Transform
+      pos: 11.5,-28.5
+      parent: 2
+    - type: Fixtures
+      fixtures: {}
 - proto: FloorTileItemHydro
   entities:
   - uid: 6484
@@ -67178,11 +67302,6 @@ entities:
     - type: Transform
       pos: 27.5,-45.5
       parent: 2
-  - uid: 9449
-    components:
-    - type: Transform
-      pos: 34.5,-44.5
-      parent: 2
   - uid: 9450
     components:
     - type: Transform
@@ -70191,7 +70310,7 @@ entities:
       parent: 2
 - proto: HolopadCargoBay
   entities:
-  - uid: 15994
+  - uid: 15675
     components:
     - type: Transform
       pos: -10.5,-34.5
@@ -70210,6 +70329,13 @@ entities:
     - type: Transform
       pos: -16.5,-26.5
       parent: 2
+- proto: HolopadCargoMailFront
+  entities:
+  - uid: 15784
+    components:
+    - type: Transform
+      pos: -5.5,-25.5
+      parent: 2
 - proto: HolopadCargoSalvageBay
   entities:
   - uid: 11146
@@ -70308,6 +70434,13 @@ entities:
     - type: Transform
       pos: -41.5,-25.5
       parent: 2
+- proto: HolopadEpistemicsMantis
+  entities:
+  - uid: 15997
+    components:
+    - type: Transform
+      pos: -30.5,2.5
+      parent: 2
 - proto: HolopadGeneralArcade
   entities:
   - uid: 15952
@@ -70336,6 +70469,27 @@ entities:
     - type: Transform
       pos: -16.5,3.5
       parent: 2
+- proto: HolopadJusticeCJ
+  entities:
+  - uid: 15994
+    components:
+    - type: Transform
+      pos: 28.5,-37.5
+      parent: 2
+- proto: HolopadJusticeClerk
+  entities:
+  - uid: 15900
+    components:
+    - type: Transform
+      pos: 18.5,-37.5
+      parent: 2
+- proto: HolopadJusticeProsecutor
+  entities:
+  - uid: 15895
+    components:
+    - type: Transform
+      pos: -10.5,4.5
+      parent: 2
 - proto: HolopadMedicalChemistry
   entities:
   - uid: 15944
@@ -70411,6 +70565,13 @@ entities:
     - type: Transform
       pos: 21.5,-6.5
       parent: 2
+- proto: HolopadSecurityCorpsman
+  entities:
+  - uid: 15996
+    components:
+    - type: Transform
+      pos: 16.5,0.5
+      parent: 2
 - proto: HolopadSecurityCourtroom
   entities:
   - uid: 15915
@@ -70432,6 +70593,13 @@ entities:
     - type: Transform
       pos: 40.5,-18.5
       parent: 2
+- proto: HolopadSecurityLawyer
+  entities:
+  - uid: 15995
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 2
 - proto: HolopadSecurityPerma
   entities:
   - uid: 15923
@@ -70804,12 +70972,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -23.5,1.5
       parent: 2
-  - uid: 9982
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 34.5,-45.5
-      parent: 2
   - uid: 9983
     components:
     - type: Transform
@@ -70833,6 +70995,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-20.5
       parent: 2
+  - uid: 16005
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,-43.5
+      parent: 2
 - proto: IntercomMedical
   entities:
   - uid: 9987
@@ -71055,6 +71223,19 @@ entities:
       parent: 2
 - proto: Katana
   entities:
+  - uid: 5101
+    components:
+    - type: MetaData
+      desc: '"Know thy enemy and know thyself, and in a hundred battles you will never be in peril" '
+      name: Ryū
+    - type: Transform
+      parent: 5099
+    - type: MeleeWeapon
+      attackRate: 1.7
+    - type: Execution
+      damageMultiplier: 12
+    - type: Physics
+      canCollide: False
   - uid: 10012
     components:
     - type: Transform
@@ -71169,6 +71350,14 @@ entities:
     - type: Transform
       pos: -49.709957,2.7257032
       parent: 2
+- proto: KukriKnife
+  entities:
+  - uid: 10797
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -56.760807,10.578941
+      parent: 2
 - proto: LampBanana
   entities:
   - uid: 10028
@@ -72362,11 +72551,6 @@ entities:
     - type: Transform
       pos: 43.5,-47.5
       parent: 2
-  - uid: 10172
-    components:
-    - type: Transform
-      pos: -56.5,10.5
-      parent: 2
   - uid: 10173
     components:
     - type: Transform
@@ -73320,36 +73504,6 @@ entities:
         After that you will be able to use bridge controls for a short period of time. It is advisable to use it wisely as fuel will burn up in a matter of minutes, check the fuel timer on the left side of the generator to see how much time you have left.
 
       editingDisabled: True
-  - uid: 15752
-    components:
-    - type: Transform
-      pos: 11.488341,-28.648457
-      parent: 2
-    - type: Paper
-      stampState: paper_stamp-cmo
-      stampedBy:
-      - stampedColor: '#33CCFFFF'
-        stampedName: stamp-component-stamped-name-cmo
-      - stampedColor: '#006600FF'
-        stampedName: stamp-component-stamped-name-centcom
-      content: >-
-        [color=#185A8A]█▄ █ ▀█▀    [head=3]Surgery Awareness[/head]
-
-        █ ▀█   █ [/color]    [color=#185A8A]This is a legal Nanotrasen document.[/color]
-
-        [color=#1b67a5]─────────────────────────────────────────[/color]
-
-          This room has been blocked off due to its lack of use to the medical department as of the moment. Once [bold]surgery[/bold] arrives to this Nanotrasen sector this area will be remodeled and put back into working order.
-
-        [color=#1b67a5]─────────────────────────────────────────[/color]
-
-
-        [head=3][bold]Estimated time until surgery arrival: 1 week[/bold][/head]
-
-
-        [color=#1b67a5]─────────────────────────────────────────[/color]
-          [italic]This document must stamped to be considered valid[/italic]
-      editingDisabled: True
 - proto: PaperBin
   entities:
   - uid: 10310
@@ -73723,23 +73877,6 @@ entities:
     - type: Transform
       pos: 27.424656,-32.45397
       parent: 2
-  - uid: 15330
-    components:
-    - type: Transform
-      pos: -18.504515,-40.38329
-      parent: 2
-    - type: Paper
-      stampState: paper_stamp-signature
-      stampedBy:
-      - stampedColor: '#2F4F4FFF'
-        stampedName: Rock-and-Stone
-      content: >+
-        We moved the ore processor outside on the conveyor belt with our new recycler centcom just sent up. Got some engie intern to add some "security" measures to the thing so no one tries to nab it but hell they'd be stupid to mess with us. Hope ya enjoy next shift.
-
-
-        Rock and Stone, brother. Salvie heading out.
-
-      editingDisabled: True
   - uid: 15580
     components:
     - type: MetaData
@@ -73793,13 +73930,6 @@ entities:
       parent: 2
     - type: Stack
       count: 6
-  - uid: 15900
-    components:
-    - type: Transform
-      pos: -58.745872,10.535267
-      parent: 2
-    - type: Stack
-      count: 27
 - proto: Pen
   entities:
   - uid: 9203
@@ -74089,6 +74219,16 @@ entities:
     - type: Transform
       pos: 72.70667,-23.536297
       parent: 2
+- proto: PlushieHuman
+  entities:
+  - uid: 9982
+    components:
+    - type: MetaData
+      desc: 'This is a felt plush of a human with the tag "Captain Kenway, Lord of the Seven GalaxSeas"  All craftsmanship is of the lowest quality. '
+      name: captain kenway
+    - type: Transform
+      pos: -56.338932,10.469566
+      parent: 2
 - proto: PlushieLamp
   entities:
   - uid: 10362
@@ -74892,11 +75032,6 @@ entities:
       parent: 2
 - proto: PottedPlantRandom
   entities:
-  - uid: 4153
-    components:
-    - type: Transform
-      pos: 45.5,-31.5
-      parent: 2
   - uid: 10467
     components:
     - type: Transform
@@ -75087,11 +75222,6 @@ entities:
     - type: Transform
       pos: 47.5,-36.5
       parent: 2
-  - uid: 15495
-    components:
-    - type: Transform
-      pos: -9.5,-24.5
-      parent: 2
 - proto: PottedPlantRandomPlastic
   entities:
   - uid: 10507
@@ -75227,74 +75357,102 @@ entities:
       parent: 2
 - proto: PoweredDimSmallLight
   entities:
-  - uid: 10792
+  - uid: 10696
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,11.5
       parent: 2
-  - uid: 10793
+  - uid: 10697
+    components:
+    - type: Transform
+      pos: 17.5,9.5
+      parent: 2
+  - uid: 10698
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 18.5,-42.5
+      pos: 44.5,-45.5
       parent: 2
-  - uid: 10794
+  - uid: 10699
+    components:
+    - type: Transform
+      pos: 39.5,-39.5
+      parent: 2
+  - uid: 10700
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -53.5,-1.5
+      parent: 2
+  - uid: 10702
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -0.5,-15.5
+      pos: 3.5,-45.5
       parent: 2
-  - uid: 10795
+  - uid: 10703
     components:
     - type: Transform
-      pos: 17.5,9.5
+      rot: 3.141592653589793 rad
+      pos: -45.5,4.5
       parent: 2
-  - uid: 10796
+  - uid: 10711
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 7.5,-12.5
+      pos: -42.5,2.5
       parent: 2
-  - uid: 10797
+  - uid: 10725
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 44.5,-45.5
+      pos: -16.5,-29.5
       parent: 2
-  - uid: 10798
+  - uid: 10727
     components:
     - type: Transform
-      pos: 39.5,-39.5
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-36.5
       parent: 2
-  - uid: 10799
+  - uid: 10732
+    components:
+    - type: Transform
+      pos: -42.5,-21.5
+      parent: 2
+  - uid: 10733
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -53.5,-1.5
+      pos: -53.5,-9.5
       parent: 2
-  - uid: 10800
+  - uid: 10793
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,-45.5
+      pos: 18.5,-42.5
       parent: 2
-  - uid: 10801
+  - uid: 10794
     components:
     - type: Transform
-      pos: 18.5,-32.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-15.5
       parent: 2
-  - uid: 10802
+  - uid: 10796
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -41.5,3.5
+      pos: 7.5,-12.5
       parent: 2
-  - uid: 10803
+  - uid: 10800
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -45.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-45.5
+      parent: 2
+  - uid: 10801
+    components:
+    - type: Transform
+      pos: 18.5,-32.5
       parent: 2
   - uid: 10806
     components:
@@ -75308,27 +75466,34 @@ entities:
       rot: 3.141592653589793 rad
       pos: -23.5,-11.5
       parent: 2
-  - uid: 10808
+  - uid: 10811
     components:
     - type: Transform
-      pos: -16.5,-29.5
+      pos: 13.5,-40.5
       parent: 2
-  - uid: 10809
+  - uid: 11381
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,-36.5
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-44.5
       parent: 2
-  - uid: 10810
+  - uid: 11927
     components:
     - type: Transform
-      pos: -42.5,-21.5
+      rot: 3.141592653589793 rad
+      pos: 27.5,7.5
       parent: 2
-  - uid: 10811
+  - uid: 13563
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,12.5
+      parent: 2
+  - uid: 13564
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -53.5,-9.5
+      pos: 34.5,8.5
       parent: 2
 - proto: PoweredLEDLightPostSmall
   entities:
@@ -75340,17 +75505,22 @@ entities:
       parent: 2
 - proto: Poweredlight
   entities:
+  - uid: 576
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -59.5,6.5
+      parent: 2
   - uid: 5979
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -19.5,-18.5
       parent: 2
-  - uid: 9549
+  - uid: 10172
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -59.5,3.5
+      pos: 10.5,-26.5
       parent: 2
   - uid: 10529
     components:
@@ -75448,12 +75618,6 @@ entities:
     - type: Transform
       pos: -10.5,-45.5
       parent: 2
-  - uid: 10544
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -26.5,-1.5
-      parent: 2
   - uid: 10545
     components:
     - type: Transform
@@ -76382,6 +76546,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -30.5,-15.5
       parent: 2
+  - uid: 10832
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-29.5
+      parent: 2
   - uid: 11277
     components:
     - type: Transform
@@ -76404,16 +76574,15 @@ entities:
     - type: Transform
       pos: 64.5,-22.5
       parent: 2
-  - uid: 15895
+  - uid: 15897
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -59.5,7.5
+      pos: 15.5,-47.5
       parent: 2
-  - uid: 15897
+  - uid: 16006
     components:
     - type: Transform
-      pos: 15.5,-47.5
+      pos: 32.5,-42.5
       parent: 2
 - proto: PoweredlightBlue
   entities:
@@ -76425,59 +76594,51 @@ entities:
       parent: 2
 - proto: PoweredLightBlueInterior
   entities:
-  - uid: 10695
+  - uid: 10748
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 51.5,3.5
+      pos: 25.5,-44.5
       parent: 2
-  - uid: 10696
+  - uid: 10783
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 41.5,8.5
+      pos: 51.5,3.5
       parent: 2
-  - uid: 10697
+  - uid: 10785
     components:
     - type: Transform
-      pos: -35.5,-53.5
+      rot: 3.141592653589793 rad
+      pos: 41.5,8.5
       parent: 2
-  - uid: 10698
+  - uid: 10791
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -23.5,9.5
+      rot: 3.141592653589793 rad
+      pos: -25.5,10.5
       parent: 2
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 10699
+  - uid: 10792
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,7.5
       parent: 2
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 10700
+  - uid: 10795
     components:
     - type: Transform
       pos: 34.5,-47.5
       parent: 2
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 10702
+  - uid: 10802
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -39.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: -52.5,-47.5
       parent: 2
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 10703
+  - uid: 15724
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 24.5,18.5
+      pos: -35.5,7.5
       parent: 2
 - proto: PoweredLightColoredBlack
   entities:
@@ -76557,11 +76718,6 @@ entities:
       powerLoad: 0
 - proto: PoweredLightPostSmall
   entities:
-  - uid: 10711
-    components:
-    - type: Transform
-      pos: -33.5,-64.5
-      parent: 2
   - uid: 10712
     components:
     - type: Transform
@@ -76649,23 +76805,12 @@ entities:
       parent: 2
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 10725
-    components:
-    - type: Transform
-      pos: 13.5,-40.5
-      parent: 2
   - uid: 10726
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -53.5,-39.5
       parent: 2
-  - uid: 10727
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -52.5,-47.5
-      parent: 2
   - uid: 10728
     components:
     - type: Transform
@@ -76690,19 +76835,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -38.5,9.5
       parent: 2
-  - uid: 10732
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 29.5,-38.5
-      parent: 2
-  - uid: 10733
-    components:
-    - type: Transform
-      pos: 36.5,-43.5
-      parent: 2
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 10734
     components:
     - type: Transform
@@ -76747,14 +76879,6 @@ entities:
       parent: 2
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 10740
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -57.5,-11.5
-      parent: 2
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 10741
     components:
     - type: Transform
@@ -76797,22 +76921,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 31.5,-20.5
       parent: 2
-  - uid: 10748
-    components:
-    - type: Transform
-      pos: -29.5,-42.5
-      parent: 2
   - uid: 10749
     components:
     - type: Transform
       pos: -46.5,2.5
       parent: 2
-  - uid: 10750
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,-45.5
-      parent: 2
   - uid: 10751
     components:
     - type: Transform
@@ -77026,14 +77139,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -44.5,7.5
       parent: 2
-  - uid: 11927
+- proto: PoweredSmallLightMaintenance
+  entities:
+  - uid: 4632
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 11.5,-27.5
+      pos: 36.5,-45.5
       parent: 2
-- proto: PoweredSmallLightMaintenance
-  entities:
   - uid: 10254
     components:
     - type: Transform
@@ -77046,24 +77159,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -50.5,10.5
       parent: 2
-  - uid: 10783
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-44.5
-      parent: 2
   - uid: 10784
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 40.5,-9.5
       parent: 2
-  - uid: 10785
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 34.5,8.5
-      parent: 2
   - uid: 10786
     components:
     - type: Transform
@@ -77087,18 +77188,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -61.5,-25.5
       parent: 2
-  - uid: 10790
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 31.5,12.5
-      parent: 2
-  - uid: 10791
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,7.5
-      parent: 2
 - proto: PrisonKnife
   entities:
   - uid: 14738
@@ -77215,12 +77304,6 @@ entities:
     - type: Transform
       pos: 8.5,-18.5
       parent: 2
-  - uid: 10832
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -44.5,-19.5
-      parent: 2
   - uid: 10833
     components:
     - type: Transform
@@ -80397,11 +80480,6 @@ entities:
     - type: Transform
       pos: 30.5,-46.5
       parent: 2
-  - uid: 11381
-    components:
-    - type: Transform
-      pos: 34.5,-44.5
-      parent: 2
   - uid: 11382
     components:
     - type: Transform
@@ -81377,6 +81455,62 @@ entities:
     - type: Transform
       pos: 32.493702,-9.347706
       parent: 2
+- proto: SecureCabinetAttorney
+  entities:
+  - uid: 6217
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 2
+- proto: SecureCabinetCJ
+  entities:
+  - uid: 6215
+    components:
+    - type: Transform
+      pos: 25.5,-38.5
+      parent: 2
+- proto: SecureCabinetClerk
+  entities:
+  - uid: 15783
+    components:
+    - type: Transform
+      pos: 17.5,-37.5
+      parent: 2
+- proto: SecureCabinetCommand
+  entities:
+  - uid: 10544
+    components:
+    - type: Transform
+      pos: 45.5,-31.5
+      parent: 2
+- proto: SecureCabinetMantis
+  entities:
+  - uid: 4636
+    components:
+    - type: Transform
+      pos: -30.5,3.5
+      parent: 2
+- proto: SecureCabinetProsecutor
+  entities:
+  - uid: 6216
+    components:
+    - type: Transform
+      pos: -10.5,5.5
+      parent: 2
+- proto: SecureCabinetPsychologist
+  entities:
+  - uid: 15752
+    components:
+    - type: Transform
+      pos: 13.5,-29.5
+      parent: 2
+- proto: SecureCabinetWarden
+  entities:
+  - uid: 9449
+    components:
+    - type: Transform
+      pos: 36.5,-14.5
+      parent: 2
 - proto: SecurityTechFab
   entities:
   - uid: 11567
@@ -83737,6 +83871,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 55.5,-38.5
       parent: 2
+  - uid: 15999
+    components:
+    - type: Transform
+      pos: 1.5,-51.5
+      parent: 2
 - proto: SignSmoking
   entities:
   - uid: 11832
@@ -84370,6 +84509,13 @@ entities:
     - type: Transform
       pos: -59.5,-8.5
       parent: 2
+- proto: SpawnMobCatClippy
+  entities:
+  - uid: 1449
+    components:
+    - type: Transform
+      pos: -9.5,-24.5
+      parent: 2
 - proto: SpawnMobCatException
   entities:
   - uid: 15092
@@ -86130,17 +86276,6 @@ entities:
       parent: 2
 - proto: SurveillanceCameraCommand
   entities:
-  - uid: 9827
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,-31.5
-      parent: 2
-    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraCommand
-      nameSet: True
-      id: AI Outside (Bottom Left)
   - uid: 11271
     components:
     - type: Transform
@@ -86300,7 +86435,7 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: AI Room North
-  - uid: 14925
+  - uid: 15330
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -86310,7 +86445,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Satellite Outside
+      id: AI Satellite Outside - West
   - uid: 15590
     components:
     - type: Transform
@@ -86332,60 +86467,59 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Head of Personnel's Office
-  - uid: 15669
+  - uid: 16013
     components:
     - type: Transform
-      anchored: False
-      pos: 64.5,-13.5
-      parent: 1
+      rot: -1.5707963267948966 rad
+      pos: 78.5,-23.5
+      parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Outside (Top Left)
-    - type: Physics
-      bodyType: Dynamic
-  - uid: 15724
+      id: AI Satellite Outside - East
+  - uid: 16014
     components:
     - type: Transform
-      anchored: False
-      pos: 72.5,-14.5
-      parent: 1
+      pos: 71.5,-16.5
+      parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Outside (Top Right)
-    - type: Physics
-      bodyType: Dynamic
-  - uid: 15783
+      id: AI Satellite - Top Right
+  - uid: 16015
     components:
     - type: Transform
-      anchored: False
-      rot: -1.5707963267948966 rad
-      pos: 78.5,-21.5
-      parent: 1
+      pos: 63.5,-15.5
+      parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Outside (Facing Outwards)
-    - type: Physics
-      bodyType: Dynamic
-  - uid: 15784
+      id: AI Satellite - Top Left
+  - uid: 16016
     components:
     - type: Transform
-      anchored: False
       rot: 3.141592653589793 rad
-      pos: 72.5,-28.5
-      parent: 1
+      pos: 63.5,-31.5
+      parent: 2
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI Outside (Bottom Right)
-    - type: Physics
-      bodyType: Dynamic
+      id: AI Satellite - Bottom Left
+  - uid: 16017
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 71.5,-30.5
+      parent: 2
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraCommand
+      nameSet: True
+      id: AI Satellite - Bottom Right
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 12223
@@ -90497,6 +90631,11 @@ entities:
       parent: 2
 - proto: ToyFigurineHeadOfSecurity
   entities:
+  - uid: 9827
+    components:
+    - type: Transform
+      pos: 36.37521,-43.41716
+      parent: 2
   - uid: 11961
     components:
     - type: Transform
@@ -90521,6 +90660,27 @@ entities:
     - type: Transform
       pos: -30.470474,-6.401595
       parent: 2
+- proto: ToyFigurineNukie
+  entities:
+  - uid: 10808
+    components:
+    - type: Transform
+      pos: 35.22881,-43.24355
+      parent: 2
+- proto: ToyFigurineNukieCommander
+  entities:
+  - uid: 5102
+    components:
+    - type: Transform
+      pos: 35.652424,-43.46577
+      parent: 2
+- proto: ToyFigurineNukieElite
+  entities:
+  - uid: 15669
+    components:
+    - type: Transform
+      pos: 35.2427,-43.674107
+      parent: 2
 - proto: ToyFigurinePassenger
   entities:
   - uid: 12725
@@ -90530,6 +90690,11 @@ entities:
       parent: 2
 - proto: ToyFigurineSecurity
   entities:
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 36.666874,-43.299107
+      parent: 2
   - uid: 12726
     components:
     - type: Transform
@@ -90537,6 +90702,11 @@ entities:
       parent: 2
 - proto: ToyFigurineWarden
   entities:
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 36.78493,-43.63938
+      parent: 2
   - uid: 12727
     components:
     - type: Transform
@@ -91313,6 +91483,15 @@ entities:
       parent: 2
 - proto: Wakizashi
   entities:
+  - uid: 5100
+    components:
+    - type: MetaData
+      desc: '"Death before dishonor"'
+      name: Gisei
+    - type: Transform
+      parent: 5099
+    - type: Physics
+      canCollide: False
   - uid: 12821
     components:
     - type: MetaData
@@ -91439,12 +91618,22 @@ entities:
     - type: Transform
       pos: -38.5,-66.5
       parent: 2
+  - uid: 4153
+    components:
+    - type: Transform
+      pos: 35.5,-44.5
+      parent: 2
   - uid: 4444
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 61.5,-39.5
       parent: 2
+  - uid: 4633
+    components:
+    - type: Transform
+      pos: 36.5,-44.5
+      parent: 2
   - uid: 5155
     components:
     - type: Transform
@@ -91504,6 +91693,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -58.5,2.5
       parent: 2
+  - uid: 9549
+    components:
+    - type: Transform
+      pos: 34.5,-43.5
+      parent: 2
   - uid: 9784
     components:
     - type: Transform
@@ -95204,16 +95398,6 @@ entities:
     - type: Transform
       pos: 37.5,-45.5
       parent: 2
-  - uid: 13563
-    components:
-    - type: Transform
-      pos: 35.5,-42.5
-      parent: 2
-  - uid: 13564
-    components:
-    - type: Transform
-      pos: 36.5,-42.5
-      parent: 2
   - uid: 13565
     components:
     - type: Transform
@@ -97163,6 +97347,11 @@ entities:
     - type: Transform
       pos: 23.5,19.5
       parent: 2
+  - uid: 14423
+    components:
+    - type: Transform
+      pos: 34.5,-44.5
+      parent: 2
   - uid: 14485
     components:
     - type: Transform
@@ -99428,11 +99617,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -47.5,0.5
       parent: 2
-  - uid: 14290
-    components:
-    - type: Transform
-      pos: 34.5,-45.5
-      parent: 2
   - uid: 14291
     components:
     - type: Transform
@@ -99910,6 +100094,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -45.5,0.5
       parent: 2
+  - uid: 15336
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,-42.5
+      parent: 2
+  - uid: 15495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,-42.5
+      parent: 2
   - uid: 15550
     components:
     - type: Transform
@@ -100251,7 +100447,7 @@ entities:
       parent: 2
 - proto: WarpPointLogistics
   entities:
-  - uid: 14423
+  - uid: 9595
     components:
     - type: Transform
       pos: -10.5,-34.5
diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml
index f77ed9dbb78..cbdd70c452a 100644
--- a/Resources/Prototypes/Maps/shoukou.yml
+++ b/Resources/Prototypes/Maps/shoukou.yml
@@ -69,7 +69,7 @@
             SalvageSpecialist: [ 2, 4 ]
             Courier: [ 1, 2 ]
             CargoTechnician: [ 2, 3 ]
-            CargoAssistant: [ 2, 3 ]
+            CargoAssistant: [ 2, 2 ]
           #Silicon
             StationAi: [ 1, 1 ]
             Borg: [ 2, 2 ]