diff --git a/Resources/Maps/corvax_avrite.yml b/Resources/Maps/corvax_avrite.yml
index 2c63e82f45a..59124e10692 100644
--- a/Resources/Maps/corvax_avrite.yml
+++ b/Resources/Maps/corvax_avrite.yml
@@ -42713,36 +42713,6 @@ entities:
             40402: -108.70087,14.898306
             40403: -108.5967,15.148306
             40404: -108.46476,15.176084
-        - node:
-            zIndex: -1
-            color: '#FFFFFF0F'
-            id: smallbrush
-          decals:
-            69656: 27.592266,36.859283
-            69657: 27.654766,36.7447
-            69658: 27.852682,36.97387
-            69659: 28.008932,37.015533
-            69660: 28.08185,36.91137
-            69661: 28.0506,37.00512
-            69662: 28.561016,37.09887
-            69663: 29.029766,36.953033
-            69664: 28.8006,36.94262
-            69665: 29.373516,37.08845
-            69666: 29.4256,37.09887
-            69667: 29.1756,37.22387
-            69668: 29.040182,37.16137
-            69669: 29.133932,37.28637
-            69670: 29.373516,37.296783
-            69671: 29.70685,37.28637
-            69672: 29.89435,37.28637
-            69673: 30.133934,37.296783
-            69674: 30.248516,37.328033
-            69676: 27.540182,36.59887
-            69677: 27.842266,36.59887
-            69678: 28.311016,36.671783
-            69679: 28.133932,36.796783
-            69680: 28.123516,36.8697
-            69684: 24.508932,36.765533
         - node:
             zIndex: -1
             color: '#FFFFFF0F'
@@ -42796,6 +42766,31 @@ entities:
             68059: 4.3150287,76.497795
             68060: 3.2941954,77.03947
             68061: 3.0928066,77.16447
+            69656: 27.592266,36.859283
+            69657: 27.654766,36.7447
+            69658: 27.852682,36.97387
+            69659: 28.008932,37.015533
+            69660: 28.08185,36.91137
+            69661: 28.0506,37.00512
+            69662: 28.561016,37.09887
+            69663: 29.029766,36.953033
+            69664: 28.8006,36.94262
+            69665: 29.373516,37.08845
+            69666: 29.4256,37.09887
+            69667: 29.1756,37.22387
+            69668: 29.040182,37.16137
+            69669: 29.133932,37.28637
+            69670: 29.373516,37.296783
+            69671: 29.70685,37.28637
+            69672: 29.89435,37.28637
+            69673: 30.133934,37.296783
+            69674: 30.248516,37.328033
+            69676: 27.540182,36.59887
+            69677: 27.842266,36.59887
+            69678: 28.311016,36.671783
+            69679: 28.133932,36.796783
+            69680: 28.123516,36.8697
+            69684: 24.508932,36.765533
         - node:
             color: '#FFFFFF0F'
             id: smallbrush
@@ -60695,16 +60690,6 @@ entities:
             id: splatter
           decals:
             60720: -14.989126,-3.7459636
-        - node:
-            zIndex: -1
-            color: '#FFFFFF34'
-            id: splatter
-          decals:
-            69603: 23.842266,36.84887
-            69604: 29.76935,36.8072
-            69605: 29.248516,36.6822
-            69606: 28.83185,36.578033
-            69609: 27.4256,36.9947
         - node:
             zIndex: -1
             color: '#FFFFFF34'
@@ -60794,6 +60779,11 @@ entities:
             66467: -7.006586,84.93782
             66468: -6.631586,85.15657
             66469: -5.959711,85.28157
+            69603: 23.842266,36.84887
+            69604: 29.76935,36.8072
+            69605: 29.248516,36.6822
+            69606: 28.83185,36.578033
+            69609: 27.4256,36.9947
         - node:
             color: '#FFFFFF34'
             id: splatter
@@ -65711,7 +65701,8 @@ entities:
           2,-18:
             0: 3755
           2,-21:
-            0: 65535
+            0: 49151
+            7: 16384
           3,-21:
             0: 13107
             1: 34952
@@ -67105,6 +67096,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 23.721722
+          - 89.23887
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -164776,22 +164782,22 @@ entities:
   - uid: 10002
     components:
     - type: Transform
-      pos: 13.47869,-79.56245
+      pos: 11.005796,-80.51616
       parent: 2
   - uid: 15775
     components:
     - type: Transform
-      pos: 7.494316,-83.56245
+      pos: 9.052671,-80.781784
       parent: 2
   - uid: 15778
     components:
     - type: Transform
-      pos: 7.4630656,-79.60932
+      pos: 9.255796,-80.375534
       parent: 2
   - uid: 18928
     components:
     - type: Transform
-      pos: 13.447441,-81.51557
+      pos: 9.365171,-80.406784
       parent: 2
   - uid: 20239
     components:
@@ -164837,12 +164843,12 @@ entities:
   - uid: 51173
     components:
     - type: Transform
-      pos: 13.478691,-83.54682
+      pos: 10.724546,-80.64116
       parent: 2
   - uid: 51178
     components:
     - type: Transform
-      pos: 7.463066,-81.5937
+      pos: 8.818296,-79.906784
       parent: 2
   - uid: 55428
     components:
@@ -165156,7 +165162,7 @@ entities:
   - uid: 11542
     components:
     - type: Transform
-      pos: 12.349777,-77.57862
+      pos: 12.5057955,-77.23124
       parent: 2
   - uid: 12788
     components:
@@ -165171,7 +165177,7 @@ entities:
   - uid: 14298
     components:
     - type: Transform
-      pos: 8.568527,-77.51612
+      pos: 8.5370455,-77.23124
       parent: 2
   - uid: 18976
     components:
@@ -195477,63 +195483,6 @@ entities:
         - 0
         - 0
         - 0
-  - uid: 53725
-    components:
-    - type: Transform
-      pos: 2.4875007,3.3868256
-      parent: 56354
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14673
-        moles:
-        - 1.8968438
-        - 7.1357465
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 44149
-          - 53772
-          - 52062
-          - 44146
-          - 44148
-          - 52081
-          - 52051
-          - 52054
-          - 53642
-          - 53641
-          - 52053
-          - 53775
-          - 52056
-          - 52080
-          - 52075
-          - 52063
-          - 52426
-          - 52425
-          - 52055
-          - 53773
-          - 52427
-          - 53776
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: Pullable
-      prevFixedRotation: True
 - proto: CrateRCDAmmo
   entities:
   - uid: 13079
@@ -196901,7 +196850,7 @@ entities:
       pos: -25.5,-29.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -49688.637
+      secondsUntilStateChange: -49998.97
       state: Closing
   - uid: 23821
     components:
@@ -198674,10 +198623,8 @@ entities:
       desc: Делает очень больно кусь.
       name: Bloodcanis
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.474546,-82.938034
+      parent: 2
 - proto: DeployableBarrier
   entities:
   - uid: 2338
@@ -215732,20 +215679,16 @@ entities:
       desc: Алкогольный напиток, приготовленный на ингредиентах счастья.
       name: Just_Art
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.349546,-79.95366
+      parent: 2
   - uid: 52062
     components:
     - type: MetaData
       desc: Алкогольный напиток, приготовленный на ингредиентах и основе страданий.
       name: ll_misha_ll
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.630796,-80.250534
+      parent: 2
   - uid: 53781
     components:
     - type: MetaData
@@ -233816,10 +233759,8 @@ entities:
       desc: Глупое яблоко, глупое, глупое... и милое.
       name: Fire3DoxNI
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.5370455,-79.125534
+      parent: 2
 - proto: FoodBakedBunHotX
   entities:
   - uid: 27979
@@ -235326,10 +235267,8 @@ entities:
       desc: Не о чем плакать, ведь это просто лук.. лук..
       name: Mister_onion
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 12.552671,-81.51526
+      parent: 2
 - proto: FoodOrange
   entities:
   - uid: 20137
@@ -235680,10 +235619,8 @@ entities:
       desc: Гений, родившийся не в то время, не в том месте..
       name: LagInPotato
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.5214214,-82.82866
+      parent: 2
 - proto: FoodRiceBoiled
   entities:
   - uid: 53796
@@ -236341,10 +236278,8 @@ entities:
       desc: Она потомок рода помидоров...
       name: whysodora
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.4901714,-82.29741
+      parent: 2
 - proto: ForensicPad
   entities:
   - uid: 19991
@@ -239927,10 +239862,8 @@ entities:
       desc: Как же он устал от попыток настроить атмос..
       name: HappyRoach
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.5214214,-81.813034
+      parent: 2
 - proto: GasCanisterBrokenBase
   entities:
   - uid: 11428
@@ -303156,10 +303089,8 @@ entities:
       desc: Ручной сканер тела, способный определять жизненные показатели пациента, но сейчас он опустошён...
       name: Hemo
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 12.505796,-81.15588
+      parent: 2
 - proto: HandHeldMassScanner
   entities:
   - uid: 44971
@@ -317227,10 +317158,8 @@ entities:
     - type: MetaData
       name: плюшевый TiFeRi
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.490171,-80.73491
+      parent: 2
   - uid: 52052
     components:
     - type: Transform
@@ -317242,10 +317171,8 @@ entities:
       desc: Мягкая игрушка человека в скафандре атмосферного техника, думаю он только учится но глаза наполнени решимостью.
       name: kvant8
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.333921,-80.29741
+      parent: 2
   - uid: 67758
     components:
     - type: Transform
@@ -317301,10 +317228,8 @@ entities:
       desc: Тяжелая рабочая партия... от него пахнет дымом.
       name: SatuSmoke
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.365171,-79.73491
+      parent: 2
   - uid: 53785
     components:
     - type: MetaData
@@ -317374,20 +317299,16 @@ entities:
       desc: Пахнет горелым плюшем, имеет несколько сильных вмятин и упертые глаза.
       name: DronaR
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.4901714,-81.26616
+      parent: 2
   - uid: 53775
     components:
     - type: MetaData
       desc: Йааааррр!
       name: Yufim
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.552671,-80.79741
+      parent: 2
 - proto: PlushieMagicarp
   entities:
   - uid: 3775
@@ -317445,10 +317366,8 @@ entities:
       desc: Он на вид устал, давай проведём осмотр?
       name: плюшевый Vishna
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.458921,-83.48491
+      parent: 2
 - proto: PlushieSharkBlue
   entities:
   - uid: 8587
@@ -317471,10 +317390,8 @@ entities:
       desc: Я люблю тебя так сильно, как никто никогда не любил...
       name: Dezzzix
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.3964205,-79.375534
+      parent: 2
 - proto: PlushieSharkPink
   entities:
   - uid: 15545
@@ -317493,10 +317410,8 @@ entities:
       desc: Спи, малышка, пусть приснятся горы и ручьи. Где нет зимы...
       name: Denora
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.3495455,-79.031784
+      parent: 2
   - uid: 67763
     components:
     - type: Transform
@@ -317519,20 +317434,16 @@ entities:
       desc: Злой злодейный керн, пытается выломать стекло!
       name: Kern
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.396421,-82.000534
+      parent: 2
   - uid: 52075
     components:
     - type: MetaData
       desc: Очаровательная, милая и мягкая игрушка Авелина. Радует всех одним своим видом!
       name: Avelina
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.443296,-82.344284
+      parent: 2
 - proto: PlushieSpaceLizard
   entities:
   - uid: 17020
@@ -317551,10 +317462,8 @@ entities:
       desc: Самый прекрасный менторёнок в галактике!
       name: Angelnedemon
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 13.505796,-81.375534
+      parent: 2
   - uid: 67764
     components:
     - type: Transform
@@ -374145,10 +374054,8 @@ entities:
     - type: MetaData
       name: Zna1kin
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.4589214,-83.45366
+      parent: 2
 - proto: ToyFigurineParamedic
   entities:
   - uid: 12170
@@ -374261,10 +374168,8 @@ entities:
       desc: Какой-то мужик.
       name: ua_No_Name48237
     - type: Transform
-      parent: 53725
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
+      pos: 7.521421,-79.51616
+      parent: 2
 - proto: ToyMouse
   entities:
   - uid: 13529