Add wielded aliases for the MBR vesets.

Also clean up the mess of research facility references.

1 files changed, 70 insertions, 46 deletions

diff --git a/tile_config.json b/tile_config.json
index 166b4e3..90512f0 100644
--- a/tile_config.json
+++ b/tile_config.json
@@ -20319,63 +20319,36 @@
         {
           "id": [
             "lab_surface_brick_block2A0",
-            "lab_surface_brick_block2C2",
-            "lab_surface_brick_block2A1",
             "lab_surface_brick_block2B0",
-            "lab_surface_brick_block2B1",
             "lab_surface_brick_block2C0",
-            "lab_surface_brick_block2C1",
             "lab_surface_brick_block2D0",
-            "lab_surface_brick_block2D1",
             "lab_surface_brick_block2E0",
-            "lab_surface_brick_block2E1",
             "lab_surface_brick_block3A0",
-            "lab_surface_brick_block3A1",
             "lab_surface_brick_block3B0",
-            "lab_surface_brick_block3B1",
             "lab_surface_brick_block3C0",
-            "lab_surface_brick_block3C1",
-            "lab_surface_brick_block3C2",
             "lab_surface_brick_block3D0",
-            "lab_surface_brick_block3D1",
             "lab_surface_brick_block3E0",
-            "lab_surface_brick_block3E1",
             "lab_surface_brick_block4A0",
-            "lab_surface_brick_block4A1",
             "lab_surface_brick_block4B0",
-            "lab_surface_brick_block4B1",
             "lab_surface_brick_block4C0",
-            "lab_surface_brick_block4C1",
-            "lab_surface_brick_block4C2",
             "lab_surface_brick_block4D0",
-            "lab_surface_brick_block4D1",
             "lab_surface_brick_block4E0",
-            "lab_surface_brick_block4E1",
             "lab_surface_brick_block5A0",
-            "lab_surface_brick_block5A1",
             "lab_surface_brick_block5B0",
-            "lab_surface_brick_block5B1",
             "lab_surface_brick_block5C0",
-            "lab_surface_brick_block5C1",
-            "lab_surface_brick_block5C2",
             "lab_surface_brick_block5D0",
-            "lab_surface_brick_block5D1",
-            "lab_surface_brick_block5E0",
-            "lab_surface_brick_block5E1"
+            "lab_surface_brick_block5E0"
           ],
           "fg": 10885,
           "rotates": false
         },
         {
           "id": [
-            "lab_surface_brick_blockA1",
             "lab_surface_brick_blockB0",
-            "lab_surface_brick_blockB1",
             "lab_surface_brick_blockC0",
             "lab_surface_brick_blockC1",
             "lab_surface_brick_blockC2",
             "lab_surface_brick_blockD0",
-            "lab_surface_brick_blockD1",
             "lab_surface_brick_blockE0",
             "lab_surface_brick_blockE1",
             "lab_surface_parking_blockA0",
@@ -20396,30 +20369,91 @@
         },
         {
           "id": [
+            "lab_surface_brick_blockA1",
             "lab_surface_brick_blockA2",
             "lab_surface_brick_blockA3",
             "lab_surface_brick_blockA4",
+            "lab_surface_brick_blockB1",
             "lab_surface_brick_blockB2",
             "lab_surface_brick_blockB3",
             "lab_surface_brick_blockB4",
             "lab_surface_brick_blockC4",
+            "lab_surface_brick_blockD1",
             "lab_surface_brick_blockD2",
             "lab_surface_brick_blockD3",
             "lab_surface_brick_blockD4",
             "lab_surface_brick_blockE2",
             "lab_surface_brick_blockE3",
             "lab_surface_brick_blockE4",
+            "lab_surface_brick_block2A1",
+            "lab_surface_brick_block2A2",
+            "lab_surface_brick_block2A3",
+            "lab_surface_brick_block2A4",
+            "lab_surface_brick_block2B1",
+            "lab_surface_brick_block2B2",
+            "lab_surface_brick_block2B3",
+            "lab_surface_brick_block2B4",
+            "lab_surface_brick_block2C3",
+            "lab_surface_brick_block2C4",
+            "lab_surface_brick_block2D1",
+            "lab_surface_brick_block2D2",
+            "lab_surface_brick_block2D3",
+            "lab_surface_brick_block2D4",
+            "lab_surface_brick_block2E1",
+            "lab_surface_brick_block2E2",
+            "lab_surface_brick_block2E3",
+            "lab_surface_brick_block2E4",
+            "lab_surface_brick_block3A1",
+            "lab_surface_brick_block3A2",
+            "lab_surface_brick_block3A3",
+            "lab_surface_brick_block3A4",
+            "lab_surface_brick_block3B1",
+            "lab_surface_brick_block3B2",
+            "lab_surface_brick_block3B3",
+            "lab_surface_brick_block3B4",
+            "lab_surface_brick_block3C3",
+            "lab_surface_brick_block3C4",
+            "lab_surface_brick_block3D1",
+            "lab_surface_brick_block3D2",
+            "lab_surface_brick_block3D3",
+            "lab_surface_brick_block3D4",
+            "lab_surface_brick_block3E1",
+            "lab_surface_brick_block3E2",
+            "lab_surface_brick_block3E3",
+            "lab_surface_brick_block3E4",
+            "lab_surface_brick_block4A1",
+            "lab_surface_brick_block4A2",
+            "lab_surface_brick_block4A3",
+            "lab_surface_brick_block4A4",
+            "lab_surface_brick_block4B1",
+            "lab_surface_brick_block4B2",
+            "lab_surface_brick_block4B3",
+            "lab_surface_brick_block4B4",
+            "lab_surface_brick_block4C3",
+            "lab_surface_brick_block4C4",
+            "lab_surface_brick_block4D1",
+            "lab_surface_brick_block4D2",
+            "lab_surface_brick_block4D3",
+            "lab_surface_brick_block4D4",
+            "lab_surface_brick_block4E1",
+            "lab_surface_brick_block4E2",
+            "lab_surface_brick_block4E3",
+            "lab_surface_brick_block4E4",
+            "lab_surface_brick_block5A1",
             "lab_surface_brick_block5A2",
-            "lab_surface_brick_block5B2",
             "lab_surface_brick_block5A3",
             "lab_surface_brick_block5A4",
+            "lab_surface_brick_block5B1",
+            "lab_surface_brick_block5B2",
             "lab_surface_brick_block5B3",
             "lab_surface_brick_block5B4",
             "lab_surface_brick_block5C3",
             "lab_surface_brick_block5C4",
+            "lab_surface_brick_block5D1",
             "lab_surface_brick_block5D2",
             "lab_surface_brick_block5D3",
             "lab_surface_brick_block5D4",
+            "lab_surface_brick_block5E1",
             "lab_surface_brick_block5E2",
             "lab_surface_brick_block5E3",
             "lab_surface_brick_block5E4"
@@ -20682,49 +20716,33 @@
             "irradiator_1_7_roof",
             "irradiator_1_9_roof",
             "lab_surface_brick_block2A0",
-            "lab_surface_brick_block2C2",
-            "lab_surface_brick_block2A1",
             "lab_surface_brick_block2B0",
-            "lab_surface_brick_block2B1",
             "lab_surface_brick_block2C0",
             "lab_surface_brick_block2C1",
+            "lab_surface_brick_block2C2",
             "lab_surface_brick_block2D0",
-            "lab_surface_brick_block2D1",
             "lab_surface_brick_block2E0",
-            "lab_surface_brick_block2E1",
             "lab_surface_brick_block3A0",
-            "lab_surface_brick_block3A1",
             "lab_surface_brick_block3B0",
-            "lab_surface_brick_block3B1",
             "lab_surface_brick_block3C0",
             "lab_surface_brick_block3C1",
             "lab_surface_brick_block3C2",
             "lab_surface_brick_block3D0",
-            "lab_surface_brick_block3D1",
             "lab_surface_brick_block3E0",
-            "lab_surface_brick_block3E1",
             "lab_surface_brick_block4A0",
-            "lab_surface_brick_block4A1",
             "lab_surface_brick_block4B0",
-            "lab_surface_brick_block4B1",
             "lab_surface_brick_block4C0",
             "lab_surface_brick_block4C1",
             "lab_surface_brick_block4C2",
             "lab_surface_brick_block4D0",
-            "lab_surface_brick_block4D1",
             "lab_surface_brick_block4E0",
-            "lab_surface_brick_block4E1",
             "lab_surface_brick_block5A0",
-            "lab_surface_brick_block5A1",
             "lab_surface_brick_block5B0",
-            "lab_surface_brick_block5B1",
             "lab_surface_brick_block5C0",
             "lab_surface_brick_block5C1",
             "lab_surface_brick_block5C2",
             "lab_surface_brick_block5D0",
-            "lab_surface_brick_block5D1",
             "lab_surface_brick_block5E0",
-            "lab_surface_brick_block5E1",
             "mall_b_10",
             "mall_b_19",
             "mall_a_10_roof",
@@ -25798,16 +25816,22 @@
         { "id": "overlay_wielded_mininuke_launcher", "fg": 12174, "rotates": false },
         { "id": "mininuke_mod", "fg": 12175 },
         { "id": "modularvest", "fg": 12176, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_modularvest", "fg": 12176, "rotates": false },
         { "id": "overlay_worn_modularvest", "fg": 12177, "rotates": false },
         { "id": "modularvestceramic", "fg": 12178, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_modularvestceramic", "fg": 12178, "rotates": false },
         { "id": "overlay_worn_modularvestceramic", "fg": 12179, "rotates": false },
         { "id": "modularvesthard", "fg": 12180, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_modularvesthard", "fg": 12180, "rotates": false },
         { "id": "overlay_worn_modularvesthard", "fg": 12181, "rotates": false },
         { "id": "modularvestkevlar", "fg": 12182, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_modularvestkevlar", "fg": 12182, "rotates": false },
         { "id": "overlay_worn_modularvestkevlar", "fg": 12183, "rotates": false },
         { "id": "modularveststeel", "fg": 12184, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_modularveststeel", "fg": 12184, "rotates": false },
         { "id": "overlay_worn_modularveststeel", "fg": 12185, "rotates": false },
         { "id": "modularvestsuper", "fg": 12186, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_modularvestsuper", "fg": 12186, "rotates": false },
         { "id": "overlay_worn_modularvestsuper", "fg": 12187, "rotates": false },
         {
           "id": "vp_mounted_heavy_rail_rifle",