bagel christmas update (#22032)

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index eedbb4195d4c2f9b15a554f3669cc5cadfb42aad..a21b95889105ccd83b6271cd0486887c5f99817d 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -2074,6 +2074,24 @@ entities:
             1395: -20,-7\r
             1396: -19,-7\r
             1397: -19,-8\r
+        - node:\r
+            color: '#5E7C167F'\r
+            id: CheckerNESW\r
+          decals:\r
+            3807: 10,-29\r
+            3808: 10,-28\r
+            3809: 10,-27\r
+            3810: 11,-27\r
+            3811: 12,-27\r
+            3812: 13,-27\r
+            3813: 14,-27\r
+            3814: 16,-27\r
+            3815: 15,-27\r
+            3816: 17,-27\r
+            3817: 18,-27\r
+            3818: 19,-27\r
+            3819: 20,-27\r
+            3820: 21,-27\r
         - node:\r
             color: '#D4D4D428'\r
             id: CheckerNESW\r
@@ -2094,8 +2112,6 @@ entities:
             color: '#D4D4D46C'\r
             id: CheckerNESW\r
           decals:\r
-            1335: 23,-37\r
-            1336: 23,-38\r
             1337: 24,-38\r
             1338: 24,-37\r
             1339: 25,-37\r
@@ -2131,13 +2147,15 @@ entities:
             color: '#D4D4D496'\r
             id: CheckerNESW\r
           decals:\r
-            3653: 23,-39\r
             3654: 24,-39\r
             3655: 25,-39\r
             3656: 26,-39\r
             3657: 27,-39\r
             3658: 26,-35\r
             3659: 25,-35\r
+            3824: 23,-38\r
+            3825: 23,-37\r
+            3826: 23,-39\r
         - node:\r
             color: '#334E6DC8'\r
             id: CheckerNWSE\r
@@ -2760,7 +2778,6 @@ entities:
             75: 13,-28\r
             76: 16,-38\r
             77: 21,-38\r
-            78: 23,-38\r
             79: 37,-22\r
             80: 44,-37\r
             81: 44,-38\r
@@ -6085,7 +6102,7 @@ entities:
             id: WoodTrimThinInnerSe\r
           decals:\r
             1233: -12,19\r
-            1328: 10,-27\r
+            3838: 10,-27\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinInnerSw\r
@@ -6118,8 +6135,6 @@ entities:
             1230: -12,16\r
             1231: -12,17\r
             1232: -12,18\r
-            1326: 10,-29\r
-            1327: 10,-28\r
             2096: -24,-27\r
             2121: -46,-16\r
             2399: 24,-21\r
@@ -6129,6 +6144,8 @@ entities:
             2403: 24,-17\r
             2404: 24,-16\r
             3738: -12,-52\r
+            3839: 10,-29\r
+            3840: 10,-28\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinLineN\r
@@ -6189,17 +6206,6 @@ entities:
             1235: -10,19\r
             1236: -9,19\r
             1237: -8,19\r
-            1315: 21,-27\r
-            1316: 20,-27\r
-            1317: 19,-27\r
-            1318: 18,-27\r
-            1319: 17,-27\r
-            1320: 16,-27\r
-            1321: 14,-27\r
-            1322: 15,-27\r
-            1323: 13,-27\r
-            1324: 12,-27\r
-            1325: 11,-27\r
             2088: -20,2\r
             2089: -21,2\r
             2090: -22,2\r
@@ -6212,6 +6218,17 @@ entities:
             3320: -27,22\r
             3805: 13,20\r
             3806: 12,20\r
+            3827: 21,-27\r
+            3828: 20,-27\r
+            3829: 19,-27\r
+            3830: 18,-27\r
+            3831: 17,-27\r
+            3832: 16,-27\r
+            3833: 15,-27\r
+            3834: 14,-27\r
+            3835: 13,-27\r
+            3836: 12,-27\r
+            3837: 11,-27\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: WoodTrimThinLineW\r
@@ -47229,6 +47246,22 @@ entities:
       pos: 11.5,-73.5\r
       parent: 60\r
       type: Transform\r
+- proto: CandleGreenSmallInfinite\r
+  entities:\r
+  - uid: 21598\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 19.558498,-32.618916\r
+      parent: 60\r
+      type: Transform\r
+- proto: CandleRedSmallInfinite\r
+  entities:\r
+  - uid: 2231\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 19.433498,-32.462666\r
+      parent: 60\r
+      type: Transform\r
 - proto: CandyBowl\r
   entities:\r
   - uid: 15506\r
@@ -47285,6 +47318,11 @@ entities:
     - pos: -20.5,1.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 4259\r
+    components:\r
+    - pos: 21.5,-29.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 4276\r
     components:\r
     - pos: -45.5,-17.5\r
@@ -47310,11 +47348,26 @@ entities:
     - pos: -21.5,0.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 7197\r
+    components:\r
+    - pos: 20.5,-29.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 7293\r
     components:\r
     - pos: -26.5,-29.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 7490\r
+    components:\r
+    - pos: 21.5,-28.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 7493\r
+    components:\r
+    - pos: 20.5,-28.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 10823\r
     components:\r
     - pos: 3.5,-3.5\r
@@ -47462,51 +47515,34 @@ entities:
     - pos: -31.5,19.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 24171\r
-    components:\r
-    - pos: -26.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 24172\r
-    components:\r
-    - pos: -25.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 24173\r
-    components:\r
-    - pos: -25.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
-- proto: CarpetBlack\r
-  entities:\r
-  - uid: 23699\r
+  - uid: 21604\r
     components:\r
-    - pos: 18.5,-34.5\r
+    - pos: 19.5,-28.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 23705\r
+  - uid: 21605\r
     components:\r
-    - pos: 18.5,-33.5\r
+    - pos: 19.5,-29.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 23706\r
+  - uid: 23673\r
     components:\r
-    - pos: 18.5,-32.5\r
+    - pos: 2.5,-57.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 23707\r
+  - uid: 24171\r
     components:\r
-    - pos: 19.5,-32.5\r
+    - pos: -26.5,-28.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 23708\r
+  - uid: 24172\r
     components:\r
-    - pos: 19.5,-33.5\r
+    - pos: -25.5,-29.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 23709\r
+  - uid: 24173\r
     components:\r
-    - pos: 19.5,-34.5\r
+    - pos: -25.5,-28.5\r
       parent: 60\r
       type: Transform\r
 - proto: CarpetBlue\r
@@ -48272,51 +48308,6 @@ entities:
     - pos: 48.5,-44.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 21598\r
-    components:\r
-    - pos: 18.5,-30.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 21599\r
-    components:\r
-    - pos: 18.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23670\r
-    components:\r
-    - pos: 18.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23672\r
-    components:\r
-    - pos: 19.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23673\r
-    components:\r
-    - pos: 19.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23674\r
-    components:\r
-    - pos: 19.5,-30.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23675\r
-    components:\r
-    - pos: 20.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23676\r
-    components:\r
-    - pos: 20.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 23688\r
-    components:\r
-    - pos: 20.5,-30.5\r
-      parent: 60\r
-      type: Transform\r
 - proto: CarpetSBlue\r
   entities:\r
   - uid: 214\r
@@ -55556,17 +55547,6 @@ entities:
     - pos: 16.5,-37.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 1333\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 19.5,-30.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 1449\r
-    components:\r
-    - pos: 18.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 2847\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -55581,8 +55561,8 @@ entities:
       type: Transform\r
   - uid: 3559\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 20.5,-30.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 18.5,-31.5\r
       parent: 60\r
       type: Transform\r
   - uid: 3738\r
@@ -55617,7 +55597,8 @@ entities:
       type: Transform\r
   - uid: 4260\r
     components:\r
-    - pos: 19.5,-32.5\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 20.5,-31.5\r
       parent: 60\r
       type: Transform\r
   - uid: 5636\r
@@ -55686,20 +55667,10 @@ entities:
       pos: 23.5,-18.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 7196\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 18.5,-30.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 7197\r
-    components:\r
-    - pos: 20.5,-28.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 7492\r
+  - uid: 7494\r
     components:\r
-    - pos: 19.5,-28.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 18.5,-32.5\r
       parent: 60\r
       type: Transform\r
   - uid: 7633\r
@@ -55884,21 +55855,22 @@ entities:
       pos: 17.5,-38.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 21603\r
+  - uid: 18095\r
     components:\r
-    - pos: 18.5,-32.5\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 20.5,-33.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 21604\r
+  - uid: 23699\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 19.5,-34.5\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 18.5,-33.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 21605\r
+  - uid: 23705\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 18.5,-34.5\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 20.5,-32.5\r
       parent: 60\r
       type: Transform\r
 - proto: CheapRollerBed\r
@@ -59183,6 +59155,48 @@ entities:
     - pos: 22.509872,-51.419544\r
       parent: 60\r
       type: Transform\r
+- proto: ClothingOuterSanta\r
+  entities:\r
+  - uid: 1333\r
+    components:\r
+    - pos: -32.503136,-18.457027\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 1449\r
+    components:\r
+    - pos: -32.48751,-17.535152\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21599\r
+    components:\r
+    - pos: -32.48751,-17.535152\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23670\r
+    components:\r
+    - pos: -32.503136,-18.457027\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23672\r
+    components:\r
+    - pos: -32.48751,-17.535152\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23675\r
+    components:\r
+    - pos: -32.48751,-17.535152\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23688\r
+    components:\r
+    - pos: -32.503136,-18.457027\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23706\r
+    components:\r
+    - pos: -32.503136,-18.457027\r
+      parent: 60\r
+      type: Transform\r
 - proto: ClothingOuterSkub\r
   entities:\r
   - uid: 6793\r
@@ -61554,6 +61568,11 @@ entities:
     - pos: -16.5,-29.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 23674\r
+    components:\r
+    - pos: 2.5,-56.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: DefibrillatorCabinetFilled\r
   entities:\r
   - uid: 4626\r
@@ -71088,6 +71107,13 @@ entities:
     - pos: -65.522354,23.506481\r
       parent: 60\r
       type: Transform\r
+- proto: FloraTreeChristmas02\r
+  entities:\r
+  - uid: 7492\r
+    components:\r
+    - pos: 20.568558,-29.361916\r
+      parent: 60\r
+      type: Transform\r
 - proto: FoodApple\r
   entities:\r
   - uid: 7496\r
@@ -115026,6 +115052,18 @@ entities:
       type: Transform\r
     - powerLoad: 0\r
       type: ApcPowerReceiver\r
+- proto: PresentRandom\r
+  entities:\r
+  - uid: 21607\r
+    components:\r
+    - pos: 19.39456,-29.163122\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 23676\r
+    components:\r
+    - pos: 19.753935,-29.506872\r
+      parent: 60\r
+      type: Transform\r
 - proto: Protolathe\r
   entities:\r
   - uid: 7081\r
@@ -127685,14 +127723,14 @@ entities:
       type: Transform\r
 - proto: SpawnPointServiceWorker\r
   entities:\r
-  - uid: 18095\r
+  - uid: 7196\r
     components:\r
-    - pos: 19.5,-34.5\r
+    - pos: 18.5,-38.5\r
       parent: 60\r
       type: Transform\r
   - uid: 21077\r
     components:\r
-    - pos: 18.5,-32.5\r
+    - pos: 20.5,-37.5\r
       parent: 60\r
       type: Transform\r
 - proto: SpawnPointStationEngineer\r
@@ -128089,12 +128127,6 @@ entities:
       pos: 16.5,-35.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2228\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 21.5,-32.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 2229\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -128107,12 +128139,6 @@ entities:
       pos: 16.5,-34.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 2231\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 21.5,-33.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 3104\r
     components:\r
     - pos: 14.5,-28.5\r
@@ -128165,12 +128191,6 @@ entities:
       pos: -11.5,-53.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 7491\r
-    components:\r
-    - rot: 1.5707963267948966 rad\r
-      pos: 21.5,-31.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 16674\r
     components:\r
     - pos: 36.5,18.5\r
@@ -131337,6 +131357,18 @@ entities:
     - pos: 23.5,-40.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 2228\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 19.5,-32.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 7491\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 19.5,-33.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 13562\r
     components:\r
     - pos: 19.5,-38.5\r
@@ -131372,6 +131404,12 @@ entities:
     - pos: 16.5,-38.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 21603\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 19.5,-31.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: TableGlass\r
   entities:\r
   - uid: 123\r
@@ -132298,11 +132336,6 @@ entities:
     - pos: -46.5,-17.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 4259\r
-    components:\r
-    - pos: 18.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 4262\r
     components:\r
     - pos: -48.5,-18.5\r
@@ -132383,21 +132416,6 @@ entities:
     - pos: 23.5,-13.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 7490\r
-    components:\r
-    - pos: 19.5,-33.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 7493\r
-    components:\r
-    - pos: 20.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
-  - uid: 7494\r
-    components:\r
-    - pos: 19.5,-29.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 7698\r
     components:\r
     - pos: -11.5,-28.5\r
@@ -132637,11 +132655,6 @@ entities:
     - pos: 53.5,-38.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 21607\r
-    components:\r
-    - pos: 18.5,-33.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 24119\r
     components:\r
     - pos: 26.5,-20.5\r