From 65c1f139fe3d2c1a35f323f48d7c69c8be94901e Mon Sep 17 00:00:00 2001
From: Bloodcanis <Bloodcanis@gmail.com>
Date: Sat, 14 Dec 2024 23:58:10 +0300
Subject: [PATCH] Update corvax_delta.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Обновление по приказу всевышнего, этап 2.
---
 Resources/Maps/corvax_delta.yml | 1025 +++++++++++++++++++------------
 1 file changed, 645 insertions(+), 380 deletions(-)

diff --git a/Resources/Maps/corvax_delta.yml b/Resources/Maps/corvax_delta.yml
index 8305c1c57a1..db8d4d4f1e2 100644
--- a/Resources/Maps/corvax_delta.yml
+++ b/Resources/Maps/corvax_delta.yml
@@ -359,7 +359,7 @@ entities:
           version: 6
         -2,2:
           ind: -2,2
-          tiles: nQAAAAAARgAAAAAARgAAAAAARgAAAAAAKAAAAAAADwAAAAACDwAAAAAADwAAAAAADwAAAAADawAAAAAAMwAAAAAAMwAAAAAAawAAAAACMwAAAAAAawAAAAAAIwAAAAACbAAAAAAAbAAAAAAARgAAAAAARgAAAAAAKAAAAAAADwAAAAABDwAAAAABDwAAAAACDwAAAAABawAAAAAAMwAAAAAAMwAAAAAAawAAAAADawAAAAAAawAAAAACIwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAARgAAAAAAKAAAAAAADwAAAAAADwAAAAADDwAAAAABDwAAAAACawAAAAADawAAAAAAMwAAAAAAawAAAAACMwAAAAAAawAAAAADIwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAARgAAAAAAKAAAAAAADwAAAAAADwAAAAADDwAAAAAADwAAAAACawAAAAAAawAAAAAAawAAAAAAawAAAAADMwAAAAAAawAAAAACawAAAAABbAAAAAAAbAAAAAAAbAAAAAAARgAAAAAAKAAAAAAADwAAAAABDwAAAAABDwAAAAADDwAAAAACawAAAAADawAAAAABawAAAAAAawAAAAADMwAAAAAAawAAAAAAawAAAAACbAAAAAAAbAAAAAAARgAAAAAARgAAAAAAKAAAAAAADwAAAAADDwAAAAADDwAAAAAADwAAAAACawAAAAADawAAAAABawAAAAAAawAAAAABawAAAAABawAAAAAAawAAAAACnQAAAAAARgAAAAAARgAAAAAAKAAAAAAAKAAAAAAADwAAAAABDwAAAAAADwAAAAAADwAAAAACawAAAAACawAAAAADawAAAAABawAAAAABawAAAAAAawAAAAADawAAAAADnQAAAAAAawAAAAAAKAAAAAAAnQAAAAAADwAAAAAADwAAAAABDwAAAAACDwAAAAACDwAAAAAAawAAAAADawAAAAADawAAAAADDAAAAAAADAAAAAAADAAAAAAAawAAAAADWgAAAAAAawAAAAACawAAAAABnQAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAawAAAAACawAAAAADawAAAAADDAAAAAAADAAAAAAARwAAAAAADAAAAAAADAAAAAAAWgAAAAAAawAAAAAAawAAAAACawAAAAAAawAAAAADawAAAAABawAAAAABKAAAAAAAawAAAAAAMwAAAAAAawAAAAACDAAAAAAARwAAAAAARwAAAAAARwAAAAAADAAAAAAAawAAAAAAawAAAAACawAAAAABawAAAAAAawAAAAAAawAAAAACawAAAAACawAAAAACawAAAAADawAAAAAAawAAAAAADAAAAAAADAAAAAAARwAAAAAADAAAAAAADAAAAAAAawAAAAACawAAAAAAawAAAAABawAAAAAAawAAAAAAawAAAAAAawAAAAAAnQAAAAAAawAAAAAAawAAAAAAawAAAAABawAAAAABDAAAAAAADAAAAAAADAAAAAAAawAAAAADKAAAAAAAawAAAAACKAAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAawAAAAADawAAAAAAawAAAAABawAAAAADawAAAAADawAAAAABawAAAAACawAAAAABawAAAAAAawAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAnQAAAAAAnQAAAAAAawAAAAACawAAAAADawAAAAACawAAAAABawAAAAABawAAAAADawAAAAAAawAAAAABawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQwAAAAAAnQAAAAAAnQAAAAAAawAAAAABawAAAAACawAAAAACawAAAAACMwAAAAAAawAAAAAAawAAAAABQwAAAAAAawAAAAAAQwAAAAAAawAAAAAAQwAAAAAAawAAAAAAawAAAAAAawAAAAAAKAAAAAAAawAAAAADawAAAAAAMwAAAAAAawAAAAACMwAAAAAAawAAAAACMwAAAAAA
+          tiles: nQAAAAAARgAAAAAARgAAAAAARgAAAAAAKAAAAAAADwAAAAACDwAAAAAADwAAAAAADwAAAAADawAAAAAAMwAAAAAAMwAAAAAAawAAAAACMwAAAAAAawAAAAAAIwAAAAACbAAAAAAAbAAAAAAARgAAAAAARgAAAAAAKAAAAAAADwAAAAABDwAAAAABDwAAAAACDwAAAAABawAAAAAAMwAAAAAAMwAAAAAAawAAAAADawAAAAAAawAAAAACIwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAARgAAAAAAKAAAAAAADwAAAAAADwAAAAADDwAAAAABDwAAAAACawAAAAADawAAAAAAMwAAAAAAawAAAAACMwAAAAAAawAAAAADIwAAAAAAbAAAAAAAbAAAAAAAbAAAAAAARgAAAAAAKAAAAAAADwAAAAAADwAAAAADDwAAAAAADwAAAAACawAAAAAAawAAAAAAawAAAAAAawAAAAADMwAAAAAAawAAAAACawAAAAABbAAAAAAAbAAAAAAAbAAAAAAARgAAAAAAKAAAAAAADwAAAAABDwAAAAABDwAAAAADDwAAAAACawAAAAADawAAAAABawAAAAAAawAAAAADMwAAAAAAawAAAAAAawAAAAACbAAAAAAAbAAAAAAARgAAAAAARgAAAAAAKAAAAAAADwAAAAADDwAAAAADDwAAAAAADwAAAAACawAAAAADawAAAAABawAAAAAAawAAAAABawAAAAABawAAAAAAawAAAAACnQAAAAAARgAAAAAARgAAAAAAKAAAAAAAKAAAAAAADwAAAAABDwAAAAAADwAAAAAADwAAAAACawAAAAACawAAAAADawAAAAABawAAAAABawAAAAAAawAAAAADawAAAAADnQAAAAAAawAAAAAAKAAAAAAAnQAAAAAADwAAAAAADwAAAAABDwAAAAACDwAAAAACDwAAAAAAawAAAAADawAAAAADawAAAAADDgAAAAAADgAAAAAADgAAAAAAawAAAAADWgAAAAAAawAAAAACawAAAAABnQAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAawAAAAACawAAAAADawAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAWgAAAAAAawAAAAAAawAAAAACawAAAAAAawAAAAADawAAAAABawAAAAABKAAAAAAAawAAAAAAawAAAAAAawAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAawAAAAAAawAAAAACawAAAAABawAAAAAAawAAAAAAawAAAAACawAAAAACawAAAAACawAAAAADawAAAAAAawAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAawAAAAACawAAAAAAawAAAAABawAAAAAAawAAAAAAawAAAAAAawAAAAAAnQAAAAAAawAAAAAAawAAAAAAawAAAAABawAAAAABDgAAAAAADgAAAAAADgAAAAAAawAAAAADKAAAAAAAawAAAAACKAAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAnQAAAAAAawAAAAADawAAAAAAawAAAAABawAAAAADawAAAAADawAAAAABawAAAAACawAAAAABawAAAAAAawAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAnQAAAAAAnQAAAAAAawAAAAACawAAAAADawAAAAACawAAAAABawAAAAABawAAAAADawAAAAAAawAAAAABawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQwAAAAAAnQAAAAAAnQAAAAAAawAAAAABawAAAAACawAAAAACawAAAAACMwAAAAAAawAAAAAAawAAAAABQwAAAAAAawAAAAAAQwAAAAAAawAAAAAAQwAAAAAAawAAAAAAawAAAAAAawAAAAAAKAAAAAAAawAAAAADawAAAAAAMwAAAAAAawAAAAACMwAAAAAAawAAAAACMwAAAAAA
           version: 6
         -2,3:
           ind: -2,3
@@ -6969,7 +6969,6 @@ entities:
             2116: -21,52
             2130: -23,51
             2133: -23,48
-            2151: -24,41
             2152: -23,45
             2198: -27,30
             2607: -13,48
@@ -7080,7 +7079,6 @@ entities:
             10839: -13,-30
             11261: -24,-50
             11273: -26,-52
-            11977: -23,39
             12097: -3,50
             12377: -37,-60
             13363: -44,15
@@ -7592,11 +7590,9 @@ entities:
             2132: -23,50
             2136: -23,47
             2137: -23,47
-            2139: -24,41
             2172: -21,28
             2174: -20,26
             2185: -23,30
-            2186: -23,40
             2197: -27,30
             2200: -27,32
             2227: -27,39
@@ -12845,7 +12841,6 @@ entities:
             14019: -17,51
             14020: -21,51
             14021: -19,52
-            14024: -23,41
             14025: -10,49
             14026: -5,49
             14063: -30,95
@@ -13357,7 +13352,6 @@ entities:
             14015: -19,52
             14016: -17,51
             14022: -19,48
-            14023: -23,41
             14027: -11,49
             14028: -6,49
             14041: -20,57
@@ -13850,7 +13844,6 @@ entities:
             13848: -16,48
             13849: -19,46
             13850: -19,50
-            13851: -23,41
             13852: -19,34
             13853: -19,31
             13854: -19,27
@@ -14370,7 +14363,6 @@ entities:
             13836: -22,30
             13837: -19,31
             13838: -19,34
-            13839: -23,41
             13840: -19,46
             13841: -21,47
             13842: -17,47
@@ -15458,7 +15450,6 @@ entities:
             1996: -20,34
             1997: -20,35
             1998: -20,36
-            2140: -24,41
             2242: -29,31
             2577: -9,53
             2648: -7,49
@@ -16738,7 +16729,6 @@ entities:
             2017: -19,26
             2021: -19,30
             2089: -21,28
-            2141: -23,40
             2265: -31,29
             2572: -12,51
             2579: -10,54
@@ -18052,7 +18042,6 @@ entities:
             2014: -19,30
             2015: -19,37
             2018: -21,35
-            2147: -23,42
             2245: -29,30
             2246: -30,30
             2286: -30,39
@@ -19370,7 +19359,6 @@ entities:
             2010: -20,32
             2011: -20,33
             2012: -20,34
-            2142: -22,41
             2234: -28,37
             2235: -28,36
             2236: -28,34
@@ -19880,8 +19868,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimCornerNe
           decals:
-            1970: -21,39
-            2065: -20,40
             7688: 75,-16
             7734: 68,-24
             11912: -40,34
@@ -19902,8 +19888,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimCornerNw
           decals:
-            1969: -17,39
-            2064: -18,40
             7733: 74,-24
             7740: 67,-16
         - node:
@@ -19915,8 +19899,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimCornerSe
           decals:
-            1971: -21,43
-            2063: -20,42
             7769: 68,-17
             7794: 75,-25
         - node:
@@ -19928,37 +19910,19 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimCornerSw
           decals:
-            1972: -17,43
-            2067: -18,42
             7768: 74,-17
             7795: 67,-25
             11916: -38,32
-        - node:
-            color: '#FFFFFFFF'
-            id: ConcreteTrimEndE
-          decals:
-            2052: -18,41
-        - node:
-            color: '#FFFFFFFF'
-            id: ConcreteTrimEndN
-          decals:
-            2050: -19,42
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimEndS
           decals:
-            2051: -19,40
             11913: -40,32
         - node:
             color: '#FFFF00FF'
             id: ConcreteTrimEndW
           decals:
             13023: -70,55
-        - node:
-            color: '#FFFFFFFF'
-            id: ConcreteTrimEndW
-          decals:
-            2049: -20,41
         - node:
             color: '#FFFF00FF'
             id: ConcreteTrimInnerNe
@@ -19968,13 +19932,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimInnerNe
           decals:
-            1976: -21,38
-            1978: -22,39
-            2053: -19,41
-            2071: -21,40
-            2072: -20,39
-            2085: -18,43
-            2086: -17,42
             2729: -33,43
             7750: 67,-24
             7751: 68,-25
@@ -19996,13 +19953,6 @@ entities:
             id: ConcreteTrimInnerNw
           decals:
             1975: -16,39
-            1977: -17,38
-            2054: -19,41
-            2082: -21,42
-            2083: -21,42
-            2084: -20,43
-            2087: -17,40
-            2088: -18,39
             7771: 74,-25
             7772: 75,-24
             7773: 75,-22
@@ -20018,14 +19968,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimInnerSe
           decals:
-            1979: -21,44
-            2055: -19,41
-            2073: -21,42
-            2074: -20,43
-            2075: -17,40
-            2076: -17,40
-            2077: -18,39
-            2145: -22,43
             2728: -33,40
             7755: 67,-22
             7756: 67,-19
@@ -20044,13 +19986,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimInnerSw
           decals:
-            1980: -17,44
-            1981: -16,43
-            2056: -19,41
-            2078: -17,42
-            2079: -18,43
-            2080: -20,39
-            2081: -21,40
             2720: -32,44
             7747: 75,-22
             7748: 75,-19
@@ -20083,10 +20018,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineE
           decals:
-            1982: -22,40
-            1983: -22,41
-            2068: -21,41
-            2146: -22,42
             7720: 67,-21
             7721: 67,-20
             7722: 67,-23
@@ -20111,10 +20042,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineN
           decals:
-            1966: -20,38
-            1967: -19,38
-            1968: -18,38
-            2070: -19,39
             7689: 74,-16
             7690: 73,-16
             7691: 72,-16
@@ -20157,10 +20084,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineS
           decals:
-            1984: -20,44
-            1985: -19,44
-            1986: -18,44
-            2066: -19,43
             7713: 68,-19
             7714: 69,-19
             7715: 70,-19
@@ -20214,9 +20137,6 @@ entities:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineW
           decals:
-            1973: -16,41
-            1974: -16,40
-            2069: -17,41
             2716: -32,40
             2717: -32,41
             2718: -32,42
@@ -20234,7 +20154,6 @@ entities:
             7808: 76,-19
             7809: 76,-22
             11919: -40,33
-            23791: -16,42
         - node:
             color: '#FFFFFF25'
             id: Damaged
@@ -20511,7 +20430,6 @@ entities:
             13478: -19,36
             13479: -19,35
             13480: -19,34
-            13481: -23,41
             13482: -19,48
             13483: -19,47
             13484: -19,46
@@ -24423,11 +24341,6 @@ entities:
             id: Grassa3
           decals:
             23965: 8.913162,-38.208305
-        - node:
-            color: '#FFFFFFFF'
-            id: Grassa3
-          decals:
-            2044: -18,43
         - node:
             cleanable: True
             zIndex: 10
@@ -24459,27 +24372,23 @@ entities:
             id: Grassb1
           decals:
             1133: -34,40
-            2060: -20,42
             2727: -34,41
         - node:
             color: '#FFFFFFFF'
             id: Grassb4
           decals:
             1454: -39,32
-            2047: -18,39
         - node:
             color: '#FFFFFFFF'
             id: Grassb5
           decals:
             1455: -40,35
-            2048: -21,41
             2726: -33,42
         - node:
             color: '#FFFFFFFF'
             id: Grassc1
           decals:
             1131: -34,42
-            2043: -20,39
             20257: -16.861458,19.162476
         - node:
             cleanable: True
@@ -24503,25 +24412,18 @@ entities:
             id: Grassc3
           decals:
             1456: -39,31
-            2059: -20,40
             2725: -33,40
         - node:
             color: '#FFFFFFFF'
             id: Grassc4
           decals:
             1449: -41,33
-            2042: -21,42
-            2046: -17,42
         - node:
             color: '#FFFFFFFF'
             id: Grassd1
           decals:
             1450: -40,31
             1457: -41,32
-            2026: -19,43
-            2034: -18,42
-            2035: -18,42
-            2036: -18,43
             20546: 14.848043,17.971935
             20547: 14.910544,18.565685
             20548: 14.879294,19.440685
@@ -24532,21 +24434,12 @@ entities:
             id: Grassd2
           decals:
             1459: -39,35
-            2025: -17,41
-            2037: -18,39
-            2057: -20,40
-            2061: -20,42
-            2062: -20,42
             14781: 82,3
         - node:
             color: '#FFFFFFFF'
             id: Grassd3
           decals:
             1451: -39,32
-            2024: -17,42
-            2038: -19,39
-            2039: -20,43
-            2058: -20,42
             2723: -33,42
             2724: -34,41
             14784: 89,3
@@ -24559,8 +24452,6 @@ entities:
           decals:
             1453: -38,34
             1458: -39,34
-            2030: -21,41
-            2031: -21,41
             14783: 88,3
         - node:
             color: '#FFFFFFFF'
@@ -24568,10 +24459,6 @@ entities:
           decals:
             1132: -33,43
             1452: -41,35
-            2023: -17,40
-            2027: -20,43
-            2028: -20,39
-            2045: -19,43
             14782: 81,3
             20256: -17.048258,19.490566
             20262: -16.921246,18.874208
@@ -24580,12 +24467,6 @@ entities:
             id: Grasse3
           decals:
             1130: -33,40
-            2022: -21,42
-            2029: -21,40
-            2032: -18,40
-            2033: -18,40
-            2040: -21,40
-            2041: -17,42
             20255: -16.985758,20.224941
             20261: -16.952496,18.202333
         - node:
@@ -25390,28 +25271,6 @@ entities:
             id: Rock06
           decals:
             14787: 82,3
-        - node:
-            color: '#000000FF'
-            id: Rust
-          decals:
-            2461: -19,41
-            2462: -19,41
-            2463: -19,41
-            2464: -19,41
-            2465: -19,40
-            2466: -19,40
-            2467: -19,40
-            2468: -18,41
-            2469: -18,41
-            2470: -19,42
-            2471: -19,42
-            2472: -20,41
-            2473: -20,41
-            2474: -20,41
-            2475: -20,41
-            2476: -19,42
-            2477: -18,41
-            2478: -19,40
         - node:
             cleanable: True
             color: '#FFFFFF5D'
@@ -27871,6 +27730,21 @@ entities:
           decals:
             23997: 72,-24
             24009: 73,-18
+            24013: -20.393345,41.022392
+            24015: -19.59647,40.17864
+            24018: -17.737095,40.42864
+            24021: -18.12772,42.08489
+            24023: -19.549595,42.663013
+            24042: -18.779934,39.529533
+            24043: -18.32681,39.154533
+            24044: -19.748686,39.138912
+            24045: -21.029934,40.154537
+            24046: -21.029934,41.623287
+            24047: -20.233059,42.185787
+            24048: -19.88931,42.888912
+            24049: -18.154936,42.92016
+            24050: -17.35806,40.935787
+            24051: -17.108059,40.060787
         - node:
             color: '#FFFFFFFF'
             id: grasssnow01
@@ -27906,6 +27780,14 @@ entities:
             id: grasssnow04
           decals:
             24001: 73,-23
+            24025: -20.31522,41.959892
+            24031: -17.862095,42.694263
+            24035: -18.19022,43.163013
+            24037: -16.920547,42.491695
+            24038: -16.998697,41.209805
+            24039: -17.186184,41.701412
+            24040: -17.358059,42.045162
+            24041: -17.420559,42.029537
         - node:
             color: '#FFFFFFFF'
             id: grasssnow05
@@ -28020,6 +27902,31 @@ entities:
             23991: 68,-23
             23992: 69,-23
             24011: 74,-18
+            24052: -20.108059,40.170162
+            24053: -20.295559,39.904537
+            24054: -20.936184,39.826412
+            24055: -20.123686,39.185787
+            24056: -20.045559,38.888912
+            24057: -19.514309,38.88891
+            24058: -18.983059,38.842033
+            24059: -18.733059,38.810783
+            24060: -17.873684,38.842033
+            24061: -17.889309,39.82641
+            24062: -18.936184,40.23266
+            24063: -16.858059,39.888912
+            24064: -16.904936,40.967037
+            24065: -16.951809,41.810787
+            24066: -17.358059,41.951412
+            24067: -17.826809,41.57641
+            24068: -17.139309,42.248287
+            24069: -17.98306,42.748283
+            24070: -18.029934,43.17016
+            24071: -19.264309,43.185783
+            24072: -19.436184,43.185783
+            24073: -20.061184,43.185787
+            24074: -20.389309,42.295162
+            24075: -21.045559,42.232662
+            24076: -20.95181,40.920162
         - node:
             cleanable: True
             color: '#53960057'
@@ -104729,6 +104636,13 @@ entities:
       rot: 3.141593671850739 rad
       pos: -53.86745,-43.94071
       parent: 2
+- proto: CaneSheathFilled
+  entities:
+  - uid: 40875
+    components:
+    - type: Transform
+      pos: 23.473991,72.56648
+      parent: 2
 - proto: CannabisSeeds
   entities:
   - uid: 12489
@@ -112590,12 +112504,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,81.5
       parent: 2
-  - uid: 13896
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-28.5
-      parent: 2
   - uid: 13897
     components:
     - type: Transform
@@ -113653,12 +113561,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 58.5,-24.5
       parent: 2
-  - uid: 14080
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 58.5,-24.5
-      parent: 2
   - uid: 14081
     components:
     - type: Transform
@@ -113750,36 +113652,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 60.5,-27.5
       parent: 2
-  - uid: 14097
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-27.5
-      parent: 2
-  - uid: 14098
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 59.5,-25.5
-      parent: 2
   - uid: 14099
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 60.5,-25.5
       parent: 2
-  - uid: 14100
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 57.5,-25.5
-      parent: 2
-  - uid: 14101
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-25.5
-      parent: 2
   - uid: 14102
     components:
     - type: Transform
@@ -113813,12 +113691,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 60.5,-26.5
       parent: 2
-  - uid: 14108
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 60.5,-26.5
-      parent: 2
   - uid: 14109
     components:
     - type: Transform
@@ -121951,6 +121823,13 @@ entities:
       parent: 14966
     - type: Physics
       canCollide: False
+- proto: ClothingNeckMantle
+  entities:
+  - uid: 40876
+    components:
+    - type: Transform
+      pos: 12.723515,82.54918
+      parent: 2
 - proto: ClothingNeckMantleCap
   entities:
   - uid: 15100
@@ -146484,41 +146363,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -70.5,56.5
       parent: 2
-  - uid: 18470
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,40.5
-      parent: 2
-  - uid: 18471
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,41.5
-      parent: 2
   - uid: 18472
     components:
     - type: Transform
       pos: -52.5,-42.5
       parent: 2
-  - uid: 18473
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,41.5
-      parent: 2
-  - uid: 18474
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,42.5
-      parent: 2
-  - uid: 18475
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,41.5
-      parent: 2
   - uid: 18476
     components:
     - type: Transform
@@ -146777,6 +146626,18 @@ entities:
     - type: Transform
       pos: -14.353639,-80.11509
       parent: 2
+- proto: FoodBerries
+  entities:
+  - uid: 40879
+    components:
+    - type: Transform
+      pos: -26.221266,53.45821
+      parent: 2
+  - uid: 40880
+    components:
+    - type: Transform
+      pos: -25.76814,52.926956
+      parent: 2
 - proto: FoodBowlBig
   entities:
   - uid: 18516
@@ -146898,6 +146759,11 @@ entities:
       parent: 38436
 - proto: FoodBoxDonut
   entities:
+  - uid: 14763
+    components:
+    - type: Transform
+      pos: 53.313164,23.692083
+      parent: 2
   - uid: 18532
     components:
     - type: Transform
@@ -147186,11 +147052,6 @@ entities:
       rot: 1.0182609457842773E-06 rad
       pos: -70.59498,-40.395683
       parent: 2
-  - uid: 18574
-    components:
-    - type: Transform
-      pos: 53.454067,23.698614
-      parent: 2
   - uid: 18575
     components:
     - type: Transform
@@ -147204,11 +147065,6 @@ entities:
       rot: 1.0182609457842773E-06 rad
       pos: -70.37623,-40.176937
       parent: 2
-  - uid: 18577
-    components:
-    - type: Transform
-      pos: 53.20498,23.627611
-      parent: 2
   - uid: 18578
     components:
     - type: Transform
@@ -147989,6 +147845,41 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,41.5
       parent: 2
+  - uid: 40869
+    components:
+    - type: Transform
+      pos: 15.5,-23.5
+      parent: 2
+  - uid: 40870
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-23.5
+      parent: 2
+  - uid: 40871
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-23.5
+      parent: 2
+  - uid: 40872
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-38.5
+      parent: 2
+  - uid: 40873
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,33.5
+      parent: 2
+  - uid: 40874
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 56.5,33.5
+      parent: 2
 - proto: GasAnalyzer
   entities:
   - uid: 18678
@@ -197983,6 +197874,13 @@ entities:
     - type: Transform
       pos: -25.317003,-43.32779
       parent: 2
+- proto: NewYearTree1
+  entities:
+  - uid: 14762
+    components:
+    - type: Transform
+      pos: -18.51105,41.61822
+      parent: 2
 - proto: NitrogenCanister
   entities:
   - uid: 25364
@@ -212610,23 +212508,247 @@ entities:
       parent: 2
 - proto: PresentRandom
   entities:
+  - uid: 18470
+    components:
+    - type: Transform
+      pos: -16.075489,41.9967
+      parent: 2
+  - uid: 18471
+    components:
+    - type: Transform
+      pos: -20.028614,41.27795
+      parent: 2
+  - uid: 18473
+    components:
+    - type: Transform
+      pos: 14.535491,-60.654198
+      parent: 2
+  - uid: 18474
+    components:
+    - type: Transform
+      pos: 13.519866,-60.57607
+      parent: 2
   - uid: 18484
     components:
     - type: Transform
       pos: -8.4854965,42.061382
       parent: 2
+  - uid: 18574
+    components:
+    - type: Transform
+      pos: 12.551116,-60.622948
+      parent: 2
+  - uid: 27310
+    components:
+    - type: Transform
+      pos: 10.535491,-60.591698
+      parent: 2
+  - uid: 27311
+    components:
+    - type: Transform
+      pos: -19.762989,42.1217
+      parent: 2
+  - uid: 27326
+    components:
+    - type: Transform
+      pos: -17.044239,40.51232
+      parent: 2
+  - uid: 27332
+    components:
+    - type: Transform
+      pos: 11.504241,-60.622948
+      parent: 2
+  - uid: 27384
+    components:
+    - type: Transform
+      pos: -38.475468,12.59826
+      parent: 2
+  - uid: 27385
+    components:
+    - type: Transform
+      pos: -32.553593,12.503068
+      parent: 2
+  - uid: 27386
+    components:
+    - type: Transform
+      pos: -37.56925,8.497067
+      parent: 2
+  - uid: 27387
+    components:
+    - type: Transform
+      pos: -33.256752,8.590818
+      parent: 2
+  - uid: 27388
+    components:
+    - type: Transform
+      pos: -21.451717,14.7462015
+      parent: 2
+  - uid: 27389
+    components:
+    - type: Transform
+      pos: -21.42047,15.199327
+      parent: 2
+  - uid: 27395
+    components:
+    - type: Transform
+      pos: -21.811094,15.464951
+      parent: 2
+  - uid: 27396
+    components:
+    - type: Transform
+      pos: -22.35797,15.543076
+      parent: 2
   - uid: 29919
     components:
     - type: Transform
       pos: -8.4854965,41.295757
       parent: 2
+  - uid: 30211
+    components:
+    - type: Transform
+      pos: -28.461206,9.542411
+      parent: 2
+  - uid: 33536
+    components:
+    - type: Transform
+      pos: -28.461205,9.104911
+      parent: 2
+  - uid: 35210
+    components:
+    - type: Transform
+      pos: -28.44558,8.667411
+      parent: 2
   - uid: 40832
     components:
     - type: Transform
       pos: -8.454246,40.686382
       parent: 2
+  - uid: 40840
+    components:
+    - type: Transform
+      pos: -23.430304,51.302807
+      parent: 2
+  - uid: 40841
+    components:
+    - type: Transform
+      pos: -23.461554,50.771557
+      parent: 2
+  - uid: 40842
+    components:
+    - type: Transform
+      pos: -23.680405,63.471054
+      parent: 2
+  - uid: 40843
+    components:
+    - type: Transform
+      pos: -23.53978,61.502304
+      parent: 2
+- proto: PresentRandomCash
+  entities:
+  - uid: 40845
+    components:
+    - type: Transform
+      pos: 19.549967,47.51631
+      parent: 2
+  - uid: 40846
+    components:
+    - type: Transform
+      pos: 20.612467,49.391315
+      parent: 2
+  - uid: 40847
+    components:
+    - type: Transform
+      pos: 19.331217,51.547565
+      parent: 2
+  - uid: 40848
+    components:
+    - type: Transform
+      pos: 21.565514,45.556572
+      parent: 2
+  - uid: 40849
+    components:
+    - type: Transform
+      pos: 19.393656,41.65101
+      parent: 2
+  - uid: 40850
+    components:
+    - type: Transform
+      pos: 27.513254,41.468697
+      parent: 2
+- proto: PresentRandomInsane
+  entities:
+  - uid: 14768
+    components:
+    - type: Transform
+      pos: -29.51433,-54.459595
+      parent: 2
+  - uid: 27309
+    components:
+    - type: Transform
+      pos: 38.64108,-31.310453
+      parent: 2
+  - uid: 27320
+    components:
+    - type: Transform
+      pos: -0.46705264,1.9184364
+      parent: 2
+  - uid: 27327
+    components:
+    - type: Transform
+      pos: -18.294239,40.23107
+      parent: 2
+  - uid: 40844
+    components:
+    - type: Transform
+      pos: -23.586655,59.58043
+      parent: 2
 - proto: PresentRandomUnsafe
   entities:
+  - uid: 14758
+    components:
+    - type: Transform
+      pos: -31.555674,-13.301076
+      parent: 2
+  - uid: 14759
+    components:
+    - type: Transform
+      pos: -37.412968,16.676386
+      parent: 2
+  - uid: 14760
+    components:
+    - type: Transform
+      pos: -32.493176,-13.316701
+      parent: 2
+  - uid: 14761
+    components:
+    - type: Transform
+      pos: -32.47755,-12.394826
+      parent: 2
+  - uid: 14765
+    components:
+    - type: Transform
+      pos: -19.51299,43.168575
+      parent: 2
+  - uid: 14766
+    components:
+    - type: Transform
+      pos: -18.729631,42.897118
+      parent: 2
+  - uid: 14767
+    components:
+    - type: Transform
+      pos: -17.48174,39.590446
+      parent: 2
+  - uid: 18475
+    components:
+    - type: Transform
+      pos: -19.294239,40.277946
+      parent: 2
+  - uid: 18577
+    components:
+    - type: Transform
+      pos: -19.153614,39.309196
+      parent: 2
   - uid: 19679
     components:
     - type: Transform
@@ -212637,6 +212759,66 @@ entities:
     - type: Transform
       pos: -8.4854965,42.858257
       parent: 2
+  - uid: 27318
+    components:
+    - type: Transform
+      pos: -16.950489,42.52795
+      parent: 2
+  - uid: 27319
+    components:
+    - type: Transform
+      pos: -20.434864,42.34045
+      parent: 2
+  - uid: 27325
+    components:
+    - type: Transform
+      pos: -16.716114,41.043575
+      parent: 2
+  - uid: 27334
+    components:
+    - type: Transform
+      pos: -18.028616,43.402946
+      parent: 2
+  - uid: 27339
+    components:
+    - type: Transform
+      pos: -20.716114,40.434196
+      parent: 2
+  - uid: 27365
+    components:
+    - type: Transform
+      pos: -31.47755,-12.410451
+      parent: 2
+  - uid: 27367
+    components:
+    - type: Transform
+      pos: -33.569218,16.645136
+      parent: 2
+  - uid: 40836
+    components:
+    - type: Transform
+      pos: -28.39877,15.065372
+      parent: 2
+  - uid: 40837
+    components:
+    - type: Transform
+      pos: -27.492609,20.036764
+      parent: 2
+  - uid: 40838
+    components:
+    - type: Transform
+      pos: -31.133675,36.619812
+      parent: 2
+  - uid: 40839
+    components:
+    - type: Transform
+      pos: -34.222984,47.612747
+      parent: 2
+  - uid: 40851
+    components:
+    - type: Transform
+      pos: 29.542871,41.427986
+      parent: 2
 - proto: PrinterDoc
   entities:
   - uid: 27087
@@ -213932,24 +214114,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,27.5
       parent: 2
-  - uid: 27309
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,40.5
-      parent: 2
-  - uid: 27310
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,41.5
-      parent: 2
-  - uid: 27311
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,38.5
-      parent: 2
   - uid: 27312
     components:
     - type: Transform
@@ -213984,22 +214148,6 @@ entities:
     - type: Transform
       pos: -15.5,35.5
       parent: 2
-  - uid: 27318
-    components:
-    - type: Transform
-      pos: -19.5,44.5
-      parent: 2
-  - uid: 27319
-    components:
-    - type: Transform
-      pos: -17.5,44.5
-      parent: 2
-  - uid: 27320
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -15.5,42.5
-      parent: 2
   - uid: 27321
     components:
     - type: Transform
@@ -214024,24 +214172,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -15.5,29.5
       parent: 2
-  - uid: 27325
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,40.5
-      parent: 2
-  - uid: 27326
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,41.5
-      parent: 2
-  - uid: 27327
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,38.5
-      parent: 2
   - uid: 27328
     components:
     - type: Transform
@@ -214066,24 +214196,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 30.5,0.5
       parent: 2
-  - uid: 27332
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -21.5,42.5
-      parent: 2
   - uid: 27333
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -31.5,40.5
       parent: 2
-  - uid: 27334
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,38.5
-      parent: 2
   - uid: 27335
     components:
     - type: Transform
@@ -214108,11 +214226,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,27.5
       parent: 2
-  - uid: 27339
-    components:
-    - type: Transform
-      pos: -18.5,44.5
-      parent: 2
   - uid: 27340
     components:
     - type: Transform
@@ -214366,34 +214479,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 35.5,44.5
       parent: 2
-  - uid: 27365
-    components:
-    - type: Transform
-      pos: -20.5,43.5
-      parent: 2
   - uid: 27366
     components:
     - type: Transform
       pos: -14.5,32.5
       parent: 2
-  - uid: 27367
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -16.5,43.5
-      parent: 2
-  - uid: 27368
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,39.5
-      parent: 2
-  - uid: 27369
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,39.5
-      parent: 2
   - uid: 27370
     components:
     - type: Transform
@@ -214489,40 +214579,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 62.5,-16.5
       parent: 2
-  - uid: 27384
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -20.5,44.5
-      parent: 2
-  - uid: 27385
-    components:
-    - type: Transform
-      pos: -16.5,38.5
-      parent: 2
-  - uid: 27386
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -16.5,44.5
-      parent: 2
-  - uid: 27387
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -15.5,43.5
-      parent: 2
-  - uid: 27388
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -21.5,43.5
-      parent: 2
-  - uid: 27389
-    components:
-    - type: Transform
-      pos: -15.5,39.5
-      parent: 2
   - uid: 27390
     components:
     - type: Transform
@@ -214553,18 +214609,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -17.5,35.5
       parent: 2
-  - uid: 27395
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,38.5
-      parent: 2
-  - uid: 27396
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -21.5,39.5
-      parent: 2
   - uid: 27397
     components:
     - type: Transform
@@ -223376,6 +223420,76 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ShellShotgun
+  entities:
+  - uid: 40884
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.507164,-22.323608
+      parent: 2
+  - uid: 40885
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.600914,-22.448608
+      parent: 2
+  - uid: 40886
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.55404,-22.417358
+      parent: 2
+  - uid: 40887
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.55404,-22.417358
+      parent: 2
+  - uid: 40888
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.600914,-22.339233
+      parent: 2
+  - uid: 40889
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.600914,-22.620483
+      parent: 2
+- proto: ShellTranquilizer
+  entities:
+  - uid: 27368
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.46029,-22.261108
+      parent: 2
+  - uid: 40878
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.538414,-22.401733
+      parent: 2
+  - uid: 40881
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.632164,-22.542358
+      parent: 2
+  - uid: 40882
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.507164,-22.354858
+      parent: 2
+  - uid: 40883
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.600914,-22.432983
+      parent: 2
 - proto: Shovel
   entities:
   - uid: 28992
@@ -226884,6 +226998,50 @@ entities:
     - type: Transform
       pos: 1.5,20.5
       parent: 2
+- proto: SignNewYear
+  entities:
+  - uid: 40862
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,49.5
+      parent: 2
+  - uid: 40863
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,49.5
+      parent: 2
+  - uid: 40864
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -20.5,19.5
+      parent: 2
+  - uid: 40865
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,19.5
+      parent: 2
+  - uid: 40866
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,3.5
+      parent: 2
+  - uid: 40867
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 2
+  - uid: 40868
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 2
 - proto: SignNosmoking
   entities:
   - uid: 29461
@@ -231494,14 +231652,6 @@ entities:
     - type: Transform
       pos: -11.5,62.5
       parent: 2
-- proto: StatueVenusRed
-  entities:
-  - uid: 30211
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,41.5
-      parent: 2
 - proto: SteelBench
   entities:
   - uid: 30213
@@ -232902,6 +233052,22 @@ entities:
       id: Энергетический запас спутника ИИ
 - proto: SurveillanceCameraEngineering
   entities:
+  - uid: 13896
+    components:
+    - type: Transform
+      pos: -72.5,-3.5
+      parent: 2
+  - uid: 14098
+    components:
+    - type: Transform
+      pos: -69.5,-12.5
+      parent: 2
+  - uid: 14100
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -82.5,-5.5
+      parent: 2
   - uid: 30396
     components:
     - type: Transform
@@ -233095,8 +233261,44 @@ entities:
       - SurveillanceCameraEngineering
       nameSet: True
       id: Комната питания суперматерии
+  - uid: 40861
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -45.5,54.5
+      parent: 2
 - proto: SurveillanceCameraGeneral
   entities:
+  - uid: 14080
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,58.5
+      parent: 2
+  - uid: 14097
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -42.5,4.5
+      parent: 2
+  - uid: 14101
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -38.5,-8.5
+      parent: 2
+  - uid: 14108
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-18.5
+      parent: 2
+  - uid: 14764
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -30.5,83.5
+      parent: 2
   - uid: 30414
     components:
     - type: Transform
@@ -233546,6 +233748,18 @@ entities:
       - SurveillanceCameraGeneral
       nameSet: True
       id: Коридор (восток)
+  - uid: 40852
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,85.5
+      parent: 2
+  - uid: 40860
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -7.5,50.5
+      parent: 2
 - proto: SurveillanceCameraMedical
   entities:
   - uid: 30459
@@ -233735,6 +233949,12 @@ entities:
       id: Перекрёсток медбея
     - type: Construction
       defaultTarget: start
+  - uid: 40859
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-26.5
+      parent: 2
 - proto: SurveillanceCameraRouterCommand
   entities:
   - uid: 30476
@@ -234181,6 +234401,24 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Стрельбище
+  - uid: 40856
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 68.5,26.5
+      parent: 2
+  - uid: 40857
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 84.5,14.5
+      parent: 2
+  - uid: 40858
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 60.5,1.5
+      parent: 2
 - proto: SurveillanceCameraService
   entities:
   - uid: 30521
@@ -234410,6 +234648,24 @@ entities:
       - SurveillanceCameraSupply
       nameSet: True
       id: Отдел снабжения
+  - uid: 40853
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,52.5
+      parent: 2
+  - uid: 40854
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,34.5
+      parent: 2
+  - uid: 40855
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,32.5
+      parent: 2
 - proto: SurveillanceCameraWirelessRouterConstructed
   entities:
   - uid: 30542
@@ -241166,6 +241422,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-9.5
       parent: 38436
+- proto: TomDrumsInstrument
+  entities:
+  - uid: 40877
+    components:
+    - type: Transform
+      pos: -9.5,31.5
+      parent: 2
 - proto: ToolboxArtistic
   entities:
   - uid: 25347
@@ -251847,11 +252110,6 @@ entities:
     - type: Transform
       pos: -64.5,-3.5
       parent: 2
-  - uid: 33536
-    components:
-    - type: Transform
-      pos: -78.5,-22.5
-      parent: 2
   - uid: 33537
     components:
     - type: Transform
@@ -261899,11 +262157,6 @@ entities:
     - type: Transform
       pos: -82.5,-22.5
       parent: 2
-  - uid: 35210
-    components:
-    - type: Transform
-      pos: -79.5,-22.5
-      parent: 2
   - uid: 35211
     components:
     - type: Transform
@@ -278019,6 +278272,12 @@ entities:
     - type: Transform
       pos: -36.5,-74.5
       parent: 2
+  - uid: 40890
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -78.5,-22.5
+      parent: 2
 - proto: WallWeaponCapacitorRecharger
   entities:
   - uid: 38432
@@ -279914,6 +280173,12 @@ entities:
       parent: 2
 - proto: WeaponShotgunDoubleBarreled
   entities:
+  - uid: 27369
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -79.86654,-22.47986
+      parent: 2
   - uid: 37734
     components:
     - type: Transform