From b9f9777a3c052aa5b96124c30cd1f6062b30b5aa Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 13 Aug 2020 23:23:16 -0700
Subject: Sync with upstream - New Winter Tiles for Legacy (no more fake snow)
 This also fixed the borked explosion effects

---
 14_tiles2_32x32_22365-27564.png         | Bin 3757175 -> 3748383 bytes
 16_tiles_trees_64x80_32765-33164.png    | Bin 1652099 -> 1644990 bytes
 19_tiles3_32x32_36077-36396.png         | Bin 195542 -> 248718 bytes
 1_tiles_32x32_0-5199.png                | Bin 4729171 -> 4725873 bytes
 2_expan_32x32_5200-5391.png             | Bin 47944 -> 48324 bytes
 9_tiles-connected_32x32_16852-22051.png | Bin 5553993 -> 5478860 bytes
 tile_config.json                        | 462 +++++++++++++++++++++-----------
 7 files changed, 309 insertions(+), 153 deletions(-)

diff --git a/14_tiles2_32x32_22365-27564.png b/14_tiles2_32x32_22365-27564.png
index 1ed8cbb..c237772 100644
Binary files a/14_tiles2_32x32_22365-27564.png and b/14_tiles2_32x32_22365-27564.png differ
diff --git a/16_tiles_trees_64x80_32765-33164.png b/16_tiles_trees_64x80_32765-33164.png
index 029263b..dbaa94d 100644
Binary files a/16_tiles_trees_64x80_32765-33164.png and b/16_tiles_trees_64x80_32765-33164.png differ
diff --git a/19_tiles3_32x32_36077-36396.png b/19_tiles3_32x32_36077-36396.png
index 6e4593a..f4a7647 100644
Binary files a/19_tiles3_32x32_36077-36396.png and b/19_tiles3_32x32_36077-36396.png differ
diff --git a/1_tiles_32x32_0-5199.png b/1_tiles_32x32_0-5199.png
index 0ef9b15..a6ddd9c 100644
Binary files a/1_tiles_32x32_0-5199.png and b/1_tiles_32x32_0-5199.png differ
diff --git a/2_expan_32x32_5200-5391.png b/2_expan_32x32_5200-5391.png
index 2a7a352..ff85dc1 100644
Binary files a/2_expan_32x32_5200-5391.png and b/2_expan_32x32_5200-5391.png differ
diff --git a/9_tiles-connected_32x32_16852-22051.png b/9_tiles-connected_32x32_16852-22051.png
index 9418fec..ac83137 100644
Binary files a/9_tiles-connected_32x32_16852-22051.png and b/9_tiles-connected_32x32_16852-22051.png differ
diff --git a/tile_config.json b/tile_config.json
index a5035ba..0638607 100644
--- a/tile_config.json
+++ b/tile_config.json
@@ -5039,7 +5039,7 @@
         { "id": "f_skin_door_o", "fg": 1470, "rotates": false },
         { "id": "f_large_canvas_door_o", "fg": 1470 },
         { "id": "f_cattails", "fg": 1477, "rotates": false },
-        { "id": "f_chair", "fg": 1478, "rotates": false },
+        { "id": "!f_chair", "fg": 1478, "rotates": false },
         { "id": "f_chamomile", "fg": 1479, "rotates": false },
         { "id": "f_coffin_c", "fg": 1480 },
         { "id": "f_coffin_o", "fg": 1481 },
@@ -6441,8 +6441,8 @@
           "rotates": true,
           "multitile": false
         },
-        { "id": "f_autodoc_couch", "fg": 4736, "rotates": true },
-        { "id": "f_autodoc", "fg": 4737, "rotates": true },
+        { "id": "f_autodoc_couch", "fg": 4736, "rotates": false },
+        { "id": "f_autodoc", "fg": 4737, "rotates": false },
         { "id": "beam_scatterer", "fg": 4738, "rotates": false },
         { "id": [ "chime_scrap", "chime_scrap_act" ], "fg": 4739, "rotates": false },
         { "id": "survbowpack", "fg": 4740, "rotates": false },
@@ -8320,7 +8320,7 @@
             { "id": "unconnected", "fg": 3232, "bg": 3215 }
           ]
         },
-        { "id": "t_sand_season_winter", "fg": 992, "rotates": false },
+        { "id": "!t_sand_season_winter", "fg": 992, "rotates": false },
         { "id": "t_sandmound", "fg": 3218, "bg": 1012, "rotates": false },
         { "id": "t_sandmound_season_winter", "fg": 3021, "bg": 992 },
         { "id": "t_low_stairs_begin", "fg": 3257, "rotates": false },
@@ -8342,7 +8342,7 @@
           ]
         },
         {
-          "id": "t_wall_wood_season_winter",
+          "id": "!t_wall_wood_season_winter",
           "fg": 3389,
           "multitile": true,
           "additional_tiles": [
@@ -10666,7 +10666,7 @@
         { "id": "hd_steel_drum", "fg": 4132 },
         { "id": "vp_benginein", "fg": 4132, "rotates": true },
         { "id": "vp_bwheel", "fg": 4132, "rotates": true },
-        { "id": "vp_saddle", "fg": 4133, "rotates": true },
+        { "id": "!vp_saddle", "fg": 4133, "rotates": true },
         { "id": "seat", "fg": 4134, "rotates": false },
         { "id": "vp_seed_drill", "fg": 4136, "rotates": true },
         { "id": "vp_seed_drill_advanced", "fg": 4136, "rotates": true },
@@ -15285,12 +15285,7 @@
         },
         {
           "id": [
-            "t_grass_long_season_winter",
-            "t_flat_roof_season_winter",
-            "t_gutter_south_season_winter",
-            "t_gutter_north_season_winter",
-            "t_gutter_west_season_winter",
-            "t_gutter_east_season_winter"
+            "t_grass_long_season_winter"
           ],
           "fg": 17428,
           "multitile": true,
@@ -15512,7 +15507,7 @@
             { "fg": [ 17513, 17514, 17515, 17516 ], "id": "t_connection" },
             { "fg": [ 17517, 17518 ], "id": "edge" },
             { "fg": [ 17519, 17520, 17521, 17522 ], "id": "end_piece" },
-            { "fg": 17523, "id": "unconnected" }
+            { "fg": [17523, 17523], "id": "unconnected" }
           ],
           "rotates": false
         },
@@ -15538,108 +15533,91 @@
             {
               "fg": 17540,
               "bg": [
-                { "weight": 40, "sprite": 1012 },
-                { "weight": 30, "sprite": 4833 },
-                { "weight": 30, "sprite": 4834 },
-                { "weight": 30, "sprite": 4835 },
-                { "weight": 1, "sprite": 4836 },
-                { "weight": 1, "sprite": 4837 },
-                { "weight": 1, "sprite": 4838 },
-                { "weight": 1, "sprite": 4839 },
-                { "weight": 1, "sprite": 4840 },
-                { "weight": 1, "sprite": 4841 },
-                { "weight": 1, "sprite": 4842 },
-                { "weight": 1, "sprite": 4843 }
+                { "weight": 40, "sprite": 1012 }
               ],
               "id": "center"
             },
             {
               "fg": [ 17541, 17542, 17543, 17544 ],
               "bg": [
-                { "weight": 40, "sprite": 1012 },
-                { "weight": 30, "sprite": 4833 },
-                { "weight": 30, "sprite": 4834 },
-                { "weight": 30, "sprite": 4835 },
-                { "weight": 1, "sprite": 4836 },
-                { "weight": 1, "sprite": 4837 },
-                { "weight": 1, "sprite": 4838 },
-                { "weight": 1, "sprite": 4839 },
-                { "weight": 1, "sprite": 4840 },
-                { "weight": 1, "sprite": 4841 },
-                { "weight": 1, "sprite": 4842 },
-                { "weight": 1, "sprite": 4843 }
+                { "weight": 40, "sprite": 1012 }
               ],
               "id": "corner"
             },
             {
               "fg": [ 17545, 17546, 17547, 17548 ],
               "bg": [
-                { "weight": 40, "sprite": 1012 },
-                { "weight": 30, "sprite": 4833 },
-                { "weight": 30, "sprite": 4834 },
-                { "weight": 30, "sprite": 4835 },
-                { "weight": 1, "sprite": 4836 },
-                { "weight": 1, "sprite": 4837 },
-                { "weight": 1, "sprite": 4838 },
-                { "weight": 1, "sprite": 4839 },
-                { "weight": 1, "sprite": 4840 },
-                { "weight": 1, "sprite": 4841 },
-                { "weight": 1, "sprite": 4842 },
-                { "weight": 1, "sprite": 4843 }
+                { "weight": 40, "sprite": 1012 }
               ],
               "id": "t_connection"
             },
             {
               "fg": [ 17549, 17550 ],
               "bg": [
-                { "weight": 40, "sprite": 1012 },
-                { "weight": 30, "sprite": 4833 },
-                { "weight": 30, "sprite": 4834 },
-                { "weight": 30, "sprite": 4835 },
-                { "weight": 1, "sprite": 4836 },
-                { "weight": 1, "sprite": 4837 },
-                { "weight": 1, "sprite": 4838 },
-                { "weight": 1, "sprite": 4839 },
-                { "weight": 1, "sprite": 4840 },
-                { "weight": 1, "sprite": 4841 },
-                { "weight": 1, "sprite": 4842 },
-                { "weight": 1, "sprite": 4843 }
+                { "weight": 40, "sprite": 1012 }
               ],
               "id": "edge"
             },
             {
               "fg": [ 17551, 17552, 17553, 17554 ],
               "bg": [
-                { "weight": 40, "sprite": 1012 },
-                { "weight": 30, "sprite": 4833 },
-                { "weight": 30, "sprite": 4834 },
-                { "weight": 30, "sprite": 4835 },
-                { "weight": 1, "sprite": 4836 },
-                { "weight": 1, "sprite": 4837 },
-                { "weight": 1, "sprite": 4838 },
-                { "weight": 1, "sprite": 4839 },
-                { "weight": 1, "sprite": 4840 },
-                { "weight": 1, "sprite": 4841 },
-                { "weight": 1, "sprite": 4842 },
-                { "weight": 1, "sprite": 4843 }
+                { "weight": 40, "sprite": 1012 }
               ],
               "id": "end_piece"
             },
             {
               "fg": 17555,
               "bg": [
-                { "weight": 40, "sprite": 1012 },
-                { "weight": 30, "sprite": 4833 },
-                { "weight": 30, "sprite": 4834 },
-                { "weight": 30, "sprite": 4835 },
-                { "weight": 1, "sprite": 4836 },
-                { "weight": 1, "sprite": 4837 },
-                { "weight": 1, "sprite": 4838 },
-                { "weight": 1, "sprite": 4839 },
-                { "weight": 1, "sprite": 4840 },
-                { "weight": 1, "sprite": 4841 },
-                { "weight": 1, "sprite": 4842 },
-                { "weight": 1, "sprite": 4843 }
+                { "weight": 40, "sprite": 1012 }
+              ],
+              "id": "unconnected"
+            }
+          ],
+          "rotates": false
+        },        {
+          "id": [ "t_sand", "t_sand_singing", "t_sanddune" ],
+          "fg": 17540,
+          "multitile": true,
+          "additional_tiles": [
+            {
+              "fg": 17540,
+              "bg": [
+                { "weight": 40, "sprite": 992 }
+              ],
+              "id": "center"
+            },
+            {
+              "fg": [ 17541, 17542, 17543, 17544 ],
+              "bg": [
+                { "weight": 40, "sprite": 992 }
+              ],
+              "id": "corner"
+            },
+            {
+              "fg": [ 17545, 17546, 17547, 17548 ],
+              "bg": [
+                { "weight": 40, "sprite": 992 }
+              ],
+              "id": "t_connection"
+            },
+            {
+              "fg": [ 17549, 17550 ],
+              "bg": [
+                { "weight": 40, "sprite": 992 }
+              ],
+              "id": "edge"
+            },
+            {
+              "fg": [ 17551, 17552, 17553, 17554 ],
+              "bg": [
+                { "weight": 40, "sprite": 992 }
+              ],
+              "id": "end_piece"
+            },
+            {
+              "fg": 17555,
+              "bg": [
+                { "weight": 40, "sprite": 992 }
               ],
               "id": "unconnected"
             }
@@ -16030,9 +16008,9 @@
             { "id": "t_connection", "fg": [ 17977, 17978, 17979, 17980 ]  },
             { "id": "edge", "fg": [ 17981, 17982 ]  },
             { "id": "end_piece", "fg": [ 17983, 17984, 17985, 17986 ]  },
-            { "id": "unconnected", "fg": 17987  }
+            { "id": "unconnected", "fg": [17987]  }
           ],
-          "rotates": false
+          "rotates": true
         },
         {
           "id": [ "f_pool_table" ],
@@ -16058,7 +16036,7 @@
             { "id": "t_connection", "fg": [ 18009, 18010, 18011, 18012 ]  },
             { "id": "edge", "fg": [ 18013, 18014 ]  },
             { "id": "end_piece", "fg": [ 18015, 18016, 18017, 18018 ]  },
-            { "id": "unconnected", "fg": 18019  }
+            { "id": "unconnected", "fg": [18019, 18019]  }
           ],
           "rotates": false
         },
@@ -16072,7 +16050,7 @@
             { "id": "t_connection", "fg": [ 18025, 18026, 18027, 18028 ]  },
             { "id": "edge", "fg": [ 18029, 18030 ]  },
             { "id": "end_piece", "fg": [ 18031, 18032, 18033, 18034 ]  },
-            { "id": "unconnected", "fg": 18035  }
+            { "id": "unconnected", "fg": [18035, 18035]  }
           ],
           "rotates": false
         },
@@ -16086,7 +16064,7 @@
             { "id": "t_connection", "fg": [ 18041, 18042, 18043, 18044 ]  },
             { "id": "edge", "fg": [ 18045, 18046 ]  },
             { "id": "end_piece", "fg": [ 18047, 18048, 18049, 18050 ]  },
-            { "id": "unconnected", "fg": 18051  }
+            { "id": "unconnected", "fg": [18051, 18051]  }
           ],
           "rotates": false
         },
@@ -16100,7 +16078,7 @@
             { "id": "t_connection", "fg": [ 18057, 18058, 18059, 18060 ]  },
             { "id": "edge", "fg": [ 18061, 18062 ]  },
             { "id": "end_piece", "fg": [ 18063, 18064, 18065, 18066 ]  },
-            { "id": "unconnected", "fg": 18067  }
+            { "id": "unconnected", "fg": [18067, 18067]  }
           ],
           "rotates": false
         },
@@ -16147,7 +16125,7 @@
           "rotates": false
         },
         {
-          "id": [ "t_sandbox_season_winter" ],
+          "id": [ "!t_sandbox_season_winter" ],
           "fg": 18100,
           "multitile": true,
           "additional_tiles": [
@@ -16506,7 +16484,7 @@
             { "id": "t_connection", "fg": [ 18521, 18522, 18523, 18524 ]  },
             { "id": "edge", "fg": [ 18525, 18526 ]  },
             { "id": "end_piece", "fg": [ 18527, 18528, 18529, 18530 ]  },
-            { "id": "unconnected", "fg": 18531  }
+            { "id": "unconnected", "fg": [18531, 18531]  }
           ],
           "rotates": false
         },
@@ -16520,7 +16498,7 @@
             { "id": "t_connection", "fg": [ 18537, 18538, 18539, 18540 ]  },
             { "id": "edge", "fg": [ 18541, 18542 ]  },
             { "id": "end_piece", "fg": [ 18543, 18544, 18545, 18546 ]  },
-            { "id": "unconnected", "fg": 18547  }
+            { "id": "unconnected", "fg": [18547, 18547]  }
           ],
           "rotates": false
         },
@@ -16606,7 +16584,7 @@
             { "id": "t_connection", "fg": [ 17571, 17571, 17571, 17571 ]  },
             { "id": "edge", "fg": [ 17571, 17571 ]  },
             { "id": "end_piece", "fg": [ 17571, 17571, 17571, 17571 ]  },
-            { "id": "unconnected", "fg": 23770  }
+            { "id": "unconnected", "fg": [23770, 23770]  }
           ],
           "rotates": false
         },
@@ -16737,7 +16715,7 @@
             { "id": "t_connection", "fg": [ 18761, 18762, 18763, 18764 ]  },
             { "id": "edge", "fg": [ 18765, 18766 ]  },
             { "id": "end_piece", "fg": [ 18767, 18768, 18769, 18770 ]  },
-            { "id": "unconnected", "fg": 18771  }
+            { "id": "unconnected", "fg": [18771, 18771]  }
           ]
         },
         {
@@ -16976,7 +16954,7 @@
             { "id": "t_connection", "fg": [ 19033, 19034, 19035, 19036 ] },
             { "id": "edge", "fg": [ 19037, 19038 ] },
             { "id": "end_piece", "fg": [ 19039, 19040, 19041, 19042 ] },
-            { "id": "unconnected", "fg": 19043 }
+            { "id": "unconnected", "fg": [19043, 19043] }
           ]
         },
         {
@@ -17102,7 +17080,7 @@
             { "id": "t_connection", "fg": [ 19145, 19146, 19147, 19148 ]  },
             { "id": "edge", "fg": [ 19149, 19150 ]  },
             { "id": "end_piece", "fg": [ 19151, 19152, 19153, 19154 ]  },
-            { "id": "unconnected", "fg": 19155  }
+            { "id": "unconnected", "fg": [19155, 19155]  }
           ]
         },
         {
@@ -18030,15 +18008,15 @@
         {
           "id": [ "t_clay_season_winter" ],
           "fg": 20116,
-          "bg": 5131,
+          "bg": 992,
           "multitile": true,
           "additional_tiles": [
-            { "id": "center", "fg": 20116, "bg": 5131 },
-            { "id": "corner", "fg": [ 20117, 20118, 20119, 20120 ], "bg": 5131 },
-            { "id": "t_connection", "fg": [ 20121, 20122, 20123, 20124 ], "bg": 5131 },
-            { "id": "edge", "fg": [ 20125, 20126 ], "bg": 5131 },
-            { "id": "end_piece", "fg": [ 20127, 20128, 20129, 20130 ], "bg": 5131 },
-            { "id": "unconnected", "fg": 20131, "bg": 5131 }
+            { "id": "center", "fg": 20116, "bg": 992 },
+            { "id": "corner", "fg": [ 20117, 20118, 20119, 20120 ], "bg": 992 },
+            { "id": "t_connection", "fg": [ 20121, 20122, 20123, 20124 ], "bg": 992 },
+            { "id": "edge", "fg": [ 20125, 20126 ], "bg": 992 },
+            { "id": "end_piece", "fg": [ 20127, 20128, 20129, 20130 ], "bg": 992 },
+            { "id": "unconnected", "fg": 20131, "bg": 992 }
           ],
           "rotates": true
         },
@@ -18052,7 +18030,7 @@
             { "id": "t_connection", "fg": [ 20137, 20138, 20139, 20140 ]  },
             { "id": "edge", "fg": [ 20141, 20142 ]  },
             { "id": "end_piece", "fg": [ 20143, 20144, 20145, 20146 ]  },
-            { "id": "unconnected", "fg": 20147  }
+            { "id": "unconnected", "fg": [20147, 20147]  }
           ],
           "rotates": true
         },
@@ -18066,7 +18044,7 @@
             { "id": "t_connection", "fg": [ 20153, 20154, 20155, 20156 ]  },
             { "id": "edge", "fg": [ 20157, 20158 ]  },
             { "id": "end_piece", "fg": [ 20159, 20160, 20161, 20162 ]  },
-            { "id": "unconnected", "fg": 20163  }
+            { "id": "unconnected", "fg": [20163, 20163]  }
           ],
           "rotates": true
         },
@@ -18136,7 +18114,7 @@
             { "id": "t_connection", "fg": [ 20233, 20234, 20235, 20236 ]  },
             { "id": "edge", "fg": [ 20237, 20238 ]  },
             { "id": "end_piece", "fg": [ 20239, 20240, 20241, 20242 ]  },
-            { "id": "unconnected", "fg": 20243  }
+            { "id": "unconnected", "fg": [20243, 20243]  }
           ],
           "rotates": true
         },
@@ -18208,7 +18186,7 @@
             { "id": "t_connection", "fg": [ 20313, 20314, 20315, 20316 ]  },
             { "id": "edge", "fg": [ 20317, 20318 ]  },
             { "id": "end_piece", "fg": [ 20319, 20320, 20321, 20322 ]  },
-            { "id": "unconnected", "fg": 20323  }
+            { "id": "unconnected", "fg": [20323, 20323]  }
           ],
           "rotates": true
         },
@@ -18278,7 +18256,7 @@
             { "id": "t_connection", "fg": [ 20393, 20394, 20395, 20396 ]  },
             { "id": "edge", "fg": [ 20397, 20398 ]  },
             { "id": "end_piece", "fg": [ 20399, 20400, 20401, 20402 ]  },
-            { "id": "unconnected", "fg": 20403  }
+            { "id": "unconnected", "fg": [20403, 20403]  }
           ],
           "rotates": true
         },
@@ -18292,7 +18270,7 @@
             { "id": "t_connection", "fg": [ 20409, 20410, 20411, 20412 ]  },
             { "id": "edge", "fg": [ 20413, 20414 ]  },
             { "id": "end_piece", "fg": [ 20415, 20416, 20417, 20418 ]  },
-            { "id": "unconnected", "fg": 20419  }
+            { "id": "unconnected", "fg": [20419, 20419]  }
           ],
           "rotates": true
         },
@@ -18306,7 +18284,7 @@
             { "id": "t_connection", "fg": [ 20425, 20426, 20427, 20428 ]  },
             { "id": "edge", "fg": [ 20429, 20430 ]  },
             { "id": "end_piece", "fg": [ 20431, 20432, 20433, 20434 ]  },
-            { "id": "unconnected", "fg": 20435  }
+            { "id": "unconnected", "fg": [20435, 20435]  }
           ],
           "rotates": true
         },
@@ -18320,7 +18298,7 @@
             { "id": "t_connection", "fg": [ 20441, 20442, 20443, 20444 ]  },
             { "id": "edge", "fg": [ 20445, 20446 ]  },
             { "id": "end_piece", "fg": [ 20447, 20448, 20449, 20450 ]  },
-            { "id": "unconnected", "fg": 20451  }
+            { "id": "unconnected", "fg": [20451, 20451]  }
           ],
           "rotates": true
         },
@@ -18334,7 +18312,7 @@
             { "id": "t_connection", "fg": [ 20457, 20458, 20459, 20460 ]  },
             { "id": "edge", "fg": [ 20461, 20462 ]  },
             { "id": "end_piece", "fg": [ 20463, 20464, 20465, 20466 ]  },
-            { "id": "unconnected", "fg": 20467  }
+            { "id": "unconnected", "fg": [20467, 20467]  }
           ],
           "rotates": true
         },
@@ -18542,6 +18520,35 @@
             { "id": "unconnected", "fg": 20691, "bg": 1012 }
           ],
           "rotates": true
+        }, {
+          "id": [ "t_splitrail_fencegate_c_season_winter" ],
+          "fg": 20660,
+          "bg": 992,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "center", "fg": 20660, "bg": 992 },
+            { "id": "corner", "fg": [ 20661, 20662, 20663, 20664 ], "bg": 992 },
+            { "id": "t_connection", "fg": [ 20665, 20666, 20667, 20668 ], "bg": 992 },
+            { "id": "edge", "fg": [ 20669, 20670 ], "bg": 992 },
+            { "id": "end_piece", "fg": [ 20671, 20672, 20673, 20674 ], "bg": 992 },
+            { "id": "unconnected", "fg": 20675, "bg": 992 }
+          ],
+          "rotates": true
+        },
+        {
+          "id": [ "t_splitrail_fencegate_o_season_winter" ],
+          "fg": 20676,
+          "bg": 992,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "center", "fg": 20676, "bg": 992 },
+            { "id": "corner", "fg": [ 20677, 20678, 20679, 20680 ], "bg": 992 },
+            { "id": "t_connection", "fg": [ 20681, 20682, 20683, 20684 ], "bg": 992 },
+            { "id": "edge", "fg": [ 20685, 20686 ], "bg": 992 },
+            { "id": "end_piece", "fg": [ 20687, 20688, 20689, 20690 ], "bg": 992 },
+            { "id": "unconnected", "fg": 20691, "bg": 992 }
+          ],
+          "rotates": true
         },
         {
           "id": [ "t_grass_tall_season_winter" ],
@@ -18851,7 +18858,7 @@
             { "id": "t_connection", "fg": [ 21017, 21018, 21019, 21020 ] },
             { "id": "edge", "fg": [ 21021, 21022 ] },
             { "id": "end_piece", "fg": [ 21023, 21024, 21025, 21026 ] },
-            { "id": "unconnected", "fg": 21027 }
+            { "id": "unconnected", "fg": [21027, 21027] }
           ],
           "rotates": true
         },
@@ -18868,6 +18875,48 @@
             { "id": "unconnected", "fg": 21043 }
           ],
           "rotates": true
+        },
+        {
+          "id": [ "t_grass_season_winter" ],
+          "fg": 21044,
+		  "bg": 992,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "center", "fg": 21044,
+		  "bg": 992 },
+            { "id": "corner", "fg": [ 21045, 21046, 21047, 21048 ],
+		  "bg": 992 },
+            { "id": "t_connection", "fg": [ 21049, 21050, 21051, 21052 ],
+		  "bg": 992 },
+            { "id": "edge", "fg": [ 21053, 21054 ],
+		  "bg": 992 },
+            { "id": "end_piece", "fg": [ 21055, 21056, 21057, 21058 ],
+		  "bg": 992 },
+            { "id": "unconnected", "fg": 21059,
+		  "bg": 992 }
+          ],
+          "rotates": true
+        },
+        {
+          "id": [ "t_grass_dead_season_winter" ],
+          "fg": 21060,
+		  "bg": 992,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "center", "fg": 21060,
+		  "bg": 992 },
+            { "id": "corner", "fg": [ 21061, 21062, 21063, 21064 ],
+		  "bg": 992 },
+            { "id": "t_connection", "fg": [ 21065, 21066, 21067, 21068 ],
+		  "bg": 992 },
+            { "id": "edge", "fg": [ 21069, 21070 ],
+		  "bg": 992 },
+            { "id": "end_piece", "fg": [ 21071, 21072, 21073, 21074 ],
+		  "bg": 992 },
+            { "id": "unconnected", "fg": 21075,
+		  "bg": 992 }
+          ],
+          "rotates": true
         }
       ]
     },
@@ -21856,10 +21905,11 @@
             "f_sunflower_season_winter",
             "f_mutpoppy_season_winter",
             "f_chicory_season_winter",
-            "f_burdock_season_winter"
+            "f_burdock_season_winter",
+			"f_mustard_season_winter"
           ],
           "fg": 24327,
-          "bg": 19204,
+          "bg": 0,
           "rotates": false
         },
         { "id": "f_cattails_season_winter", "fg": 24328 , "rotates": false },
@@ -27587,7 +27637,7 @@
             { "fg": [ 35757, 35757, 35757, 35757 ], "bg": 35759, "id": "t_connection" },
             { "fg": [ 35757, 35757 ], "bg": 35759, "id": "edge" },
             { "fg": [ 35757, 35757, 35757, 35757 ], "bg": 35759, "id": "end_piece" },
-            { "fg": 35757, "bg": 35759, "id": "unconnected" }
+            { "fg": [35757, 35757], "bg": 35759, "id": "unconnected" }
           ]
         },
         { "id": "mon_triffid_queen", "fg": 35760 , "rotates": false },
@@ -27742,7 +27792,7 @@
         { "id": "mon_slasher_weak", "fg": 35912, "rotates": false },
         { "id": "overlay_worn_afs_hev_helmet_on", "fg": 35913, "rotates": false },
         { "id": "f_fridge", "fg": 35914, "rotates": false },
-        { "id": "vp_basketlg", "fg": 35915, "rotates": false },
+        { "id": ["vp_basketlg", "vp_basketlg_cart"], "fg": 35915, "rotates": false },
         { "id": "t_tarptent_leather", "fg": 35916, "bg": 32977, "rotates": false },
         { "id": "tr_unfinished_construction", "fg": 35917 , "rotates": false },
         { "id": "bottle_glass", "fg": 35918 , "rotates": false },
@@ -28054,38 +28104,38 @@
           "rotates": false
         },
         {
-           "id": ["explosion"],
-           "bg": 972,
-           "rotates": false,
-           "multitile": true,
-           "additional_tiles": [
-             { "id": "corner", "fg": [36125, 36126, 36127, 36128], "bg": 0 },
-             { "id": "edge", "fg": [36129, 36130], "bg": 0 },
-             { "id": "unconnected", "fg": [36143], "bg": 0 }
-           ]
-         },
-         {
-           "id": ["explosion_medium"],
-           "bg": 972,
-           "rotates": false,
-           "multitile": true,
-           "additional_tiles": [
-             { "id": "corner", "fg": [36131, 36132, 36133, 36134], "bg": 0 },
-             { "id": "edge", "fg": [36135, 36136], "bg": 0 },
-             { "id": "unconnected", "fg": [36143], "bg": 0 }
-           ]
-         },
-         {
-           "id": ["explosion_weak"],
-           "bg": 972,
-           "rotates": false,
-           "multitile": true,
-           "additional_tiles": [
-             { "id": "corner", "fg": [36137, 36138, 36139, 36140], "bg": 0 },
-             { "id": "edge", "fg": [36141, 36142], "bg": 0 },
-             { "id": "unconnected", "fg": [36143], "bg": 0 }
-           ]
-         },
+          "id": [ "explosion" ],
+          "bg": 972,
+          "rotates": false,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "corner", "bg": [ 36125, 36126, 36127, 36128 ]  },
+            { "id": "edge", "bg": [ 36129, 36130 ]  },
+            { "id": "unconnected", "bg": [ 36143 ]  }
+          ]
+        },
+        {
+          "id": [ "explosion_medium" ],
+          "bg": 972,
+          "rotates": false,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "corner", "bg": [ 36131, 36132, 36133, 36134 ]  },
+            { "id": "edge", "bg": [ 36135, 36136 ]  },
+            { "id": "unconnected", "bg": [ 36143 ]  }
+          ]
+        },
+        {
+          "id": [ "explosion_weak" ],
+		  "bg": 972,
+          "rotates": false,
+          "multitile": true,
+          "additional_tiles": [
+            { "id": "corner", "bg": [ 36137, 36138, 36139, 36140 ]  },
+            { "id": "edge", "bg": [ 36141, 36142 ]  },
+            { "id": "unconnected", "bg": [ 36143 ]  }
+          ]
+        },
         { "id": [ "bone_knife" ], "fg": 36143 , "rotates": false },
         { "id": [ "overlay_wielded_bone_knife" ], "fg": 36144 , "rotates": false },
         { "id": [ "bullwhip_razor" ], "fg": 36145 , "rotates": false },
@@ -28208,7 +28258,7 @@
         { "id": "f_exodii_scanner", "fg": 36261 },
         { "id": "f_exodii_printer_small", "fg": 36262 },
         { "id": "tr_cot", "fg": 36263 },
-        { "id": "t_milking_machine", "fg": 36264 },
+        { "id": "t_milking_machine", "fg": 36264, "bg": 987},
         { "id": "f_exodii_charger", "fg": 36265 },
         { "id": "f_exodii_charger_cheap", "fg": 36266 },
         { "id": "rock_flaking", "fg": 36267 },
@@ -28217,7 +28267,113 @@
         { "id": "f_chest", "fg": 36270 },
         { "id": "f_foot_locker", "fg": 36271 },
         { "id": "rm13_armor", "fg": 36272 },
-        { "id": "rm13_armor_on", "fg": 36273 }
+        { "id": "rm13_armor_on", "fg": 36273 },
+        {
+          "id": [ "vp_windshield_horizontal_front" ],
+          "fg": 36274,
+          "rotates": true,
+          "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": 36275 } ]
+        },
+        {
+          "id": [ "vp_windshield_ne" ],
+          "fg": 36276,
+          "rotates": true,
+          "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": 36277 } ]
+        },
+        {
+          "id": [ "vp_windshield_nw" ],
+          "fg": 36278,
+          "rotates": true,
+          "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": 36279 } ]
+        },
+        {
+          "id": [ "vp_door_front_left" ],
+          "fg": 36280,
+          "rotates": true,
+          "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": 36281 }, { "id": "open", "fg": 36282 } ]
+        },
+        {
+          "id": [ "vp_door_front_right" ],
+          "fg": 36283,
+          "rotates": true,
+          "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": 36284 }, { "id": "open", "fg": 36285 } ]
+        },
+        {
+          "id": [ "vp_door_rear_left" ],
+          "fg": 36280,
+          "rotates": true,
+          "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": 36281 }, { "id": "open", "fg": 36282 } ]
+        },
+        {
+          "id": [ "vp_door_rear_right" ],
+          "fg": 36283,
+          "rotates": true,
+          "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": 36284 }, { "id": "open", "fg": 36285 } ]
+        },
+        { "id": "f_chair", "fg": [36286, 36287, 36288, 36289], "rotates": true },
+
+        { "id": "f_armchair", "fg": [36290, 36291, 36292, 36293], "rotates": true },
+		        {
+          "id": [ "vp_box_wheelbarrow" ],
+          "fg": [36294, 36295, 36296, 36297],
+          "rotates": true
+        },
+		        {
+          "id": [ "vp_saddle", "vp_saddle_pedal" ],
+          "fg": [36298, 36299, 36300, 36301],
+          "rotates": true,
+		  "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": [36302, 36303, 36304, 36305] } ]
+        },
+		        {
+          "id": [ "vp_wheel_bicycle_rear", "vp_wheel_bicycle_or_rear" ],
+          "fg": [36306, 36307, 36308, 36309],
+          "rotates": true,
+		  "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": [36310, 36311, 36312, 36313] } ]
+        },
+		        {
+          "id": [ "vp_wheel_bicycle", "vp_wheel_bicycle_steerable", "vp_wheel_bicycle_or" ],
+          "fg": [36314, 36315, 36316, 36317],
+          "rotates": true,
+		  "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": [36318, 36319, 36320, 36321]} ]
+        },
+		        {
+          "id": [ "vp_basketsm_bike_rear" ],
+          "fg": [36322, 36323, 36324, 36325],
+          "rotates": true,
+		  "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": [36326, 36327, 36328, 36329]} ]
+        },
+		        {
+          "id": [ "!vp_saddle_motor" ],
+          "fg": [36330, 36331, 36332, 36333],
+          "rotates": true,
+		  "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": [36330, 36331, 36332, 36333]} ]
+        },
+		        {
+          "id": [ "!vp_wheel_motorbike_rear" ],
+          "fg": [36334, 36335, 36336, 36337],
+          "rotates": true,
+		  "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": [36334, 36335, 36336, 36337]} ]
+        },
+		        {
+          "id": [ "vp_saddle_motor" ],
+          "fg": [36342],
+          "rotates": true,
+		  "multitile": true,
+          "additional_tiles": [ { "id": "broken", "fg": [36343]} ]
+        }
       ]
     },
     {
-- 
cgit v1.2.1