diff --git a/Resources/Maps/corvax_ishimura.yml b/Resources/Maps/corvax_ishimura.yml
index ff42867edd7..70cd0996d7e 100644
--- a/Resources/Maps/corvax_ishimura.yml
+++ b/Resources/Maps/corvax_ishimura.yml
@@ -544,18 +544,32 @@ entities:
             color: '#52B4E996'
             id: BotGreyscale
           decals:
+<<<<<<< Updated upstream
             2989: 31,19
             2990: 33,19
             2991: 32,19
             3362: 34,19
+=======
+            2984: 31,19
+            2985: 33,19
+            2986: 32,19
+            3343: 34,19
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: BotGreyscale
           decals:
+<<<<<<< Updated upstream
             3314: 11,16
             3315: 11,16
             3316: 10,16
             3317: 10,16
+=======
+            3295: 11,16
+            3296: 11,16
+            3297: 10,16
+            3298: 10,16
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BotGreyscale
@@ -633,6 +647,7 @@ entities:
             color: '#52B4E996'
             id: BoxGreyscale
           decals:
+<<<<<<< Updated upstream
             3077: 6,12
             3078: 6,13
             3079: 7,13
@@ -643,13 +658,31 @@ entities:
             3084: 9,12
             3085: 10,12
             3086: 10,13
+=======
+            3072: 6,12
+            3073: 6,13
+            3074: 7,13
+            3075: 8,12
+            3076: 7,12
+            3077: 8,13
+            3078: 9,13
+            3079: 9,12
+            3080: 10,12
+            3081: 10,13
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: BoxGreyscale
           decals:
+<<<<<<< Updated upstream
             3295: 9,18
             3296: 10,18
             3297: 11,18
+=======
+            3276: 9,18
+            3277: 10,18
+            3278: 11,18
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BoxGreyscale
@@ -679,9 +712,15 @@ entities:
             color: '#52B4E99E'
             id: BrickTileDarkCornerNe
           decals:
+<<<<<<< Updated upstream
             3280: -11,14
             3281: -11,14
             3282: -11,14
+=======
+            3261: -11,14
+            3262: -11,14
+            3263: -11,14
+>>>>>>> Stashed changes
         - node:
             color: '#D381C9FF'
             id: BrickTileDarkCornerNe
@@ -699,9 +738,15 @@ entities:
             color: '#52B4E99E'
             id: BrickTileDarkCornerNw
           decals:
+<<<<<<< Updated upstream
             3277: -12,14
             3278: -12,14
             3279: -12,14
+=======
+            3258: -12,14
+            3259: -12,14
+            3260: -12,14
+>>>>>>> Stashed changes
         - node:
             color: '#D381C9FF'
             id: BrickTileDarkCornerNw
@@ -719,9 +764,15 @@ entities:
             color: '#52B4E99E'
             id: BrickTileDarkCornerSe
           decals:
+<<<<<<< Updated upstream
             3286: -11,12
             3287: -11,12
             3288: -11,12
+=======
+            3267: -11,12
+            3268: -11,12
+            3269: -11,12
+>>>>>>> Stashed changes
         - node:
             color: '#D381C9FF'
             id: BrickTileDarkCornerSe
@@ -739,9 +790,15 @@ entities:
             color: '#52B4E99E'
             id: BrickTileDarkCornerSw
           decals:
+<<<<<<< Updated upstream
             3283: -12,12
             3284: -12,12
             3285: -12,12
+=======
+            3264: -12,12
+            3265: -12,12
+            3266: -12,12
+>>>>>>> Stashed changes
         - node:
             color: '#D381C9FF'
             id: BrickTileDarkCornerSw
@@ -764,9 +821,15 @@ entities:
             color: '#52B4E99E'
             id: BrickTileDarkLineE
           decals:
+<<<<<<< Updated upstream
             3289: -11,13
             3290: -11,13
             3291: -11,13
+=======
+            3270: -11,13
+            3271: -11,13
+            3272: -11,13
+>>>>>>> Stashed changes
         - node:
             color: '#D381C9FF'
             id: BrickTileDarkLineE
@@ -813,6 +876,7 @@ entities:
             color: '#52B4E99E'
             id: BrickTileDarkLineN
           decals:
+<<<<<<< Updated upstream
             3306: 11,17
             3307: 11,17
             3308: 10,17
@@ -821,6 +885,16 @@ entities:
             3311: 9,17
             3312: 8,17
             3313: 8,17
+=======
+            3287: 11,17
+            3288: 11,17
+            3289: 10,17
+            3290: 10,17
+            3291: 9,17
+            3292: 9,17
+            3293: 8,17
+            3294: 8,17
+>>>>>>> Stashed changes
         - node:
             color: '#D381C9FF'
             id: BrickTileDarkLineN
@@ -892,6 +966,7 @@ entities:
             color: '#52B4E99E'
             id: BrickTileDarkLineW
           decals:
+<<<<<<< Updated upstream
             3292: -12,13
             3293: -12,13
             3294: -12,13
@@ -903,6 +978,19 @@ entities:
             3303: 7,18
             3304: 8,18
             3305: 8,18
+=======
+            3273: -12,13
+            3274: -12,13
+            3275: -12,13
+            3279: 7,16
+            3280: 7,16
+            3281: 7,17
+            3282: 7,17
+            3283: 7,18
+            3284: 7,18
+            3285: 8,18
+            3286: 8,18
+>>>>>>> Stashed changes
         - node:
             color: '#D381C9FF'
             id: BrickTileDarkLineW
@@ -955,41 +1043,70 @@ entities:
             color: '#52B4E996'
             id: BrickTileSteelCornerNe
           decals:
+<<<<<<< Updated upstream
             3018: 28,20
+=======
+            3013: 28,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: BrickTileSteelCornerNw
           decals:
+<<<<<<< Updated upstream
             3019: 24,20
+=======
+            3014: 24,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: BrickTileSteelCornerSw
           decals:
+<<<<<<< Updated upstream
             3017: 24,11
+=======
+            3012: 24,11
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: BrickTileSteelInnerNe
           decals:
+<<<<<<< Updated upstream
             3240: -14,6
+=======
+            3221: -14,6
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: BrickTileSteelInnerNw
           decals:
+<<<<<<< Updated upstream
             3241: -11,6
+=======
+            3222: -11,6
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: BrickTileSteelInnerSe
           decals:
+<<<<<<< Updated upstream
             3238: -14,9
+=======
+            3219: -14,9
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: BrickTileSteelInnerSw
           decals:
+<<<<<<< Updated upstream
             3239: -11,9
+=======
+            3220: -11,9
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: BrickTileSteelLineE
           decals:
+<<<<<<< Updated upstream
             3002: 28,12
             3003: 28,13
             3004: 28,14
@@ -998,16 +1115,32 @@ entities:
             3007: 28,17
             3008: 28,18
             3009: 28,19
+=======
+            2997: 28,12
+            2998: 28,13
+            2999: 28,14
+            3000: 28,15
+            3001: 28,16
+            3002: 28,17
+            3003: 28,18
+            3004: 28,19
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: BrickTileSteelLineE
           decals:
+<<<<<<< Updated upstream
             3244: -11,7
             3245: -11,8
+=======
+            3225: -11,7
+            3226: -11,8
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: BrickTileSteelLineN
           decals:
+<<<<<<< Updated upstream
             3010: 25,20
             3011: 26,20
             3012: 27,20
@@ -1017,20 +1150,41 @@ entities:
             3130: 3,12
             3131: -1,12
             3132: -2,12
+=======
+            3005: 25,20
+            3006: 26,20
+            3007: 27,20
+            3116: 0,12
+            3117: 1,12
+            3124: 2,12
+            3125: 3,12
+            3126: -1,12
+            3127: -2,12
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: BrickTileSteelLineS
           decals:
+<<<<<<< Updated upstream
             3123: 0,12
             3124: 1,12
             3133: -2,12
             3134: -1,12
             3135: 2,12
             3136: 3,12
+=======
+            3118: 0,12
+            3119: 1,12
+            3128: -2,12
+            3129: -1,12
+            3130: 2,12
+            3131: 3,12
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: BrickTileSteelLineW
           decals:
+<<<<<<< Updated upstream
             2994: 24,19
             2995: 24,18
             2996: 24,17
@@ -1039,12 +1193,27 @@ entities:
             2999: 24,14
             3000: 24,13
             3001: 24,12
+=======
+            2989: 24,19
+            2990: 24,18
+            2991: 24,17
+            2992: 24,16
+            2993: 24,15
+            2994: 24,14
+            2995: 24,13
+            2996: 24,12
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: BrickTileSteelLineW
           decals:
+<<<<<<< Updated upstream
             3242: -14,8
             3243: -14,7
+=======
+            3223: -14,8
+            3224: -14,7
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             zIndex: 431
@@ -1056,12 +1225,20 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNe
           decals:
+<<<<<<< Updated upstream
             3489: 21,23
+=======
+            3469: 21,23
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: BrickTileWhiteCornerNe
           decals:
+<<<<<<< Updated upstream
             3815: -0.5136709,8.494518
+=======
+            3711: -0.5136709,8.494518
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BrickTileWhiteCornerNe
@@ -1102,12 +1279,20 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNw
           decals:
+<<<<<<< Updated upstream
             3488: 16,23
+=======
+            3468: 16,23
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9D8'
             id: BrickTileWhiteCornerNw
           decals:
+<<<<<<< Updated upstream
             3523: -3.5071917,8.508477
+=======
+            3491: -3.5071917,8.508477
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BrickTileWhiteCornerNw
@@ -1149,13 +1334,22 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSe
           decals:
+<<<<<<< Updated upstream
             3016: 28,11
             3490: 21,21
+=======
+            3011: 28,11
+            3470: 21,21
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: BrickTileWhiteCornerSe
           decals:
+<<<<<<< Updated upstream
             3691: -0.51731133,5.4969463
+=======
+            3611: -0.51731133,5.4969463
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BrickTileWhiteCornerSe
@@ -1197,12 +1391,20 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSw
           decals:
+<<<<<<< Updated upstream
             3491: 16,21
+=======
+            3471: 16,21
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: BrickTileWhiteCornerSw
           decals:
+<<<<<<< Updated upstream
             3694: -3.5224001,5.4813213
+=======
+            3614: -3.5224001,5.4813213
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BrickTileWhiteCornerSw
@@ -1234,7 +1436,11 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteInnerNe
           decals:
+<<<<<<< Updated upstream
             2986: 30,18
+=======
+            2981: 30,18
+>>>>>>> Stashed changes
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerNe
@@ -1244,7 +1450,11 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSe
           decals:
+<<<<<<< Updated upstream
             2987: 30,20
+=======
+            2982: 30,20
+>>>>>>> Stashed changes
         - node:
             color: '#D381C996'
             id: BrickTileWhiteInnerSe
@@ -1264,17 +1474,30 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
           decals:
+<<<<<<< Updated upstream
             2988: 30,19
             3097: 5,12
             3098: 5,13
             3215: -7,9
             3500: 21,22
+=======
+            2983: 30,19
+            3092: 5,12
+            3093: 5,13
+            3203: -7,9
+            3480: 21,22
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: BrickTileWhiteLineE
           decals:
+<<<<<<< Updated upstream
             3796: -0.51358485,6.518468
             3797: -0.51358485,7.502843
+=======
+            3705: -0.51358485,6.518468
+            3706: -0.51358485,7.502843
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BrickTileWhiteLineE
@@ -1372,6 +1595,7 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineN
           decals:
+<<<<<<< Updated upstream
             2983: 31,18
             2984: 32,18
             2985: 33,18
@@ -1390,12 +1614,37 @@ entities:
             3493: 18,23
             3494: 19,23
             3495: 20,23
+=======
+            2978: 31,18
+            2979: 32,18
+            2980: 33,18
+            3096: 6,11
+            3097: 7,11
+            3098: 8,11
+            3099: 9,11
+            3100: 10,11
+            3112: -1,11
+            3113: 0,11
+            3114: 1,11
+            3115: 2,11
+            3132: -2,11
+            3133: 3,11
+            3472: 17,23
+            3473: 18,23
+            3474: 19,23
+            3475: 20,23
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: BrickTileWhiteLineN
           decals:
+<<<<<<< Updated upstream
             3816: -1.5030482,8.494518
             3817: -2.5030482,8.494518
+=======
+            3712: -1.5030482,8.494518
+            3713: -2.5030482,8.494518
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BrickTileWhiteLineN
@@ -1475,6 +1724,7 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineS
           decals:
+<<<<<<< Updated upstream
             2980: 31,20
             2981: 32,20
             2982: 33,20
@@ -1496,11 +1746,38 @@ entities:
             3497: 18,21
             3498: 19,21
             3499: 20,21
+=======
+            2975: 31,20
+            2976: 32,20
+            2977: 33,20
+            3008: 25,11
+            3009: 26,11
+            3010: 27,11
+            3101: 6,14
+            3102: 7,14
+            3103: 8,14
+            3104: 9,14
+            3105: 10,14
+            3108: -1,13
+            3109: 0,13
+            3110: 1,13
+            3111: 2,13
+            3134: -2,13
+            3135: 3,13
+            3476: 17,21
+            3477: 18,21
+            3478: 19,21
+            3479: 20,21
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: BrickTileWhiteLineS
           decals:
+<<<<<<< Updated upstream
             3698: -1.5075154,5.4969463
+=======
+            3615: -1.5075154,5.4969463
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BrickTileWhiteLineS
@@ -1576,17 +1853,30 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
           decals:
+<<<<<<< Updated upstream
             3099: 11,12
             3100: 11,13
             3216: -7,9
             3218: -8,11
             3501: 16,22
+=======
+            3094: 11,12
+            3095: 11,13
+            3204: -7,9
+            3206: -8,11
+            3481: 16,22
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9D8'
             id: BrickTileWhiteLineW
           decals:
+<<<<<<< Updated upstream
             3529: -3.5228167,7.508477
             3530: -3.5228167,6.492852
+=======
+            3492: -3.5228167,7.508477
+            3493: -3.5228167,6.492852
+>>>>>>> Stashed changes
         - node:
             color: '#BD3CABFF'
             id: BrickTileWhiteLineW
@@ -1689,12 +1979,21 @@ entities:
             color: '#EFB34196'
             id: CheckerNWSE
           decals:
+<<<<<<< Updated upstream
             3789: 2,8
             3790: 2,7
             3791: 2,6
             3792: 3,6
             3793: 3,7
             3794: 3,8
+=======
+            3699: 2,8
+            3700: 2,7
+            3701: 2,6
+            3702: 3,6
+            3703: 3,7
+            3704: 3,8
+>>>>>>> Stashed changes
         - node:
             color: '#FF0000FF'
             id: Delivery
@@ -1757,6 +2056,7 @@ entities:
             color: '#52B4E99E'
             id: DeliveryGreyscale
           decals:
+<<<<<<< Updated upstream
             3275: -13,15
             3276: -12,15
             3331: 22,34
@@ -1766,15 +2066,34 @@ entities:
             3335: 25,30
             3336: 23,30
             3337: 23,29
+=======
+            3256: -13,15
+            3257: -12,15
+            3312: 22,34
+            3313: 22,37
+            3314: 23,43
+            3315: 25,29
+            3316: 25,30
+            3317: 23,30
+            3318: 23,29
+>>>>>>> Stashed changes
         - node:
             color: '#F9801DFF'
             id: DeliveryGreyscale
           decals:
+<<<<<<< Updated upstream
             3658: 1,7
             3659: 2,9
             3660: 3,9
             3661: 2,5
             3662: 3,5
+=======
+            3584: 1,7
+            3585: 2,9
+            3586: 3,9
+            3587: 2,5
+            3588: 3,5
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: DeliveryGreyscale
@@ -1788,6 +2107,7 @@ entities:
             color: '#2D72307C'
             id: DiagonalCheckerAOverlay
           decals:
+<<<<<<< Updated upstream
             3427: 7,36
             3428: 5,36
             3429: 6,36
@@ -1800,10 +2120,25 @@ entities:
             3436: 14,37
             3437: 13,37
             3438: 14,36
+=======
+            3408: 7,36
+            3409: 5,36
+            3410: 6,36
+            3411: 6,37
+            3412: 5,37
+            3413: 7,37
+            3414: 12,37
+            3415: 12,36
+            3416: 13,36
+            3417: 14,37
+            3418: 13,37
+            3419: 14,36
+>>>>>>> Stashed changes
         - node:
             color: '#2D72307C'
             id: DiagonalCheckerBOverlay
           decals:
+<<<<<<< Updated upstream
             3375: 6,32
             3376: 5,32
             3377: 5,33
@@ -1846,6 +2181,50 @@ entities:
             3414: 13,29
             3415: 14,29
             3416: 8,32
+=======
+            3356: 6,32
+            3357: 5,32
+            3358: 5,33
+            3359: 6,33
+            3360: 6,34
+            3361: 5,34
+            3362: 7,34
+            3363: 7,33
+            3364: 7,32
+            3365: 8,33
+            3366: 8,34
+            3367: 9,34
+            3368: 9,33
+            3369: 9,32
+            3370: 9,35
+            3371: 9,36
+            3372: 9,37
+            3373: 9,38
+            3374: 10,38
+            3375: 10,37
+            3376: 10,36
+            3377: 10,35
+            3378: 10,34
+            3379: 10,33
+            3380: 10,32
+            3381: 11,32
+            3382: 11,33
+            3383: 11,34
+            3384: 12,34
+            3385: 12,33
+            3386: 12,32
+            3387: 13,32
+            3388: 13,33
+            3389: 13,34
+            3390: 14,34
+            3391: 14,33
+            3392: 14,32
+            3393: 14,30
+            3394: 13,30
+            3395: 13,29
+            3396: 14,29
+            3397: 8,32
+>>>>>>> Stashed changes
         - node:
             color: '#822328FF'
             id: Dirt
@@ -1891,30 +2270,53 @@ entities:
             color: '#FFFFFF6A'
             id: Dirt
           decals:
+<<<<<<< Updated upstream
             3775: -6,42
             3776: 1,41
             3777: 3,44
             3778: 2,40
+=======
+            3688: -6,42
+            3689: 1,41
+            3690: 3,44
+            3691: 2,40
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFF85'
             id: Dirt
           decals:
+<<<<<<< Updated upstream
             3750: -30,32
+=======
+            3664: -30,32
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFD3'
             id: Dirt
           decals:
+<<<<<<< Updated upstream
             3759: -34,20
+=======
+            3673: -34,20
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFFD3'
             id: Dirt
           decals:
+<<<<<<< Updated upstream
             3763: 1,35
             3764: -1,37
             3770: -2,26
             3773: -5,43
             3774: -3,39
+=======
+            3676: 1,35
+            3677: -1,37
+            3683: -2,26
+            3686: -5,43
+            3687: -3,39
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: Dirt
@@ -1957,12 +2359,21 @@ entities:
             2564: -22,3
             2565: -21,2
             2566: -6,3
+<<<<<<< Updated upstream
             3626: 23,25
             3634: 7,36
             3734: -7,23
             3738: 11,26
             3739: 19,25
             3785: -7,41
+=======
+            3570: 23,25
+            3578: 7,36
+            3649: -7,23
+            3653: 11,26
+            3654: 19,25
+            3698: -7,41
+>>>>>>> Stashed changes
         - node:
             color: '#00AC887F'
             id: DirtHeavy
@@ -1984,18 +2395,31 @@ entities:
             color: '#FFFFFF85'
             id: DirtHeavy
           decals:
+<<<<<<< Updated upstream
             3751: -29,20
             3755: -31,23
             3756: -30,30
+=======
+            3665: -29,20
+            3669: -31,23
+            3670: -30,30
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFFD3'
             id: DirtHeavy
           decals:
+<<<<<<< Updated upstream
             3765: 3,35
             3766: -3,40
             3771: -7,26
             3772: 0,43
+=======
+            3678: 3,35
+            3679: -3,40
+            3684: -7,26
+            3685: 0,43
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: DirtHeavy
@@ -2009,7 +2433,11 @@ entities:
             1374: -97,0
             1380: -113,9
             1381: -112,10
+<<<<<<< Updated upstream
             3173: -13,-5
+=======
+            3167: -13,-5
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2137,23 +2565,37 @@ entities:
             2561: -13,4
             2562: -17,2
             2563: -10,1
+<<<<<<< Updated upstream
             3206: -18,-2
             3627: 21,21
             3729: 16,15
             3733: -16,24
             3740: 21,25
             3782: -8,44
+=======
+            3196: -18,-2
+            3571: 21,21
+            3645: 16,15
+            3648: -16,24
+            3655: 21,25
+            3695: -8,44
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFFD3'
             id: DirtHeavyMonotile
           decals:
+<<<<<<< Updated upstream
             3762: -2,29
+=======
+            3675: -2,29
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
+<<<<<<< Updated upstream
             3210: -18,-9
             3639: -19,7
             3640: -11,15
@@ -2162,25 +2604,49 @@ entities:
             3736: 3,23
             3783: -9,42
             3784: -6,39
+=======
+            3200: -18,-9
+            3582: -19,7
+            3583: -11,15
+            3643: 3,16
+            3644: 5,11
+            3651: 3,23
+            3696: -9,42
+            3697: -6,39
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFF6A'
             id: DirtLight
           decals:
+<<<<<<< Updated upstream
             3780: -7,46
+=======
+            3693: -7,46
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFF85'
             id: DirtLight
           decals:
+<<<<<<< Updated upstream
             3752: -32,20
+=======
+            3666: -32,20
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFFD3'
             id: DirtLight
           decals:
+<<<<<<< Updated upstream
             3767: -8,32
             3768: -2,29
             3769: -3,25
+=======
+            3680: -8,32
+            3681: -2,29
+            3682: -3,25
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: DirtLight
@@ -2238,7 +2704,11 @@ entities:
             1859: -86,20
             1860: -86,38
             1861: -89,39
+<<<<<<< Updated upstream
             3171: -15,-2
+=======
+            3165: -15,-2
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2641,6 +3111,7 @@ entities:
             2872: -8,5
             2874: 6,13
             2877: 16,11
+<<<<<<< Updated upstream
             3199: -26,-8
             3628: 9,22
             3629: 6,21
@@ -2660,6 +3131,27 @@ entities:
             3745: -21,20
             3746: -22,24
             3781: -7,46
+=======
+            3193: -26,-8
+            3572: 9,22
+            3573: 6,21
+            3574: -5,18
+            3575: 24,23
+            3576: 25,22
+            3577: 18,30
+            3579: 9,33
+            3580: 11,41
+            3581: 13,25
+            3638: -8,8
+            3642: -2,16
+            3646: 13,20
+            3647: 21,15
+            3650: -2,23
+            3658: -13,24
+            3660: -21,20
+            3661: -22,24
+            3694: -7,46
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             zIndex: 431
@@ -2708,26 +3200,45 @@ entities:
             color: '#FFFFFF6A'
             id: DirtMedium
           decals:
+<<<<<<< Updated upstream
             3779: -3,44
+=======
+            3692: -3,44
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFF85'
             id: DirtMedium
           decals:
+<<<<<<< Updated upstream
             3749: -31,28
             3753: -31,23
             3754: -30,24
+=======
+            3663: -31,28
+            3667: -31,23
+            3668: -30,24
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFD3'
             id: DirtMedium
           decals:
+<<<<<<< Updated upstream
             3757: -30,33
             3758: -27,20
+=======
+            3671: -30,33
+            3672: -27,20
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FFFFFFD3'
             id: DirtMedium
           decals:
+<<<<<<< Updated upstream
             3761: -3,31
+=======
+            3674: -3,31
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: DirtMedium
@@ -2913,12 +3424,21 @@ entities:
             2873: 0,11
             2875: 10,11
             2876: 14,13
+<<<<<<< Updated upstream
             3725: 0,21
             3737: 4,25
             3741: 17,26
             3742: 10,27
             3744: -17,21
             3747: -25,21
+=======
+            3641: 0,21
+            3652: 4,25
+            3656: 17,26
+            3657: 10,27
+            3659: -17,21
+            3662: -25,21
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             zIndex: 431
@@ -3040,12 +3560,21 @@ entities:
             2590: 26,16
             2591: 25,17
             2592: 27,17
+<<<<<<< Updated upstream
             3111: 0,12
             3112: 1,12
             3125: -1,12
             3126: -2,12
             3127: 2,12
             3128: 3,12
+=======
+            3106: 0,12
+            3107: 1,12
+            3120: -1,12
+            3121: -2,12
+            3122: 2,12
+            3123: 3,12
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: FullTileOverlayGreyscale
@@ -3133,6 +3662,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale
           decals:
+<<<<<<< Updated upstream
             2910: -1,13
             2911: 0,13
             2912: 1,13
@@ -3164,12 +3694,50 @@ entities:
             3470: 9,24
             3471: 10,24
             3554: -6,21
+=======
+            2905: -1,13
+            2906: 0,13
+            2907: 1,13
+            2908: 2,13
+            2918: 6,14
+            2919: 8,14
+            2920: 9,14
+            2921: 10,14
+            2922: 7,14
+            2932: 14,15
+            2933: 15,15
+            2959: 25,20
+            2960: 26,20
+            2961: 27,20
+            2962: 31,20
+            2963: 32,20
+            2964: 33,20
+            3039: 19,15
+            3040: 19,15
+            3041: 20,15
+            3042: 20,15
+            3043: 21,15
+            3044: 21,15
+            3136: -2,13
+            3137: 3,13
+            3333: 34,20
+            3448: 7,24
+            3449: 8,24
+            3450: 9,24
+            3451: 10,24
+            3506: -6,21
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: HalfTileOverlayGreyscale
           decals:
+<<<<<<< Updated upstream
             3267: -11,15
             3326: 24,32
+=======
+            3248: -11,15
+            3307: 24,32
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale
@@ -3330,6 +3898,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
           decals:
+<<<<<<< Updated upstream
             2899: -7,5
             2906: -1,11
             2907: 0,11
@@ -3362,12 +3931,51 @@ entities:
             3473: 8,20
             3474: 9,20
             3475: 10,20
+=======
+            2896: -7,5
+            2901: -1,11
+            2902: 0,11
+            2903: 1,11
+            2904: 2,11
+            2913: 6,11
+            2914: 7,11
+            2915: 8,11
+            2916: 9,11
+            2917: 10,11
+            2934: 14,11
+            2935: 15,11
+            2940: 25,11
+            2941: 26,11
+            2942: 27,11
+            2966: 31,18
+            2967: 32,18
+            2968: 33,18
+            3033: 19,14
+            3034: 19,14
+            3035: 20,14
+            3036: 20,14
+            3037: 21,14
+            3038: 21,14
+            3138: -2,11
+            3139: 3,11
+            3191: -5,11
+            3334: 34,18
+            3452: 7,20
+            3453: 8,20
+            3454: 9,20
+            3455: 10,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: HalfTileOverlayGreyscale180
           decals:
+<<<<<<< Updated upstream
             3268: -12,11
             3269: -11,11
+=======
+            3249: -12,11
+            3250: -11,11
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale180
@@ -3531,6 +4139,7 @@ entities:
             2886: -8,10
             2887: -8,12
             2888: -8,13
+<<<<<<< Updated upstream
             2930: 5,12
             2931: 5,13
             2932: 13,13
@@ -3566,10 +4175,48 @@ entities:
             3550: -7,18
             3551: -7,19
             3552: -7,20
+=======
+            2925: 5,12
+            2926: 5,13
+            2927: 13,13
+            2928: 13,14
+            2951: 24,12
+            2952: 24,13
+            2953: 24,14
+            2954: 24,15
+            2955: 24,16
+            2956: 24,17
+            2957: 24,18
+            2958: 24,19
+            2965: 30,19
+            3055: 14,13
+            3057: 13,12
+            3058: 15,13
+            3069: 14,13
+            3070: 15,13
+            3166: -8,14
+            3205: -8,11
+            3441: 13,23
+            3442: 13,22
+            3443: 13,21
+            3444: 13,20
+            3445: 13,19
+            3446: 13,18
+            3447: 13,17
+            3459: 6,23
+            3460: 6,22
+            3461: 6,21
+            3500: -7,16
+            3501: -7,17
+            3502: -7,18
+            3503: -7,19
+            3504: -7,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: HalfTileOverlayGreyscale270
           decals:
+<<<<<<< Updated upstream
             3261: -13,12
             3262: -13,13
             3263: -13,14
@@ -3577,6 +4224,15 @@ entities:
             3319: 23,28
             3320: 23,30
             3321: 23,31
+=======
+            3242: -13,12
+            3243: -13,13
+            3244: -13,14
+            3299: 23,29
+            3300: 23,28
+            3301: 23,30
+            3302: 23,31
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale270
@@ -3726,6 +4382,7 @@ entities:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale90
           decals:
+<<<<<<< Updated upstream
             2892: -4,13
             2893: -4,12
             2894: -6,10
@@ -3766,10 +4423,53 @@ entities:
             3547: -5,20
             3553: -5,18
             3565: -5,16
+=======
+            2889: -4,13
+            2890: -4,12
+            2891: -6,10
+            2892: -6,9
+            2893: -6,8
+            2894: -6,7
+            2895: -6,6
+            2923: 11,12
+            2924: 11,13
+            2929: 16,12
+            2930: 16,13
+            2931: 16,14
+            2943: 28,12
+            2944: 28,13
+            2945: 28,14
+            2946: 28,15
+            2947: 28,16
+            2948: 28,17
+            2949: 28,18
+            2950: 28,19
+            3056: 15,13
+            3059: 14,13
+            3068: 15,13
+            3071: 14,13
+            3335: 35,19
+            3434: 14,17
+            3435: 14,18
+            3436: 14,19
+            3437: 14,20
+            3438: 14,21
+            3439: 14,23
+            3440: 14,22
+            3456: 11,21
+            3457: 11,22
+            3458: 11,23
+            3497: -5,17
+            3498: -5,19
+            3499: -5,20
+            3505: -5,18
+            3511: -5,16
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: HalfTileOverlayGreyscale90
           decals:
+<<<<<<< Updated upstream
             3264: -10,12
             3265: -10,13
             3266: -10,14
@@ -3777,6 +4477,15 @@ entities:
             3323: 25,30
             3324: 25,31
             3325: 25,28
+=======
+            3245: -10,12
+            3246: -10,13
+            3247: -10,14
+            3303: 25,29
+            3304: 25,30
+            3305: 25,31
+            3306: 25,28
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: HalfTileOverlayGreyscale90
@@ -3965,6 +4674,7 @@ entities:
             color: '#52B4E996'
             id: MiniTileCheckerAOverlay
           decals:
+<<<<<<< Updated upstream
             3020: 18,14
             3021: 19,14
             3022: 20,14
@@ -3975,6 +4685,18 @@ entities:
             3027: 20,15
             3028: 19,15
             3029: 18,15
+=======
+            3015: 18,14
+            3016: 19,14
+            3017: 20,14
+            3018: 21,14
+            3019: 22,14
+            3020: 22,15
+            3021: 21,15
+            3022: 20,15
+            3023: 19,15
+            3024: 18,15
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileDarkCornerNe
@@ -4028,7 +4750,11 @@ entities:
             1960: -15,9
             1967: -10,8
             1972: -12,6
+<<<<<<< Updated upstream
             3168: -6,13
+=======
+            3163: -6,13
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerNe
@@ -4043,7 +4769,11 @@ entities:
             id: MiniTileDarkInnerNw
           decals:
             1971: -13,6
+<<<<<<< Updated upstream
             3169: -6,13
+=======
+            3164: -6,13
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerNw
@@ -4059,7 +4789,11 @@ entities:
             id: MiniTileDarkInnerSe
           decals:
             1968: -10,7
+<<<<<<< Updated upstream
             3167: -6,13
+=======
+            3162: -6,13
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerSe
@@ -4072,7 +4806,11 @@ entities:
             color: '#52B4E996'
             id: MiniTileDarkInnerSw
           decals:
+<<<<<<< Updated upstream
             3166: -6,13
+=======
+            3161: -6,13
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkInnerSw
@@ -4126,14 +4864,24 @@ entities:
             1964: -12,9
             1965: -13,9
             1966: -14,9
+<<<<<<< Updated upstream
             3146: 0,13
             3147: 1,13
+=======
+            3141: 0,13
+            3142: 1,13
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: MiniTileDarkLineN
           decals:
+<<<<<<< Updated upstream
             3273: -13,14
             3274: -13,14
+=======
+            3254: -13,14
+            3255: -13,14
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             zIndex: 431
@@ -4149,8 +4897,13 @@ entities:
             color: '#52B4E996'
             id: MiniTileDarkLineS
           decals:
+<<<<<<< Updated upstream
             3145: 1,11
             3148: -2,11
+=======
+            3140: 1,11
+            3143: -2,11
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             zIndex: 431
@@ -4202,6 +4955,7 @@ entities:
             color: '#2D72307C'
             id: MiniTileDiagonalCheckerAOverlay
           decals:
+<<<<<<< Updated upstream
             3417: 9,40
             3418: 10,40
             3419: 10,41
@@ -4212,10 +4966,23 @@ entities:
             3424: 10,42
             3425: 11,42
             3426: 11,41
+=======
+            3398: 9,40
+            3399: 10,40
+            3400: 10,41
+            3401: 9,41
+            3402: 8,41
+            3403: 8,42
+            3404: 9,42
+            3405: 10,42
+            3406: 11,42
+            3407: 11,41
+>>>>>>> Stashed changes
         - node:
             color: '#2D723063'
             id: MiniTileDiagonalOverlay
           decals:
+<<<<<<< Updated upstream
             3439: 6,30
             3440: 6,29
             3441: 5,30
@@ -4224,15 +4991,30 @@ entities:
             3444: 7,29
             3445: 8,30
             3446: 8,29
+=======
+            3420: 6,30
+            3421: 6,29
+            3422: 5,30
+            3423: 5,29
+            3424: 7,30
+            3425: 7,29
+            3426: 8,30
+            3427: 8,29
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileOverlay
           decals:
+<<<<<<< Updated upstream
             3165: -6,13
+=======
+            3160: -6,13
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: MiniTileOverlay
           decals:
+<<<<<<< Updated upstream
             3249: -13,11
             3250: -13,12
             3251: -13,14
@@ -4245,36 +5027,75 @@ entities:
             3258: -10,11
             3259: -11,11
             3260: -12,11
+=======
+            3230: -13,11
+            3231: -13,12
+            3232: -13,14
+            3233: -13,13
+            3234: -11,15
+            3235: -10,15
+            3236: -10,14
+            3237: -10,13
+            3238: -10,12
+            3239: -10,11
+            3240: -11,11
+            3241: -12,11
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: MiniTileSteelLineE
           decals:
+<<<<<<< Updated upstream
             3235: -4,12
+=======
+            3216: -4,12
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: MiniTileSteelLineS
           decals:
+<<<<<<< Updated upstream
             3234: -4,11
+=======
+            3215: -4,11
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: MiniTileSteelLineW
           decals:
+<<<<<<< Updated upstream
             3236: -8,7
             3237: -8,8
+=======
+            3217: -8,7
+            3218: -8,8
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteCornerNe
           decals:
+<<<<<<< Updated upstream
             3053: 15,14
             3181: -5,14
             3575: -5,21
             3614: 11,24
+=======
+            3048: 15,14
+            3175: -5,14
+            3521: -5,21
+            3560: 11,24
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: MiniTileWhiteCornerNe
           decals:
+<<<<<<< Updated upstream
             3665: 3,21
             3673: 3,17
+=======
+            3590: 3,21
+            3595: 3,17
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#EFB34196'
@@ -4286,21 +5107,37 @@ entities:
             color: '#FFA500FF'
             id: MiniTileWhiteCornerNe
           decals:
+<<<<<<< Updated upstream
             3539: 0,9
+=======
+            3495: 0,9
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteCornerNw
           decals:
+<<<<<<< Updated upstream
             3052: 14,14
             3180: -7,14
             3564: -8,15
             3574: -7,21
             3615: 6,24
+=======
+            3047: 14,14
+            3174: -7,14
+            3510: -8,15
+            3520: -7,21
+            3561: 6,24
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: MiniTileWhiteCornerNw
           decals:
+<<<<<<< Updated upstream
             3674: -3,21
+=======
+            3596: -3,21
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#EFB34196'
@@ -4311,22 +5148,39 @@ entities:
             color: '#FFA500FF'
             id: MiniTileWhiteCornerNw
           decals:
+<<<<<<< Updated upstream
             3503: -4,9
+=======
+            3482: -4,9
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteCornerSe
           decals:
+<<<<<<< Updated upstream
             3051: 15,12
             3182: -5,12
             3208: -6,5
             3213: -4,11
             3613: 11,20
+=======
+            3046: 15,12
+            3176: -5,12
+            3198: -6,5
+            3201: -4,11
+            3559: 11,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: MiniTileWhiteCornerSe
           decals:
+<<<<<<< Updated upstream
             3671: 3,19
             3675: 3,15
+=======
+            3593: 3,19
+            3597: 3,15
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#EFB34196'
@@ -4337,20 +5191,35 @@ entities:
             color: '#FFA500FF'
             id: MiniTileWhiteCornerSe
           decals:
+<<<<<<< Updated upstream
             3505: 0,5
+=======
+            3484: 0,5
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteCornerSw
           decals:
+<<<<<<< Updated upstream
             3050: 14,12
             3183: -7,12
             3209: -8,5
             3612: 6,20
+=======
+            3045: 14,12
+            3177: -7,12
+            3199: -8,5
+            3558: 6,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: MiniTileWhiteCornerSw
           decals:
+<<<<<<< Updated upstream
             3672: -3,15
+=======
+            3594: -3,15
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#EFB34196'
@@ -4361,24 +5230,42 @@ entities:
             color: '#FFA500FF'
             id: MiniTileWhiteCornerSw
           decals:
+<<<<<<< Updated upstream
             3504: -4,5
+=======
+            3483: -4,5
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteEndN
           decals:
+<<<<<<< Updated upstream
             3582: -7,10
             3585: -6,20
+=======
+            3528: -7,10
+            3531: -6,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteEndS
           decals:
+<<<<<<< Updated upstream
             3583: -7,6
             3584: -6,16
+=======
+            3529: -7,6
+            3530: -6,16
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteInnerNe
           decals:
+<<<<<<< Updated upstream
             3568: -5,15
+=======
+            3514: -5,15
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             zIndex: 431
@@ -4390,8 +5277,13 @@ entities:
             color: '#52B4E996'
             id: MiniTileWhiteInnerNw
           decals:
+<<<<<<< Updated upstream
             3360: 35,18
             3567: -7,15
+=======
+            3341: 35,18
+            3513: -7,15
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             zIndex: 431
@@ -4403,7 +5295,11 @@ entities:
             color: '#52B4E996'
             id: MiniTileWhiteInnerSe
           decals:
+<<<<<<< Updated upstream
             3214: -6,11
+=======
+            3202: -6,11
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteInnerSe
@@ -4413,7 +5309,11 @@ entities:
             color: '#52B4E996'
             id: MiniTileWhiteInnerSw
           decals:
+<<<<<<< Updated upstream
             3359: 35,20
+=======
+            3340: 35,20
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteInnerSw
@@ -4423,6 +5323,7 @@ entities:
             color: '#52B4E996'
             id: MiniTileWhiteLineE
           decals:
+<<<<<<< Updated upstream
             3054: 15,13
             3152: -7,13
             3179: -5,13
@@ -4453,12 +5354,49 @@ entities:
             3609: 11,21
             3610: 11,22
             3611: 11,23
+=======
+            3049: 15,13
+            3147: -7,13
+            3173: -5,13
+            3186: -6,6
+            3187: -6,7
+            3188: -6,8
+            3189: -6,9
+            3190: -6,10
+            3194: -4,12
+            3195: -4,13
+            3209: -7,8
+            3210: -7,7
+            3523: -5,20
+            3524: -5,19
+            3525: -5,18
+            3526: -5,17
+            3527: -5,16
+            3535: -6,19
+            3536: -6,18
+            3537: -6,17
+            3538: 14,17
+            3539: 14,18
+            3540: 14,19
+            3541: 14,20
+            3542: 14,21
+            3543: 14,22
+            3544: 14,23
+            3555: 11,21
+            3556: 11,22
+            3557: 11,23
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: MiniTileWhiteLineE
           decals:
+<<<<<<< Updated upstream
             3666: 3,20
             3669: 3,16
+=======
+            3591: 3,20
+            3592: 3,16
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#EFB34196'
@@ -4470,9 +5408,15 @@ entities:
             color: '#FFA500FF'
             id: MiniTileWhiteLineE
           decals:
+<<<<<<< Updated upstream
             3506: 0,6
             3507: 0,7
             3536: 0,8
+=======
+            3485: 0,6
+            3486: 0,7
+            3494: 0,8
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineE
@@ -4490,6 +5434,7 @@ entities:
             color: '#52B4E996'
             id: MiniTileWhiteLineN
           decals:
+<<<<<<< Updated upstream
             3151: -6,14
             3153: -6,12
             3357: 34,18
@@ -4498,15 +5443,33 @@ entities:
             3621: 8,24
             3622: 9,24
             3623: 10,24
+=======
+            3146: -6,14
+            3148: -6,12
+            3338: 34,18
+            3522: -6,21
+            3566: 7,24
+            3567: 8,24
+            3568: 9,24
+            3569: 10,24
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: MiniTileWhiteLineN
           decals:
+<<<<<<< Updated upstream
             3687: -2,21
             3688: -1,21
             3689: 0,21
             3692: 1,21
             3693: 2,21
+=======
+            3608: -2,21
+            3609: -1,21
+            3610: 0,21
+            3612: 1,21
+            3613: 2,21
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#EFB34196'
@@ -4518,11 +5481,19 @@ entities:
             color: '#FFA500FF'
             id: MiniTileWhiteLineN
           decals:
+<<<<<<< Updated upstream
             3800: 3,8
             3801: 2,8
             3818: -3,9
             3819: -2,9
             3820: -1,9
+=======
+            3707: 3,8
+            3708: 2,8
+            3714: -3,9
+            3715: -2,9
+            3716: -1,9
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             zIndex: 431
@@ -4534,6 +5505,7 @@ entities:
             color: '#52B4E996'
             id: MiniTileWhiteLineS
           decals:
+<<<<<<< Updated upstream
             3149: -6,12
             3154: -6,14
             3198: -5,11
@@ -4543,15 +5515,34 @@ entities:
             3617: 8,20
             3618: 9,20
             3619: 10,20
+=======
+            3144: -6,12
+            3149: -6,14
+            3192: -5,11
+            3197: -7,5
+            3339: 34,20
+            3562: 7,20
+            3563: 8,20
+            3564: 9,20
+            3565: 10,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: MiniTileWhiteLineS
           decals:
+<<<<<<< Updated upstream
             3676: 2,15
             3677: 1,15
             3679: 0,15
             3680: -1,15
             3681: -2,15
+=======
+            3598: 2,15
+            3599: 1,15
+            3600: 0,15
+            3601: -1,15
+            3602: -2,15
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#EFB34196'
@@ -4563,11 +5554,19 @@ entities:
             color: '#FFA500FF'
             id: MiniTileWhiteLineS
           decals:
+<<<<<<< Updated upstream
             3510: -3,5
             3700: -2,5
             3701: -1,5
             3802: 2,6
             3803: 3,6
+=======
+            3487: -3,5
+            3616: -2,5
+            3617: -1,5
+            3709: 2,6
+            3710: 3,6
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineS
@@ -4577,6 +5576,7 @@ entities:
             color: '#52B4E996'
             id: MiniTileWhiteLineW
           decals:
+<<<<<<< Updated upstream
             3055: 14,13
             3150: -7,13
             3176: -5,13
@@ -4609,21 +5609,68 @@ entities:
             3606: 6,21
             3607: 6,22
             3608: 6,23
+=======
+            3050: 14,13
+            3145: -7,13
+            3170: -5,13
+            3178: -8,13
+            3179: -8,14
+            3180: -8,12
+            3181: -8,10
+            3182: -8,9
+            3183: -8,8
+            3184: -8,7
+            3185: -8,6
+            3207: -7,8
+            3208: -7,7
+            3342: 35,19
+            3515: -7,16
+            3516: -7,17
+            3517: -7,18
+            3518: -7,19
+            3519: -7,20
+            3532: -6,19
+            3533: -6,18
+            3534: -6,17
+            3545: 13,23
+            3546: 13,22
+            3547: 13,21
+            3548: 13,19
+            3549: 13,20
+            3550: 13,18
+            3551: 13,17
+            3552: 6,21
+            3553: 6,22
+            3554: 6,23
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: MiniTileWhiteLineW
           decals:
+<<<<<<< Updated upstream
             3329: 23,35
             3330: 23,36
+=======
+            3310: 23,35
+            3311: 23,36
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E9CC'
             id: MiniTileWhiteLineW
           decals:
+<<<<<<< Updated upstream
             3682: -3,16
             3683: -3,17
             3684: -3,18
             3685: -3,19
             3686: -3,20
+=======
+            3603: -3,16
+            3604: -3,17
+            3605: -3,18
+            3606: -3,19
+            3607: -3,20
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#EFB34196'
@@ -4636,9 +5683,15 @@ entities:
             color: '#FFA500FF'
             id: MiniTileWhiteLineW
           decals:
+<<<<<<< Updated upstream
             3512: -4,6
             3513: -4,7
             3514: -4,8
+=======
+            3488: -4,6
+            3489: -4,7
+            3490: -4,8
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: MiniTileWhiteLineW
@@ -4676,11 +5729,19 @@ entities:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale
           decals:
+<<<<<<< Updated upstream
             3056: 14,14
             3066: 15,12
             3071: 15,12
             3177: -7,14
             3542: -7,15
+=======
+            3051: 14,14
+            3061: 15,12
+            3066: 15,12
+            3171: -7,14
+            3496: -7,15
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#52B4E996'
@@ -4811,11 +5872,19 @@ entities:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
+<<<<<<< Updated upstream
             2905: -6,11
             3057: 15,12
             3067: 14,14
             3070: 14,14
             3174: -5,12
+=======
+            2900: -6,11
+            3052: 15,12
+            3062: 14,14
+            3065: 14,14
+            3168: -5,12
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#9FED5896'
@@ -4922,10 +5991,17 @@ entities:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale270
           decals:
+<<<<<<< Updated upstream
             3059: 14,12
             3068: 15,14
             3069: 15,14
             3175: -7,12
+=======
+            3054: 14,12
+            3063: 15,14
+            3064: 15,14
+            3169: -7,12
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale270
@@ -5015,11 +6091,19 @@ entities:
             2177: -19,3
             2178: -20,3
             2179: -21,3
+<<<<<<< Updated upstream
             3058: 15,14
             3065: 14,12
             3072: 14,12
             3178: -5,14
             3566: -5,15
+=======
+            3053: 15,14
+            3060: 14,12
+            3067: 14,12
+            3172: -5,14
+            3512: -5,15
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: QuarterTileOverlayGreyscale90
@@ -5234,6 +6318,7 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale
           decals:
             1948: -12,7
+<<<<<<< Updated upstream
             2917: 5,14
             2944: 13,15
             2974: 30,20
@@ -5243,11 +6328,26 @@ entities:
             3485: 6,24
             3555: -7,21
             3563: -8,15
+=======
+            2912: 5,14
+            2939: 13,15
+            2969: 30,20
+            2972: 24,20
+            3025: 18,15
+            3026: 18,15
+            3465: 6,24
+            3507: -7,21
+            3509: -8,15
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: ThreeQuarterTileOverlayGreyscale
           decals:
+<<<<<<< Updated upstream
             3327: 23,32
+=======
+            3308: 23,32
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: ThreeQuarterTileOverlayGreyscale
@@ -5328,6 +6428,7 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
             1947: -13,8
+<<<<<<< Updated upstream
             2902: -6,5
             2903: -4,11
             2916: 11,11
@@ -5337,11 +6438,26 @@ entities:
             3037: 22,14
             3355: 35,18
             3482: 11,20
+=======
+            2898: -6,5
+            2899: -4,11
+            2911: 11,11
+            2936: 16,11
+            2973: 28,11
+            3031: 22,14
+            3032: 22,14
+            3336: 35,18
+            3462: 11,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
+<<<<<<< Updated upstream
             3272: -10,11
+=======
+            3253: -10,11
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -5414,6 +6530,7 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
             1946: -12,8
+<<<<<<< Updated upstream
             2901: -8,5
             2915: 5,11
             2942: 13,11
@@ -5422,11 +6539,25 @@ entities:
             3034: 18,14
             3035: 18,14
             3483: 6,20
+=======
+            2897: -8,5
+            2910: 5,11
+            2937: 13,11
+            2970: 30,18
+            2974: 24,11
+            3029: 18,14
+            3030: 18,14
+            3463: 6,20
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
+<<<<<<< Updated upstream
             3270: -13,11
+=======
+            3251: -13,11
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -5500,6 +6631,7 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
             1949: -13,7
+<<<<<<< Updated upstream
             2914: 11,14
             2943: 16,15
             2976: 28,20
@@ -5508,12 +6640,27 @@ entities:
             3356: 35,20
             3484: 11,24
             3556: -5,21
+=======
+            2909: 11,14
+            2938: 16,15
+            2971: 28,20
+            3027: 22,15
+            3028: 22,15
+            3337: 35,20
+            3464: 11,24
+            3508: -5,21
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
+<<<<<<< Updated upstream
             3271: -10,15
             3328: 25,32
+=======
+            3252: -10,15
+            3309: 25,32
+>>>>>>> Stashed changes
         - node:
             color: '#A4610696'
             id: ThreeQuarterTileOverlayGreyscale90
@@ -5583,7 +6730,11 @@ entities:
             color: '#F9801DFF'
             id: WarnBoxGreyscale
           decals:
+<<<<<<< Updated upstream
             3664: -2,7
+=======
+            3589: -2,7
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: WarnBoxGreyscale
@@ -5619,22 +6770,38 @@ entities:
           decals:
             349: -15,-9
             673: -15,-19
+<<<<<<< Updated upstream
             3156: -29,50
+=======
+            3151: -29,50
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
+<<<<<<< Updated upstream
             3157: -32,50
+=======
+            3152: -32,50
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
+<<<<<<< Updated upstream
             3158: -29,47
+=======
+            3153: -29,47
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
+<<<<<<< Updated upstream
             3155: -32,47
+=======
+            3150: -32,47
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFFFF'
             id: WarnEndGreyscaleE
@@ -5671,8 +6838,13 @@ entities:
             color: '#52B4E996'
             id: WarnFullGreyscale
           decals:
+<<<<<<< Updated upstream
             3486: 5,21
             3487: 5,20
+=======
+            3466: 5,21
+            3467: 5,20
+>>>>>>> Stashed changes
         - node:
             color: '#FFFFFF34'
             id: WarnFullGreyscale
@@ -5692,11 +6864,19 @@ entities:
             id: WarnLineE
           decals:
             676: -15,-20
+<<<<<<< Updated upstream
             3159: -29,48
             3160: -29,49
             3450: 14,27
             3451: 14,26
             3452: 14,25
+=======
+            3154: -29,48
+            3155: -29,49
+            3431: 14,27
+            3432: 14,26
+            3433: 14,25
+>>>>>>> Stashed changes
         - node:
             color: '#334E6DC8'
             id: WarnLineGreyscaleE
@@ -5785,11 +6965,19 @@ entities:
             1862: -86,37
             1863: -86,38
             1864: -86,39
+<<<<<<< Updated upstream
             3161: -32,48
             3162: -32,49
             3447: 13,27
             3448: 13,26
             3449: 13,25
+=======
+            3156: -32,48
+            3157: -32,49
+            3428: 13,27
+            3429: 13,26
+            3430: 13,25
+>>>>>>> Stashed changes
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -5811,8 +6999,13 @@ entities:
             1867: -84,45
             2854: -7,-43
             2855: 1,-43
+<<<<<<< Updated upstream
             3163: -31,50
             3164: -30,50
+=======
+            3158: -31,50
+            3159: -30,50
+>>>>>>> Stashed changes
         - node:
             color: '#410000C4'
             id: WoodTrimThinCornerNe
@@ -5829,8 +7022,13 @@ entities:
             id: WoodTrimThinCornerNe
           decals:
             229: 45,6
+<<<<<<< Updated upstream
             3338: 43,14
             3343: 48,15
+=======
+            3319: 43,14
+            3324: 48,15
+>>>>>>> Stashed changes
         - node:
             color: '#4143509B'
             id: WoodTrimThinCornerNw
@@ -5842,7 +7040,11 @@ entities:
             id: WoodTrimThinCornerNw
           decals:
             226: 43,6
+<<<<<<< Updated upstream
             3344: 46,15
+=======
+            3325: 46,15
+>>>>>>> Stashed changes
         - node:
             color: '#410000C4'
             id: WoodTrimThinCornerSe
@@ -5860,7 +7062,11 @@ entities:
           decals:
             223: 43,12
             225: 45,4
+<<<<<<< Updated upstream
             3350: 48,12
+=======
+            3331: 48,12
+>>>>>>> Stashed changes
         - node:
             color: '#410000C4'
             id: WoodTrimThinCornerSw
@@ -5877,7 +7083,11 @@ entities:
             id: WoodTrimThinCornerSw
           decals:
             227: 43,4
+<<<<<<< Updated upstream
             3349: 46,12
+=======
+            3330: 46,12
+>>>>>>> Stashed changes
         - node:
             color: '#410000C4'
             id: WoodTrimThinInnerNe
@@ -5903,8 +7113,13 @@ entities:
             2073: -79,-3
             2085: -76,-2
             2086: -76,-1
+<<<<<<< Updated upstream
             3339: 43,13
             3345: 48,14
+=======
+            3320: 43,13
+            3326: 48,14
+>>>>>>> Stashed changes
         - node:
             color: '#410000C4'
             id: WoodTrimThinLineN
@@ -5932,10 +7147,17 @@ entities:
             2077: -80,-3
             2078: -75,-3
             2079: -74,-3
+<<<<<<< Updated upstream
             3340: 40,14
             3341: 41,14
             3342: 42,14
             3346: 47,15
+=======
+            3321: 40,14
+            3322: 41,14
+            3323: 42,14
+            3327: 47,15
+>>>>>>> Stashed changes
         - node:
             color: '#4143509B'
             id: WoodTrimThinLineS
@@ -5951,7 +7173,11 @@ entities:
             2080: -78,-2
             2081: -77,-2
             2082: -76,-2
+<<<<<<< Updated upstream
             3351: 47,12
+=======
+            3332: 47,12
+>>>>>>> Stashed changes
         - node:
             color: '#410000C4'
             id: WoodTrimThinLineW
@@ -5967,51 +7193,87 @@ entities:
             2075: -75,-3
             2083: -78,-2
             2084: -78,-1
+<<<<<<< Updated upstream
             3347: 46,14
             3348: 46,13
+=======
+            3328: 46,14
+            3329: 46,13
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: corgi
           decals:
+<<<<<<< Updated upstream
             3246: -15,11
             3247: -15,11
+=======
+            3227: -15,11
+            3228: -15,11
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#D5188DFF'
             id: cyka
           decals:
+<<<<<<< Updated upstream
             3374: 31.01219,28.700993
+=======
+            3355: 31.01219,28.700993
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: dwarf
           decals:
+<<<<<<< Updated upstream
             2992: 32,19
             3092: 6,12
             3093: 7,13
             3094: 8,12
             3095: 9,13
             3096: 10,12
+=======
+            2987: 32,19
+            3087: 6,12
+            3088: 7,13
+            3089: 8,12
+            3090: 9,13
+            3091: 10,12
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: dwarf
           decals:
+<<<<<<< Updated upstream
             2993: 32,19
+=======
+            2988: 32,19
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: face
           decals:
+<<<<<<< Updated upstream
             3248: -15,6
+=======
+            3229: -15,6
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#951710FF'
             id: fireaxe
           decals:
+<<<<<<< Updated upstream
             3373: 29.871565,30.075993
+=======
+            3354: 29.871565,30.075993
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FF00007F'
             id: i
           decals:
+<<<<<<< Updated upstream
             3702: 12.651019,36.660164
             3703: 12.807269,36.628914
             3704: 12.979144,36.660164
@@ -6022,52 +7284,92 @@ entities:
             3710: 12.229144,35.76954
             3723: 11.622622,36.410164
             3724: 11.700747,36.410164
+=======
+            3618: 12.651019,36.660164
+            3619: 12.807269,36.628914
+            3620: 12.979144,36.660164
+            3621: 13.104144,36.660164
+            3623: 12.338519,35.73829
+            3624: 12.479144,35.73829
+            3625: 12.635394,35.73829
+            3626: 12.229144,35.76954
+            3639: 11.622622,36.410164
+            3640: 11.700747,36.410164
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             angle: 0.3490658503988659 rad
             color: '#FF00007F'
             id: i
           decals:
+<<<<<<< Updated upstream
             3712: 13.776019,35.86329
             3713: 13.885394,35.89454
             3714: 13.682269,35.847664
             3715: 14.010394,35.910164
+=======
+            3628: 13.776019,35.86329
+            3629: 13.885394,35.89454
+            3630: 13.682269,35.847664
+            3631: 14.010394,35.910164
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
             color: '#FF00007F'
             id: i
           decals:
+<<<<<<< Updated upstream
             3706: 12.916644,36.597664
             3711: 12.432269,35.660164
+=======
+            3622: 12.916644,36.597664
+            3627: 12.432269,35.660164
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             angle: 1.7453292519943295 rad
             color: '#FF00007F'
             id: i
           decals:
+<<<<<<< Updated upstream
             3717: 13.322894,37.253914
             3718: 13.322894,37.128914
             3719: 13.307269,37.003914
             3720: 13.338519,36.910164
+=======
+            3633: 13.322894,37.253914
+            3634: 13.322894,37.128914
+            3635: 13.307269,37.003914
+            3636: 13.338519,36.910164
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             angle: 1.9198621771937625 rad
             color: '#FF00007F'
             id: i
           decals:
+<<<<<<< Updated upstream
             3716: 13.885394,35.847664
+=======
+            3632: 13.885394,35.847664
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             angle: 3.3161255787892263 rad
             color: '#FF00007F'
             id: i
           decals:
+<<<<<<< Updated upstream
             3721: 13.354144,37.128914
+=======
+            3637: 13.354144,37.128914
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E996'
             id: med
           decals:
+<<<<<<< Updated upstream
             3087: 7,12
             3088: 6,13
             3089: 8,13
@@ -6076,23 +7378,45 @@ entities:
             3229: -7,8
             3230: -7,8
             3231: -7,8
+=======
+            3082: 7,12
+            3083: 6,13
+            3084: 8,13
+            3085: 9,12
+            3086: 10,13
+            3211: -7,8
+            3212: -7,8
+            3213: -7,8
+>>>>>>> Stashed changes
         - node:
             color: '#52B4E99E'
             id: med
           decals:
+<<<<<<< Updated upstream
             3232: -7,8
+=======
+            3214: -7,8
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#1861D5FF'
             id: revolution
           decals:
+<<<<<<< Updated upstream
             3372: 29.965315,29.888493
+=======
+            3353: 29.965315,29.888493
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#951710FF'
             id: skull
           decals:
+<<<<<<< Updated upstream
             3371: 29.23094,30.263493
+=======
+            3352: 29.23094,30.263493
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#500003BD'
@@ -6109,6 +7433,7 @@ entities:
             color: '#9517109B'
             id: splatter
           decals:
+<<<<<<< Updated upstream
             3363: 17.5018,29.685368
             3364: 18.90805,28.544743
             3365: 16.8143,31.529118
@@ -6117,6 +7442,16 @@ entities:
             3368: 17.611176,29.372868
             3369: 16.6268,31.279118
             3370: 16.59555,30.950993
+=======
+            3344: 17.5018,29.685368
+            3345: 18.90805,28.544743
+            3346: 16.8143,31.529118
+            3347: 16.642426,31.466618
+            3348: 17.986176,31.029118
+            3349: 17.611176,29.372868
+            3350: 16.6268,31.279118
+            3351: 16.59555,30.950993
+>>>>>>> Stashed changes
         - node:
             cleanable: True
             color: '#FF0000FF'
@@ -7563,6 +8898,7 @@ entities:
             9: 32896
           1,11:
             0: 30197
+            9: 32768
           -11,8:
             0: 11263
           -10,8:
@@ -7893,7 +9229,11 @@ entities:
             9: 57440
           2,11:
             0: 4369
+<<<<<<< Updated upstream
             9: 224
+=======
+            9: 57568
+>>>>>>> Stashed changes
           3,10:
             0: 3919
             9: 53264
@@ -7986,7 +9326,11 @@ entities:
             0: 39321
           4,10:
             0: 3871
+<<<<<<< Updated upstream
             9: 4096
+=======
+            9: 28672
+>>>>>>> Stashed changes
           5,8:
             0: 64511
             3: 1024
@@ -8301,7 +9645,13 @@ entities:
           12,-8:
             9: 12288
           3,11:
+<<<<<<< Updated upstream
             9: 125
+=======
+            9: 32253
+          4,11:
+            9: 245
+>>>>>>> Stashed changes
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -14465,7 +15815,11 @@ entities:
     - pos: -63.5,-21.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -202415.16
+=======
+    - SecondsUntilStateChange: -202560.28
+>>>>>>> Stashed changes
       state: Opening
       type: Door
     - links:
@@ -14492,7 +15846,11 @@ entities:
     - pos: -63.5,-18.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -202415.16
+=======
+    - SecondsUntilStateChange: -202560.28
+>>>>>>> Stashed changes
       state: Opening
       type: Door
     - links:
@@ -14503,7 +15861,11 @@ entities:
     - pos: -59.5,-18.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -202403.58
+=======
+    - SecondsUntilStateChange: -202548.7
+>>>>>>> Stashed changes
       state: Opening
       type: Door
     - links:
@@ -14514,7 +15876,11 @@ entities:
     - pos: -59.5,-21.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -202403.58
+=======
+    - SecondsUntilStateChange: -202548.7
+>>>>>>> Stashed changes
       state: Opening
       type: Door
     - links:
@@ -27759,7 +29125,7 @@ entities:
       type: Transform
   - uid: 16060
     components:
-    - pos: -7.5,14.5
+    - pos: -7.5,15.5
       parent: 89
       type: Transform
   - uid: 16061
@@ -100809,7 +102175,11 @@ entities:
     - pos: -36.5,33.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -93301.89
+=======
+    - SecondsUntilStateChange: -93447.016
+>>>>>>> Stashed changes
       state: Opening
       type: Door
   - uid: 10351
@@ -100891,7 +102261,11 @@ entities:
     - pos: -27.5,-4.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -95000.125
+=======
+    - SecondsUntilStateChange: -95145.25
+>>>>>>> Stashed changes
       state: Closing
       type: Door
   - uid: 40
@@ -100899,7 +102273,11 @@ entities:
     - pos: -27.5,-5.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -95000.86
+=======
+    - SecondsUntilStateChange: -95145.984
+>>>>>>> Stashed changes
       state: Closing
       type: Door
   - uid: 718
@@ -100927,7 +102305,11 @@ entities:
     - pos: -27.5,-6.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -95001.53
+=======
+    - SecondsUntilStateChange: -95146.66
+>>>>>>> Stashed changes
       state: Closing
       type: Door
   - uid: 4519
@@ -100936,7 +102318,11 @@ entities:
       pos: -27.5,-7.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -57840.387
+=======
+    - SecondsUntilStateChange: -57985.508
+>>>>>>> Stashed changes
       state: Closing
       type: Door
   - uid: 5826
@@ -100969,7 +102355,11 @@ entities:
     - pos: -22.5,33.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -23367.85
+=======
+    - SecondsUntilStateChange: -23512.973
+>>>>>>> Stashed changes
       state: Closing
       type: Door
   - uid: 11376
@@ -101034,7 +102424,11 @@ entities:
     - pos: -27.5,-8.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -95002.56
+=======
+    - SecondsUntilStateChange: -95147.69
+>>>>>>> Stashed changes
       state: Closing
       type: Door
   - uid: 20810
@@ -115509,7 +116903,11 @@ entities:
       pos: 41.5,8.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -190322.31
+=======
+    - SecondsUntilStateChange: -190467.44
+>>>>>>> Stashed changes
       state: Opening
       type: Door
     - links:
@@ -115521,7 +116919,11 @@ entities:
       pos: 41.5,6.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -190322.31
+=======
+    - SecondsUntilStateChange: -190467.44
+>>>>>>> Stashed changes
       state: Opening
       type: Door
     - links:
@@ -115533,7 +116935,11 @@ entities:
       pos: 41.5,9.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -190322.31
+=======
+    - SecondsUntilStateChange: -190467.44
+>>>>>>> Stashed changes
       state: Opening
       type: Door
     - links:
@@ -118906,7 +120312,11 @@ entities:
     - pos: -88.5,24.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -21565.451
+=======
+    - SecondsUntilStateChange: -21710.574
+>>>>>>> Stashed changes
       state: Opening
       type: Door
   - uid: 17902
@@ -119518,6 +120928,21 @@ entities:
     - pos: -12.5,-1.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
+=======
+- proto: SpawnPointChemist
+  entities:
+  - uid: 21736
+    components:
+    - pos: 2.5,7.5
+      parent: 89
+      type: Transform
+  - uid: 21737
+    components:
+    - pos: -3.5,8.5
+      parent: 89
+      type: Transform
+>>>>>>> Stashed changes
 - proto: SpawnPointChiefEngineer
   entities:
   - uid: 8379
@@ -119640,6 +121065,26 @@ entities:
     - pos: 8.5,7.5
       parent: 89
       type: Transform
+  - uid: 21738
+    components:
+    - pos: 2.5,20.5
+      parent: 89
+      type: Transform
+  - uid: 21739
+    components:
+    - pos: -11.5,20.5
+      parent: 89
+      type: Transform
+  - uid: 21740
+    components:
+    - pos: 5.5,36.5
+      parent: 89
+      type: Transform
+  - uid: 21741
+    components:
+    - pos: 7.5,21.5
+      parent: 89
+      type: Transform
 - proto: SpawnPointMedicalIntern
   entities:
   - uid: 11330
@@ -145573,7 +147018,11 @@ entities:
     - pos: -21.5,31.5
       parent: 89
       type: Transform
+<<<<<<< Updated upstream
     - SecondsUntilStateChange: -93946.695
+=======
+    - SecondsUntilStateChange: -94091.82
+>>>>>>> Stashed changes
       state: Opening
       type: Door
   - uid: 10349