maus

space-syndicate · Jul 6, 2024 · 178c834 · 178c834
1 parent fc1d7c3
commit 178c834
Showing 1 changed file with 105 additions and 70 deletions.
diff --git a/Resources/Maps/corvax_maus.yml b/Resources/Maps/corvax_maus.yml
@@ -240,11 +240,11 @@ entities:
           version: 6
         -6,-2:
           ind: -6,-2
-          tiles: fgAAAAAAfgAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAeQAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAATgAAAAAATgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAJQAAAAAAMgAAAAAAMgAAAAAAMgAAAAAAJQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAA
+          tiles: fgAAAAAAfgAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAeQAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAYAAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAATgAAAAAATgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAJQAAAAAAMgAAAAAAMgAAAAAAMgAAAAAAJQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAA
           version: 6
         -7,-2:
           ind: -7,-2
-          tiles: fQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAACgAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAACgAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAACgAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAACgAAAAAACgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAACgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -5,-2:
           ind: -5,-2
@@ -2177,7 +2177,7 @@ entities:
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
           decals:
-            3183: -18,-45
+            3181: -18,-45
         - node:
             zIndex: 2
             color: '#FFFFFFFF'
@@ -2365,7 +2365,6 @@ entities:
             3117: -70,-15
             3118: -70,-15
             3119: -69,-15
-            3120: -68,-15
             3121: -69,-15
             3153: -28,-3
             3154: -28,-2
@@ -2375,6 +2374,11 @@ entities:
             3158: -27,-3
             3159: -27,-3
             3160: -26,-3
+            3183: -47,-80
+            3187: -46,-77
+            3193: -75,-14
+            3195: -62,-13
+            3196: -75,-12
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2479,6 +2483,7 @@ entities:
             3150: -28,-3
             3151: -27,-3
             3152: -28,-2
+            3197: -76,-15
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2605,6 +2610,9 @@ entities:
             2635: -22,9
             2636: -22,9
             2691: -11,9
+            3184: -45,-79
+            3185: -46,-80
+            3194: -66,-14
         - node:
             cleanable: True
             color: '#000000FF'
@@ -2728,6 +2736,14 @@ entities:
             3161: -28,-4
             3162: -27,-2
             3163: -26,-2
+            3186: -47,-75
+            3188: -33,-83
+            3189: -30,-86
+            3190: -30,-90
+            3191: -76,-14
+            3192: -77,-15
+            3198: -79,-13
+            3199: -75,-13
         - node:
             cleanable: True
             color: '#0000003E'
@@ -4991,7 +5007,7 @@ entities:
             2935: -14,-3
             2936: -13,-3
             2982: -36,-65
-            3184: -18,-46
+            3182: -18,-46
         - node:
             color: '#FFFFFFFF'
             id: WarnLineGreyscaleS
@@ -10657,7 +10673,7 @@ entities:
       pos: -84.5,-40.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -73879.03
+      secondsUntilStateChange: -76953.59
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -13078,6 +13094,14 @@ entities:
     - type: Transform
       pos: 1.5,7.5
       parent: 16921
+  - uid: 17245
+    components:
+    - type: MetaData
+      name: ЛКП ГСБ
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -24.5,-3.5
+      parent: 2
   - uid: 17317
     components:
     - type: Transform
@@ -20896,6 +20920,30 @@ entities:
     - type: Transform
       pos: -28.283361,8.591489
       parent: 2
+- proto: BoxLethalshot
+  entities:
+  - uid: 1151
+    components:
+    - type: Transform
+      pos: -12.9077,-1.8767493
+      parent: 2
+  - uid: 1201
+    components:
+    - type: Transform
+      pos: -12.318132,-1.861234
+      parent: 2
+- proto: BoxMagazinePistol
+  entities:
+  - uid: 15280
+    components:
+    - type: Transform
+      pos: -13.582347,-1.8631968
+      parent: 2
+  - uid: 20274
+    components:
+    - type: Transform
+      pos: -14.086583,-1.8476813
+      parent: 2
 - proto: BoxMagazinePistolSubMachineGunTopMounted
   entities:
   - uid: 16142
@@ -20921,16 +20969,6 @@ entities:
     - type: InsideEntityStorage
 - proto: BoxMagazineShotgun
   entities:
-  - uid: 6680
-    components:
-    - type: Transform
-      pos: -12.907422,-1.8446574
-      parent: 2
-  - uid: 6716
-    components:
-    - type: Transform
-      pos: -12.431722,-1.8446574
-      parent: 2
   - uid: 16151
     components:
     - type: Transform
@@ -22955,11 +22993,6 @@ entities:
     - type: Transform
       pos: -21.5,4.5
       parent: 2
-  - uid: 1151
-    components:
-    - type: Transform
-      pos: -19.5,-1.5
-      parent: 2
   - uid: 1152
     components:
     - type: Transform
@@ -23185,11 +23218,6 @@ entities:
     - type: Transform
       pos: -26.5,-3.5
       parent: 2
-  - uid: 1201
-    components:
-    - type: Transform
-      pos: -23.5,-2.5
-      parent: 2
   - uid: 1202
     components:
     - type: Transform
@@ -31430,6 +31458,11 @@ entities:
     - type: Transform
       pos: -72.5,-22.5
       parent: 2
+  - uid: 6716
+    components:
+    - type: Transform
+      pos: -24.5,-3.5
+      parent: 2
   - uid: 6931
     components:
     - type: Transform
@@ -31465,11 +31498,6 @@ entities:
     - type: Transform
       pos: -40.5,-91.5
       parent: 2
-  - uid: 11448
-    components:
-    - type: Transform
-      pos: -18.5,-1.5
-      parent: 2
   - uid: 11557
     components:
     - type: Transform
@@ -32225,11 +32253,6 @@ entities:
     - type: Transform
       pos: -42.5,-76.5
       parent: 2
-  - uid: 17116
-    components:
-    - type: Transform
-      pos: -17.5,-1.5
-      parent: 2
   - uid: 17223
     components:
     - type: Transform
@@ -33650,6 +33673,11 @@ entities:
     - type: Transform
       pos: 13.5,10.5
       parent: 17265
+  - uid: 20273
+    components:
+    - type: Transform
+      pos: -23.5,-3.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 11199
@@ -44103,6 +44131,16 @@ entities:
     - type: Transform
       pos: -37.5,-79.5
       parent: 2
+  - uid: 17243
+    components:
+    - type: Transform
+      pos: -23.5,-3.5
+      parent: 2
+  - uid: 17246
+    components:
+    - type: Transform
+      pos: -24.5,-3.5
+      parent: 2
   - uid: 18743
     components:
     - type: Transform
@@ -52122,6 +52160,12 @@ entities:
     - type: Transform
       pos: -63.482185,-45.40664
       parent: 2
+  - uid: 14449
+    components:
+    - type: Transform
+      rot: 0.3490658503988659 rad
+      pos: -78.71441,-19.270542
+      parent: 2
 - proto: ClothingHeadHatWarden
   entities:
   - uid: 5939
@@ -59184,15 +59228,11 @@ entities:
       parent: 2
 - proto: DrinkNukieCan
   entities:
-  - uid: 17243
-    components:
-    - type: Transform
-      pos: -77.61665,-19.770155
-      parent: 2
   - uid: 17244
     components:
     - type: MetaData
       desc: 'На этикетке написано: "Любимый напиток Варка"'
+      name: банка Варка-робаста
     - type: Transform
       pos: -77.3529,-19.58397
       parent: 2
@@ -88160,18 +88200,6 @@ entities:
       rot: 0.7853981633974483 rad
       pos: -13.900502,-1.4705787
       parent: 2
-  - uid: 14361
-    components:
-    - type: Transform
-      rot: 0.7853981633974483 rad
-      pos: -13.868586,-1.8311768
-      parent: 2
-  - uid: 14449
-    components:
-    - type: Transform
-      rot: 0.7853981633974483 rad
-      pos: -13.920322,-1.8075459
-      parent: 2
 - proto: MagazinePistolSubMachineGunTopMountedEmpty
   entities:
   - uid: 6272
@@ -102744,13 +102772,6 @@ entities:
     - type: Transform
       pos: -58.50627,-67.57545
       parent: 2
-- proto: SpeedLoaderMagnum
-  entities:
-  - uid: 17246
-    components:
-    - type: Transform
-      pos: -78.136406,-19.529663
-      parent: 2
 - proto: Spoon
   entities:
   - uid: 12101
@@ -125060,6 +125081,23 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: WeaponPistolMk58
+  entities:
+  - uid: 6680
+    components:
+    - type: Transform
+      pos: -12.197494,-4.5229115
+      parent: 2
+  - uid: 11448
+    components:
+    - type: Transform
+      pos: -12.344886,-4.414303
+      parent: 2
+  - uid: 14361
+    components:
+    - type: Transform
+      pos: -12.523308,-4.3599987
+      parent: 2
 - proto: WeaponPistolN1984
   entities:
   - uid: 16367
@@ -125079,11 +125117,6 @@ entities:
       parent: 2
 - proto: WeaponRevolverPython
   entities:
-  - uid: 17245
-    components:
-    - type: Transform
-      pos: -78.369125,-19.382267
-      parent: 2
   - uid: 19913
     components:
     - type: Transform
@@ -125134,13 +125167,15 @@ entities:
     - type: Transform
       pos: -14.564501,-3.3821173
       parent: 2
-- proto: WeaponSubMachineGunDrozd
+- proto: WeaponSniperMosin
   entities:
-  - uid: 15280
+  - uid: 17116
     components:
     - type: Transform
-      pos: -12.467213,-4.5887575
+      pos: -78.48169,-19.472244
       parent: 2
+- proto: WeaponSubMachineGunDrozd
+  entities:
   - uid: 16145
     components:
     - type: Transform
@@ -125156,14 +125191,14 @@ entities:
   - uid: 17072
     components:
     - type: Transform
-      pos: -12.511809,-4.3062997
+      pos: -12.414703,-3.5249188
       parent: 2
 - proto: WeaponSubMachineGunWt550
   entities:
   - uid: 11777
     components:
     - type: Transform
-      pos: -12.485277,-3.3698366
+      pos: -12.461247,-3.2999437
       parent: 2
 - proto: WeaponTurretHostile
   entities: