Simplify changeset to prepare for port to 2025-06-30 tileset update.

1 files changed, 261 insertions, 203 deletions

diff --git a/tile_config.json b/tile_config.json
index 769dfb4..530956b 100644
--- a/tile_config.json
+++ b/tile_config.json
@@ -16,12 +16,12 @@
         { "id": "overlay_wielded_10mm_fmj", "fg": 1, "rotates": false },
         { "id": "bp_10mm_fmj", "fg": 2, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_10mm_fmj", "fg": 2, "rotates": false },
-        { "id": "reloaded_10mm", "fg": 3, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_10mm", "fg": 3, "rotates": false },
-        { "id": "reloaded_10mm_fmj", "fg": 4, "bg": 10195, "rotates": false },
+        { "id": "reloaded_10mm", "fg": 3, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_10mm_fmj", "fg": 4, "rotates": false },
-        { "id": "120mm_HEAT", "fg": 5, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_120mm_HEAT", "fg": 5, "rotates": false },
+        { "id": "reloaded_10mm_fmj", "fg": 4, "bg": 10195, "rotates": false },
+        { "id": "120mm_HEAT", "fg": 5, "bg": 10195 },
+        { "id": "overlay_wielded_120mm_HEAT", "fg": 5 },
         { "id": "12mm", "fg": 6, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_12mm", "fg": 6, "rotates": false },
         { "id": "20x66_beanbag", "fg": 7, "bg": 10195, "rotates": false },
@@ -52,18 +52,18 @@
         { "id": "overlay_wielded_556", "fg": 19, "rotates": false },
         { "id": "556_incendiary", "fg": 20, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_556_incendiary", "fg": 20, "rotates": false },
-        { "id": "bp_223", "fg": 21, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_bp_223", "fg": 21, "rotates": false },
+        { "id": "bp_223", "fg": 21, "bg": 10195 },
+        { "id": "overlay_wielded_bp_223", "fg": 21 },
         { "id": "bp_556", "fg": 22, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_556", "fg": 22, "rotates": false },
         { "id": "bp_556_incendiary", "fg": 23, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_556_incendiary", "fg": 23, "rotates": false },
-        { "id": "reloaded_223", "fg": 24, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_223", "fg": 24, "rotates": false },
-        { "id": "reloaded_556", "fg": 25, "bg": 10195, "rotates": false },
+        { "id": "reloaded_223", "fg": 24, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_556", "fg": 25, "rotates": false },
-        { "id": "reloaded_556_incendiary", "fg": 26, "bg": 10195, "rotates": false },
+        { "id": "reloaded_556", "fg": 25, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_556_incendiary", "fg": 26, "rotates": false },
+        { "id": "reloaded_556_incendiary", "fg": 26, "bg": 10195, "rotates": false },
         { "id": "22_cb", "fg": 27, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_22_cb", "fg": 27, "rotates": false },
         { "id": "22_cphp", "fg": 28, "bg": 10195, "rotates": false },
@@ -80,18 +80,18 @@
         { "id": "overlay_wielded_bp_22_fmj", "fg": 33, "rotates": false },
         { "id": "bp_22_lr", "fg": 34, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_22_lr", "fg": 34, "rotates": false },
-        { "id": "reloaded_22_cphp", "fg": 35, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_22_cphp", "fg": 35, "rotates": false },
-        { "id": "reloaded_22_fmj", "fg": 36, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_22_fmj", "fg": 36, "rotates": false },
-        { "id": "reloaded_22_lr", "fg": 37, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_22_lr", "fg": 37, "rotates": false },
+        { "id": "reloaded_22_cphp", "fg": 35, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_reloaded_22_fmj", "fg": 36 },
+        { "id": "reloaded_22_fmj", "fg": 36, "bg": 10195 },
+        { "id": "overlay_wielded_reloaded_22_lr", "fg": 37 },
+        { "id": "reloaded_22_lr", "fg": 37, "bg": 10195 },
         { "id": "270win_jsp", "fg": 38, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_270win_jsp", "fg": 38, "rotates": false },
         { "id": "bp_270win_jsp", "fg": 39, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_270win_jsp", "fg": 39, "rotates": false },
-        { "id": "reloaded_270win_jsp", "fg": 40, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_270win_jsp", "fg": 40, "rotates": false },
+        { "id": "reloaded_270win_jsp", "fg": 40, "bg": 10195, "rotates": false },
         { "id": "3006", "fg": 41, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_3006", "fg": 41, "rotates": false },
         { "id": "3006_incendiary", "fg": 42, "bg": 10195, "rotates": false },
@@ -104,26 +104,26 @@
         { "id": "overlay_wielded_bp_3006_incendiary", "fg": 45, "rotates": false },
         { "id": "bp_3006fmj", "fg": 46, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_3006fmj", "fg": 46, "rotates": false },
-        { "id": "reloaded_3006", "fg": 47, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_3006", "fg": 47, "rotates": false },
-        { "id": "reloaded_3006_incendiary", "fg": 42, "bg": 10195, "rotates": false },
+        { "id": "reloaded_3006", "fg": 47, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_3006_incendiary", "fg": 42, "rotates": false },
-        { "id": "reloaded_3006fmj", "fg": 48, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_3006fmj", "fg": 48, "rotates": false },
+        { "id": "reloaded_3006_incendiary", "fg": 42, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_reloaded_3006fmj", "fg": 48 },
+        { "id": "reloaded_3006fmj", "fg": 48, "bg": 10195 },
         { "id": "300_winmag", "fg": 49, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_300_winmag", "fg": 49, "rotates": false },
         { "id": "bp_300_winmag", "fg": 50, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_300_winmag", "fg": 50, "rotates": false },
-        { "id": "reloaded_300_winmag", "fg": 51, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_300_winmag", "fg": 51, "rotates": false },
+        { "id": "reloaded_300_winmag", "fg": 51, "bg": 10195, "rotates": false },
         { "id": "300blk", "fg": 52, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_300blk", "fg": 52, "rotates": false },
         { "id": "300blk_ss", "fg": 53, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_300blk_ss", "fg": 53, "rotates": false },
         { "id": "bp_300blk", "fg": 54, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_300blk", "fg": 54, "rotates": false },
-        { "id": "reloaded_300blk", "fg": 55, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_300blk", "fg": 55, "rotates": false },
+        { "id": "reloaded_300blk", "fg": 55, "bg": 10195, "rotates": false },
         { "id": "308", "fg": 56, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_308", "fg": 57, "rotates": false },
         { "id": "762_51", "fg": 57, "bg": 10195, "rotates": false },
@@ -136,18 +136,18 @@
         { "id": "overlay_wielded_bp_762_51", "fg": 60, "rotates": false },
         { "id": "bp_762_51_incendiary", "fg": 61, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_762_51_incendiary", "fg": 61, "rotates": false },
-        { "id": "reloaded_308", "fg": 62, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_308", "fg": 62, "rotates": false },
-        { "id": "reloaded_762_51", "fg": 63, "bg": 10195, "rotates": false },
+        { "id": "reloaded_308", "fg": 62, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_762_51", "fg": 63, "rotates": false },
-        { "id": "reloaded_762_51_incendiary", "fg": 64, "bg": 10195, "rotates": false },
+        { "id": "reloaded_762_51", "fg": 63, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_762_51_incendiary", "fg": 64, "rotates": false },
+        { "id": "reloaded_762_51_incendiary", "fg": 64, "bg": 10195, "rotates": false },
         { "id": "32_acp", "fg": 65, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_32_acp", "fg": 65, "rotates": false },
         { "id": "bp_32_acp", "fg": 66, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_32_acp", "fg": 66, "rotates": false },
-        { "id": "reloaded_32_acp", "fg": 67, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_32_acp", "fg": 67, "rotates": false },
+        { "id": "overlay_wielded_reloaded_32_acp", "fg": 67 },
+        { "id": "reloaded_32_acp", "fg": 67, "bg": 10195 },
         { "id": "357mag_fmj", "fg": 68, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_357mag_fmj", "fg": 68, "rotates": false },
         { "id": "357mag_jhp", "fg": 69, "bg": 10195, "rotates": false },
@@ -156,10 +156,10 @@
         { "id": "overlay_wielded_bp_357mag_fmj", "fg": 70, "rotates": false },
         { "id": "bp_357mag_jhp", "fg": 71, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_357mag_jhp", "fg": 71, "rotates": false },
-        { "id": "reloaded_357mag_fmj", "fg": 72, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_357mag_fmj", "fg": 72, "rotates": false },
-        { "id": "reloaded_357mag_jhp", "fg": 73, "bg": 10195, "rotates": false },
+        { "id": "reloaded_357mag_fmj", "fg": 72, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_357mag_jhp", "fg": 73, "rotates": false },
+        { "id": "reloaded_357mag_jhp", "fg": 73, "bg": 10195, "rotates": false },
         { "id": "357sig_fmj", "fg": 74, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_357sig_fmj", "fg": 74, "rotates": false },
         { "id": "357sig_jhp", "fg": 75, "bg": 10195, "rotates": false },
@@ -168,28 +168,28 @@
         { "id": "overlay_wielded_bp_357sig_fmj", "fg": 76, "rotates": false },
         { "id": "bp_357sig_jhp", "fg": 77, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_357sig_jhp", "fg": 77, "rotates": false },
-        { "id": "reloaded_357sig_fmj", "fg": 78, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_357sig_fmj", "fg": 78, "rotates": false },
-        { "id": "reloaded_357sig_jhp", "fg": 79, "bg": 10195, "rotates": false },
+        { "id": "reloaded_357sig_fmj", "fg": 78, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_357sig_jhp", "fg": 79, "rotates": false },
-        { "id": "36navy", "fg": 80, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_36navy", "fg": 80, "rotates": false },
-        { "id": "380_FMJ", "fg": 81, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_380_FMJ", "fg": 81, "rotates": false },
-        { "id": "380_JHP", "fg": 82, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_380_JHP", "fg": 82, "rotates": false },
-        { "id": "380_p", "fg": 83, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_380_p", "fg": 83, "rotates": false },
-        { "id": "bp_380_FMJ", "fg": 84, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_bp_380_FMJ", "fg": 84, "rotates": false },
-        { "id": "bp_380_JHP", "fg": 85, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_bp_380_JHP", "fg": 85, "rotates": false },
-        { "id": "reloaded_380_FMJ", "fg": 86, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_380_FMJ", "fg": 86, "rotates": false },
-        { "id": "reloaded_380_JHP", "fg": 87, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_380_JHP", "fg": 87, "rotates": false },
-        { "id": "reloaded_380_p", "fg": 88, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_380_p", "fg": 88, "rotates": false },
+        { "id": "reloaded_357sig_jhp", "fg": 79, "bg": 10195, "rotates": false },
+        { "id": "36navy", "fg": 80, "bg": 10195 },
+        { "id": "overlay_wielded_36navy", "fg": 80 },
+        { "id": "380_FMJ", "fg": 81, "bg": 10195 },
+        { "id": "overlay_wielded_380_FMJ", "fg": 81 },
+        { "id": "380_JHP", "fg": 82, "bg": 10195 },
+        { "id": "overlay_wielded_380_JHP", "fg": 82 },
+        { "id": "380_p", "fg": 83, "bg": 10195 },
+        { "id": "overlay_wielded_380_p", "fg": 83 },
+        { "id": "bp_380_FMJ", "fg": 84, "bg": 10195 },
+        { "id": "overlay_wielded_bp_380_FMJ", "fg": 84 },
+        { "id": "bp_380_JHP", "fg": 85, "bg": 10195 },
+        { "id": "overlay_wielded_bp_380_JHP", "fg": 85 },
+        { "id": "overlay_wielded_reloaded_380_FMJ", "fg": 86 },
+        { "id": "reloaded_380_FMJ", "fg": 86, "bg": 10195 },
+        { "id": "overlay_wielded_reloaded_380_JHP", "fg": 87 },
+        { "id": "reloaded_380_JHP", "fg": 87, "bg": 10195 },
+        { "id": "overlay_wielded_reloaded_380_p", "fg": 88 },
+        { "id": "reloaded_380_p", "fg": 88, "bg": 10195 },
         { "id": "38_fmj", "fg": 89, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_38_fmj", "fg": 89, "rotates": false },
         { "id": "38_special", "fg": 90, "bg": 10195, "rotates": false },
@@ -200,16 +200,16 @@
         { "id": "overlay_wielded_bp_38_fmj", "fg": 92, "rotates": false },
         { "id": "bp_38_special", "fg": 93, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_38_special", "fg": 93, "rotates": false },
-        { "id": "reloaded_38_fmj", "fg": 94, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_38_fmj", "fg": 94, "rotates": false },
-        { "id": "reloaded_38_special", "fg": 95, "bg": 10195, "rotates": false },
+        { "id": "reloaded_38_fmj", "fg": 94, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_38_special", "fg": 95, "rotates": false },
-        { "id": "reloaded_38_super", "fg": 96, "bg": 10195, "rotates": false },
+        { "id": "reloaded_38_special", "fg": 95, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_38_super", "fg": 96, "rotates": false },
+        { "id": "reloaded_38_super", "fg": 96, "bg": 10195, "rotates": false },
         { "id": "38super_fmj", "fg": 97, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_38super_fmj", "fg": 97, "rotates": false },
-        { "id": "reloaded_38super_fmj", "fg": 98, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_38super_fmj", "fg": 98, "rotates": false },
+        { "id": "reloaded_38super_fmj", "fg": 98, "bg": 10195, "rotates": false },
         { "id": "40fmj", "fg": 99, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_40fmj", "fg": 99, "rotates": false },
         { "id": "40sw", "fg": 100, "bg": 10195, "rotates": false },
@@ -218,10 +218,10 @@
         { "id": "overlay_wielded_bp_40fmj", "fg": 101, "rotates": false },
         { "id": "bp_40sw", "fg": 102, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_40sw", "fg": 102, "rotates": false },
-        { "id": "reloaded_40fmj", "fg": 103, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_40fmj", "fg": 103, "rotates": false },
-        { "id": "reloaded_40sw", "fg": 104, "bg": 10195, "rotates": false },
+        { "id": "reloaded_40fmj", "fg": 103, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_40sw", "fg": 104, "rotates": false },
+        { "id": "reloaded_40sw", "fg": 104, "bg": 10195, "rotates": false },
         { "id": "40mm_acidbomb", "fg": 105, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_40mm_acidbomb", "fg": 105, "rotates": false },
         { "id": "40mm_beanbag", "fg": 106, "bg": 10195, "rotates": false },
@@ -240,8 +240,8 @@
         { "id": "overlay_wielded_40mm_teargas", "fg": 112, "rotates": false },
         { "id": "40mm_toxicgas", "fg": 113, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_40mm_toxicgas", "fg": 113, "rotates": false },
-        { "id": "reloaded_40mm_shot", "fg": 114, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_40mm_shot", "fg": 114, "rotates": false },
+        { "id": "reloaded_40mm_shot", "fg": 114, "bg": 10195, "rotates": false },
         { "id": "40x46mm_buckshot_m118", "fg": 115, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_40x46mm_buckshot_m118", "fg": 115, "rotates": false },
         { "id": "40x46mm_buckshot_m199", "fg": 116, "bg": 10195, "rotates": false },
@@ -296,8 +296,8 @@
         { "id": "overlay_wielded_bp_40x53mm_slug_m169", "fg": 140, "rotates": false },
         { "id": "410shot_000", "fg": 141, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_410shot_000", "fg": 141, "rotates": false },
-        { "id": "reloaded_410shot_000", "fg": 142, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_410shot_000", "fg": 142, "rotates": false },
+        { "id": "reloaded_410shot_000", "fg": 142, "bg": 10195, "rotates": false },
         { "id": "44fmj", "fg": 143, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_44fmj", "fg": 143, "rotates": false },
         { "id": "44magnum", "fg": 144, "bg": 10195, "rotates": false },
@@ -306,32 +306,32 @@
         { "id": "overlay_wielded_bp_44fmj", "fg": 145, "rotates": false },
         { "id": "bp_44magnum", "fg": 146, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_44magnum", "fg": 146, "rotates": false },
-        { "id": "reloaded_44fmj", "fg": 147, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_44fmj", "fg": 147, "rotates": false },
-        { "id": "reloaded_44magnum", "fg": 148, "bg": 10195, "rotates": false },
+        { "id": "reloaded_44fmj", "fg": 147, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_44magnum", "fg": 148, "rotates": false },
-        { "id": "44army", "fg": 149, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_44army", "fg": 149, "rotates": false },
+        { "id": "reloaded_44magnum", "fg": 148, "bg": 10195, "rotates": false },
+        { "id": "44army", "fg": 149, "bg": 10195 },
+        { "id": "overlay_wielded_44army", "fg": 149 },
         { "id": "454_Casull", "fg": 150, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_454_Casull", "fg": 150, "rotates": false },
         { "id": "bp_454_Casull", "fg": 151, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_454_Casull", "fg": 151, "rotates": false },
-        { "id": "reloaded_454_Casull", "fg": 152, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_454_Casull", "fg": 152, "rotates": false },
+        { "id": "reloaded_454_Casull", "fg": 152, "bg": 10195, "rotates": false },
         { "id": "4570_low", "fg": 153, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_4570_low", "fg": 153, "rotates": false },
         { "id": "4570_pen", "fg": 154, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_4570_pen", "fg": 154, "rotates": false },
         { "id": "4570_sp", "fg": 155, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_4570_sp", "fg": 155, "rotates": false },
-        { "id": "reloaded_4570_bp", "fg": 156, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_4570_bp", "fg": 156, "rotates": false },
-        { "id": "reloaded_4570_low", "fg": 157, "bg": 10195, "rotates": false },
+        { "id": "reloaded_4570_bp", "fg": 156, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_4570_low", "fg": 157, "rotates": false },
-        { "id": "reloaded_4570_pen", "fg": 158, "bg": 10195, "rotates": false },
+        { "id": "reloaded_4570_low", "fg": 157, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_4570_pen", "fg": 158, "rotates": false },
-        { "id": "reloaded_4570_sp", "fg": 159, "bg": 10195, "rotates": false },
+        { "id": "reloaded_4570_pen", "fg": 158, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_4570_sp", "fg": 159, "rotates": false },
+        { "id": "reloaded_4570_sp", "fg": 159, "bg": 10195, "rotates": false },
         { "id": "45_acp", "fg": 160, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_45_acp", "fg": 160, "rotates": false },
         { "id": "45_jhp", "fg": 161, "bg": 10195, "rotates": false },
@@ -342,18 +342,18 @@
         { "id": "overlay_wielded_bp_45_acp", "fg": 163, "rotates": false },
         { "id": "bp_45_jhp", "fg": 164, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_45_jhp", "fg": 164, "rotates": false },
-        { "id": "reloaded_45_acp", "fg": 165, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_45_acp", "fg": 165, "rotates": false },
-        { "id": "reloaded_45_jhp", "fg": 166, "bg": 10195, "rotates": false },
+        { "id": "reloaded_45_acp", "fg": 165, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_45_jhp", "fg": 166, "rotates": false },
-        { "id": "reloaded_45_super", "fg": 167, "bg": 10195, "rotates": false },
+        { "id": "reloaded_45_jhp", "fg": 166, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_45_super", "fg": 167, "rotates": false },
+        { "id": "reloaded_45_super", "fg": 167, "bg": 10195, "rotates": false },
         { "id": "45colt_jhp", "fg": 168, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_45colt_jhp", "fg": 168, "rotates": false },
         { "id": "bp_45colt_jhp", "fg": 169, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_45colt_jhp", "fg": 169, "rotates": false },
-        { "id": "reloaded_45colt_jhp", "fg": 170, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_45colt_jhp", "fg": 170, "rotates": false },
+        { "id": "reloaded_45colt_jhp", "fg": 170, "bg": 10195, "rotates": false },
         { "id": "460_fmj", "fg": 171, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_460_fmj", "fg": 171, "rotates": false },
         { "id": "460_rowland", "fg": 172, "bg": 10195, "rotates": false },
@@ -362,22 +362,34 @@
         { "id": "overlay_wielded_bp_460_fmj", "fg": 173, "rotates": false },
         { "id": "bp_460_rowland", "fg": 174, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_460_rowland", "fg": 174, "rotates": false },
-        { "id": "reloaded_460_fmj", "fg": 175, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_460_fmj", "fg": 175, "rotates": false },
-        { "id": "reloaded_460_rowland", "fg": 176, "bg": 10195, "rotates": false },
+        { "id": "reloaded_460_fmj", "fg": 175, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_460_rowland", "fg": 176, "rotates": false },
+        { "id": "reloaded_460_rowland", "fg": 176, "bg": 10195, "rotates": false },
         { "id": "46mm", "fg": 177, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_46mm", "fg": 177, "rotates": false },
+        { "id": "46mm_fmj", "fg": 177, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_46mm_fmj", "fg": 177, "rotates": false },
+        { "id": "46mm_shp", "fg": 177, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_46mm_shp", "fg": 177, "rotates": false },
         { "id": "bp_46mm", "fg": 178, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_46mm", "fg": 178, "rotates": false },
-        { "id": "reloaded_46mm", "fg": 179, "bg": 10195, "rotates": false },
+        { "id": "bp_46mm_fmj", "fg": 178, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_bp_46mm_fmj", "fg": 178, "rotates": false },
+        { "id": "bp_46mm_shp", "fg": 178, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_bp_46mm_shp", "fg": 178, "rotates": false },
         { "id": "overlay_wielded_reloaded_46mm", "fg": 179, "rotates": false },
+        { "id": "reloaded_46mm", "fg": 179, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_reloaded_46mm_fmj", "fg": 179, "rotates": false },
+        { "id": "reloaded_46mm_fmj", "fg": 179, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_reloaded_46mm_shp", "fg": 179, "rotates": false },
+        { "id": "reloaded_46mm_shp", "fg": 179, "bg": 10195, "rotates": false },
         { "id": "500_Magnum", "fg": 180, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_500_Magnum", "fg": 180, "rotates": false },
         { "id": "bp_500_Magnum", "fg": 181, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_500_Magnum", "fg": 181, "rotates": false },
-        { "id": "reloaded_500_Magnum", "fg": 182, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_500_Magnum", "fg": 182, "rotates": false },
+        { "id": "reloaded_500_Magnum", "fg": 182, "bg": 10195, "rotates": false },
         { "id": "50_incendiary", "fg": 183, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_50_incendiary", "fg": 183, "rotates": false },
         { "id": "50_mk211", "fg": 184, "bg": 10195, "rotates": false },
@@ -394,12 +406,12 @@
         { "id": "overlay_wielded_bp_50match", "fg": 189, "rotates": false },
         { "id": "bp_50ss", "fg": 190, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_50ss", "fg": 190, "rotates": false },
-        { "id": "reloaded_50_incendiary", "fg": 191, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_50_incendiary", "fg": 191, "rotates": false },
-        { "id": "reloaded_50bmg", "fg": 192, "bg": 10195, "rotates": false },
+        { "id": "reloaded_50_incendiary", "fg": 191, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_50bmg", "fg": 192, "rotates": false },
-        { "id": "reloaded_50ss", "fg": 193, "bg": 10195, "rotates": false },
+        { "id": "reloaded_50bmg", "fg": 192, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_50ss", "fg": 193, "rotates": false },
+        { "id": "reloaded_50ss", "fg": 193, "bg": 10195, "rotates": false },
         { "id": "545", "fg": 194, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_545", "fg": 194, "rotates": false },
         { "id": "545_ap", "fg": 195, "bg": 10195, "rotates": false },
@@ -408,38 +420,38 @@
         { "id": "overlay_wielded_bp_545", "fg": 196, "rotates": false },
         { "id": "bp_545_ap", "fg": 197, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_545_ap", "fg": 197, "rotates": false },
-        { "id": "reloaded_545", "fg": 198, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_545", "fg": 198, "rotates": false },
-        { "id": "reloaded_545_ap", "fg": 199, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_545_ap", "fg": 199, "rotates": false },
+        { "id": "overlay_wielded_reloaded_545", "fg": 198 },
+        { "id": "reloaded_545", "fg": 198, "bg": 10195 },
+        { "id": "overlay_wielded_reloaded_545_ap", "fg": 199 },
+        { "id": "reloaded_545_ap", "fg": 199, "bg": 10195 },
         { "id": "57mm", "fg": 200, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_57mm", "fg": 200, "rotates": false },
         { "id": "bp_57mm", "fg": 201, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_57mm", "fg": 201, "rotates": false },
-        { "id": "reloaded_57mm", "fg": 202, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_57mm", "fg": 202, "rotates": false },
+        { "id": "reloaded_57mm", "fg": 202, "bg": 10195, "rotates": false },
         { "id": "5x50dart", "fg": 203, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_5x50dart", "fg": 203, "rotates": false },
         { "id": "5x50heavy", "fg": 204, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_5x50heavy", "fg": 204, "rotates": false },
-        { "id": "reloaded_5x50dart", "fg": 205, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_5x50dart", "fg": 205, "rotates": false },
+        { "id": "reloaded_5x50dart", "fg": 205, "bg": 10195, "rotates": false },
         { "id": "66mm_HEAT", "fg": 206, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_66mm_HEAT", "fg": 206, "rotates": false },
         { "id": "m235tpa", "fg": 207, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_m235tpa", "fg": 207, "rotates": false },
-        { "id": "700nx", "fg": 208, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_700nx", "fg": 208, "rotates": false },
-        { "id": "bp_700nx", "fg": 209, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_bp_700nx", "fg": 209, "rotates": false },
-        { "id": "reloaded_700nx", "fg": 210, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_700nx", "fg": 210, "rotates": false },
+        { "id": "700nx", "fg": 208, "bg": 10195 },
+        { "id": "overlay_wielded_700nx", "fg": 208 },
+        { "id": "bp_700nx", "fg": 209, "bg": 10195 },
+        { "id": "overlay_wielded_bp_700nx", "fg": 209 },
+        { "id": "overlay_wielded_reloaded_700nx", "fg": 210 },
+        { "id": "reloaded_700nx", "fg": 210, "bg": 10195 },
         { "id": "762_54R", "fg": 211, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_762_54R", "fg": 211, "rotates": false },
         { "id": "bp_762_54R", "fg": 212, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_762_54R", "fg": 212, "rotates": false },
-        { "id": "reloaded_762_54R", "fg": 213, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_762_54R", "fg": 213, "rotates": false },
+        { "id": "overlay_wielded_reloaded_762_54R", "fg": 213 },
+        { "id": "reloaded_762_54R", "fg": 213, "bg": 10195 },
         { "id": "762_m43", "fg": 214, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_762_m43", "fg": 214, "rotates": false },
         { "id": "762_m87", "fg": 215, "bg": 10195, "rotates": false },
@@ -448,20 +460,20 @@
         { "id": "overlay_wielded_bp_762_m43", "fg": 216, "rotates": false },
         { "id": "bp_762_m87", "fg": 217, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_762_m87", "fg": 217, "rotates": false },
-        { "id": "reloaded_762_m43", "fg": 218, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_762_m43", "fg": 218, "rotates": false },
-        { "id": "reloaded_762_m87", "fg": 219, "bg": 10195, "rotates": false },
+        { "id": "reloaded_762_m43", "fg": 218, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_762_m87", "fg": 219, "rotates": false },
+        { "id": "reloaded_762_m87", "fg": 219, "bg": 10195, "rotates": false },
         { "id": "762_25", "fg": 220, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_762_25", "fg": 220, "rotates": false },
-        { "id": "762_25hot", "fg": 221, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_762_25hot", "fg": 221, "rotates": false },
-        { "id": "762_25typeP", "fg": 222, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_762_25typeP", "fg": 222, "rotates": false },
+        { "id": "762_25hot", "fg": 221, "bg": 10195 },
+        { "id": "overlay_wielded_762_25hot", "fg": 221 },
+        { "id": "762_25typeP", "fg": 222, "bg": 10195 },
+        { "id": "overlay_wielded_762_25typeP", "fg": 222 },
         { "id": "bp_762_25", "fg": 223, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_762_25", "fg": 223, "rotates": false },
-        { "id": "reloaded_762_25", "fg": 224, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_762_25", "fg": 224, "rotates": false },
+        { "id": "overlay_wielded_reloaded_762_25", "fg": 224 },
+        { "id": "reloaded_762_25", "fg": 224, "bg": 10195 },
         { "id": "84x246mm_he", "fg": 225, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_84x246mm_he", "fg": 225, "rotates": false },
         { "id": "84x246mm_hedp", "fg": 226, "bg": 10195, "rotates": false },
@@ -494,14 +506,14 @@
         { "id": "overlay_wielded_bp_9mm", "fg": 239, "rotates": false },
         { "id": "bp_9mmfmj", "fg": 240, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_9mmfmj", "fg": 240, "rotates": false },
-        { "id": "reloaded_9mm", "fg": 241, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_9mm", "fg": 241, "rotates": false },
-        { "id": "reloaded_9mmP", "fg": 242, "bg": 10195, "rotates": false },
+        { "id": "reloaded_9mm", "fg": 241, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_9mmP", "fg": 242, "rotates": false },
-        { "id": "reloaded_9mmP2", "fg": 243, "bg": 10195, "rotates": false },
+        { "id": "reloaded_9mmP", "fg": 242, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_9mmP2", "fg": 243, "rotates": false },
-        { "id": "reloaded_9mmfmj", "fg": 244, "bg": 10195, "rotates": false },
+        { "id": "reloaded_9mmP2", "fg": 243, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_9mmfmj", "fg": 244, "rotates": false },
+        { "id": "reloaded_9mmfmj", "fg": 244, "bg": 10195, "rotates": false },
         { "id": "9x18mm", "fg": 245, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_9x18mm", "fg": 245, "rotates": false },
         { "id": "9x18mmP2", "fg": 246, "bg": 10195, "rotates": false },
@@ -512,27 +524,30 @@
         { "id": "overlay_wielded_bp_9x18mm", "fg": 248, "rotates": false },
         { "id": "bp_9x18mmfmj", "fg": 249, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_9x18mmfmj", "fg": 249, "rotates": false },
-        { "id": "reloaded_9x18mm", "fg": 250, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_9x18mm", "fg": 250, "rotates": false },
-        { "id": "reloaded_9x18mmP2", "fg": 251, "bg": 10195, "rotates": false },
+        { "id": "reloaded_9x18mm", "fg": 250, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_9x18mmP2", "fg": 251, "rotates": false },
-        { "id": "reloaded_9x18mmfmj", "fg": 252, "bg": 10195, "rotates": false },
+        { "id": "reloaded_9x18mmP2", "fg": 251, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_9x18mmfmj", "fg": 252, "rotates": false },
-        { "id": "atgm_heat", "fg": 253, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_atgm_heat", "fg": 253, "rotates": false },
+        { "id": "reloaded_9x18mmfmj", "fg": 252, "bg": 10195, "rotates": false },
+        { "id": "atgm_heat", "fg": 253, "bg": 10195 },
+        { "id": "overlay_wielded_atgm_heat", "fg": 253 },
         { "id": "barb_paralysis", "fg": 254, "bg": 10195, "rotates": true },
         { "id": "overlay_wielded_barb_paralysis", "fg": 254, "rotates": true },
         { "id": "cannon_shot", "fg": 255, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_cannon_shot", "fg": 255, "rotates": false },
-        { "id": "gas_chloramine", "fg": 256, "bg": 10195, "rotates": false },
-        { "id": "gas_fungicidal", "fg": 257, "bg": 10195, "rotates": false },
-        { "id": "gas_insecticidal", "fg": 258, "bg": 10195, "rotates": false },
+        { "id": "gas_chloramine", "fg": 256 },
+        { "id": "overlay_wielded_gas_chloramine", "fg": 256 },
+        { "id": "gas_fungicidal", "fg": 257 },
+        { "id": "overlay_wielded_gas_fungicidal", "fg": 257 },
+        { "id": "gas_insecticidal", "fg": 258, "rotates": false },
+        { "id": "overlay_wielded_gas_insecticidal", "fg": 258, "rotates": false },
         { "id": "123ln", "fg": 259, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_123ln", "fg": 259, "rotates": false },
-        { "id": "flintlock_ammo", "fg": 260, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_flintlock_ammo", "fg": 260, "rotates": false },
-        { "id": "flintlock_shot", "fg": 261, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_flintlock_shot", "fg": 261, "rotates": false },
+        { "id": "flintlock_ammo", "fg": 260, "bg": 10195 },
+        { "id": "overlay_wielded_flintlock_ammo", "fg": 260 },
+        { "id": "flintlock_shot", "fg": 261, "bg": 10195 },
+        { "id": "overlay_wielded_flintlock_shot", "fg": 261 },
         { "id": "glowstick_juice", "fg": 262, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_glowstick_juice", "fg": 262, "rotates": false },
         { "id": "explosive_hm_rocket", "fg": 263, "bg": 10195, "rotates": false },
@@ -541,15 +556,15 @@
         { "id": "overlay_wielded_incendiary_hm_rocket", "fg": 264, "rotates": false },
         { "id": "spiked_rocket", "fg": 265, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_spiked_rocket", "fg": 265, "rotates": false },
-        { "id": "rebar_rail", "fg": 266, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_rebar_rail", "fg": 266, "rotates": false },
-        { "id": "steel_rail", "fg": 267, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_steel_rail", "fg": 267, "rotates": false },
-        { "id": "combatnail", "fg": 268, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_combatnail", "fg": 268, "rotates": false },
+        { "id": "overlay_wielded_rebar_rail", "fg": 266 },
+        { "id": "rebar_rail", "fg": 266, "bg": 10195 },
+        { "id": "overlay_wielded_steel_rail", "fg": 267 },
+        { "id": "steel_rail", "fg": 267, "bg": 10195 },
+        { "id": "combatnail", "fg": 268, "bg": 10195 },
+        { "id": "overlay_wielded_combatnail", "fg": 268 },
         { "id": "nail", "fg": 269, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_nail", "fg": 269, "rotates": false },
-        { "id": "paintball", "fg": 270, "bg": 10195, "rotates": false },
+        { "id": "paintball", "fg": 270, "bg": 10195 },
         { "id": "overlay_wielded_paintball", "fg": 270, "rotates": false },
         { "id": "RPG_die", "fg": 271, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_RPG_die", "fg": 271, "rotates": false },
@@ -559,10 +574,10 @@
         { "id": "overlay_wielded_marble", "fg": 273, "rotates": false },
         { "id": "metal_RPG_die", "fg": 274, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_metal_RPG_die", "fg": 274, "rotates": false },
-        { "id": "pebble", "fg": 275, "bg": 10195, "rotates": false },
+        { "id": "pebble", "fg": 275, "bg": 10195 },
         { "id": "overlay_wielded_pebble", "fg": 275, "rotates": false },
-        { "id": "pebble_clay", "fg": 276, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_pebble_clay", "fg": 276, "rotates": false },
+        { "id": "overlay_wielded_pebble_clay", "fg": 276 },
+        { "id": "pebble_clay", "fg": 276, "bg": 10195 },
         { "id": "RPG-7_ammo", "fg": 277, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_RPG-7_ammo", "fg": 277, "rotates": false },
         { "id": "RPG-7_og7v", "fg": 278, "bg": 10195, "rotates": false },
@@ -575,62 +590,66 @@
         { "id": "overlay_wielded_bp_shot_00", "fg": 281, "rotates": false },
         { "id": "bp_shot_bird", "fg": 282, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_shot_bird", "fg": 282, "rotates": false },
-        { "id": "bp_shot_dragon", "fg": 283, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_bp_shot_dragon", "fg": 283, "rotates": false },
+        { "id": "bp_shot_dragon", "fg": 283, "bg": 10195 },
+        { "id": "overlay_wielded_bp_shot_dragon", "fg": 283 },
         { "id": "bp_shot_flechette", "fg": 284, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_bp_shot_flechette", "fg": 284, "rotates": false },
-        { "id": "bp_shot_scrap", "fg": 285, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_bp_shot_scrap", "fg": 285, "rotates": false },
-        { "id": "bp_shot_slug", "fg": 286, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_bp_shot_slug", "fg": 286, "rotates": false },
-        { "id": "reloaded_shot_00", "fg": 287, "bg": 10195, "rotates": false },
+        { "id": "bp_shot_scrap", "fg": 285, "bg": 10195 },
+        { "id": "overlay_wielded_bp_shot_scrap", "fg": 285 },
+        { "id": "bp_shot_slug", "fg": 286, "bg": 10195 },
+        { "id": "overlay_wielded_bp_shot_slug", "fg": 286 },
         { "id": "overlay_wielded_reloaded_shot_00", "fg": 287, "rotates": false },
-        { "id": "reloaded_shot_bird", "fg": 288, "bg": 10195, "rotates": false },
+        { "id": "reloaded_shot_00", "fg": 287, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_reloaded_shot_bird", "fg": 288, "rotates": false },
-        { "id": "reloaded_shot_dragon", "fg": 289, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_reloaded_shot_dragon", "fg": 289, "rotates": false },
-        { "id": "reloaded_shot_flechette", "fg": 290, "bg": 10195, "rotates": false },
+        { "id": "reloaded_shot_bird", "fg": 288, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_reloaded_shot_dragon", "fg": 289 },
+        { "id": "reloaded_shot_dragon", "fg": 289, "bg": 10195 },
         { "id": "overlay_wielded_reloaded_shot_flechette", "fg": 290 },
-        { "id": "reloaded_shot_slug", "fg": 291, "bg": 10195, "rotates": false },
+        { "id": "reloaded_shot_flechette", "fg": 290, "bg": 10195 },
         { "id": "overlay_wielded_reloaded_shot_slug", "fg": 291, "rotates": false },
-        { "id": "shot_00", "fg": 292, "bg": 10195, "rotates": false },
+        { "id": "reloaded_shot_slug", "fg": 291, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_shot_00", "fg": 292, "rotates": false },
-        { "id": "shot_beanbag", "fg": 293, "bg": 10195, "rotates": false },
+        { "id": "shot_00", "fg": 292, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_shot_beanbag", "fg": 293, "rotates": false },
-        { "id": "shot_bird", "fg": 294, "bg": 10195, "rotates": false },
+        { "id": "shot_beanbag", "fg": 293, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_shot_bird", "fg": 294, "rotates": false },
-        { "id": "shot_dragon", "fg": 283, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_shot_dragon", "fg": 283, "rotates": false },
-        { "id": "shot_flechette", "fg": 295, "bg": 10195, "rotates": false },
+        { "id": "shot_bird", "fg": 294, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_shot_dragon", "fg": 283 },
+        { "id": "shot_dragon", "fg": 283, "bg": 10195 },
         { "id": "overlay_wielded_shot_flechette", "fg": 295, "rotates": false },
-        { "id": "shot_he", "fg": 296, "bg": 10195, "rotates": false },
+        { "id": "shot_flechette", "fg": 295, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_shot_he", "fg": 296, "rotates": false },
-        { "id": "shot_scrap", "fg": 297, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_shot_scrap", "fg": 297, "rotates": false },
-        { "id": "shot_slug", "fg": 298, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_shot_slug", "fg": 298, "rotates": false },
-        { "id": "shot_paper_00", "fg": 299, "bg": 10195, "rotates": false },
+        { "id": "shot_he", "fg": 296, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_shot_scrap", "fg": 297 },
+        { "id": "shot_scrap", "fg": 297, "bg": 10195 },
+        { "id": "overlay_wielded_shot_slug", "fg": 298 },
+        { "id": "shot_slug", "fg": 298, "bg": 10195 },
         { "id": "overlay_wielded_shot_paper_00", "fg": 299, "rotates": false },
-        { "id": "shot_paper_bird", "fg": 300, "bg": 10195, "rotates": false },
+        { "id": "shot_paper_00", "fg": 299, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_shot_paper_bird", "fg": 300, "rotates": false },
-        { "id": "shot_paper_dragon", "fg": 301, "bg": 10195, "rotates": false },
+        { "id": "shot_paper_bird", "fg": 300, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_shot_paper_dragon", "fg": 301, "rotates": false },
-        { "id": "shot_paper_slug", "fg": 302, "bg": 10195, "rotates": false },
+        { "id": "shot_paper_dragon", "fg": 301, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_shot_paper_slug", "fg": 302, "rotates": false },
-        { "id": "signal_flare", "fg": 303, "bg": 10195, "rotates": false },
+        { "id": "shot_paper_slug", "fg": 302, "bg": 10195, "rotates": false },
+        { "id": "signal_flare", "fg": 303, "bg": 10195 },
         { "id": "overlay_wielded_signal_flare", "fg": 303, "rotates": false },
-        { "id": "oxyacetylene", "fg": 304, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_oxyacetylene", "fg": 304 },
+        { "id": "oxyacetylene", "fg": 304, "bg": 10195 },
         { "id": "RTG_coffee", "fg": 305, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_RTG_coffee", "fg": 305, "rotates": false },
         { "id": "aerosol_paint", "fg": 306, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_aerosol_paint", "fg": 306, "rotates": false },
         { "id": "albuterol", "fg": 307, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_albuterol", "fg": 307, "rotates": false },
-        { "id": "aluminum_foil", "fg": 308, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_aluminum_foil", "fg": 308, "rotates": false },
-        { "id": "ampoule", "fg": 309, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_ampoule", "fg": 309, "rotates": false },
+        { "id": "aluminum_foil", "fg": 308, "bg": 10195 },
+        { "id": "overlay_wielded_aluminum_foil", "fg": 308 },
+        { "id": "ampoule", "fg": 309, "bg": 10195 },
+        { "id": "overlay_wielded_ampoule", "fg": 309 },
         { "id": "anesthetic", "fg": 310, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_anesthetic", "fg": 310, "rotates": false },
         { "id": "avgas", "fg": 311, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_avgas", "fg": 311, "rotates": false },
         { "id": "battery", "fg": 312, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_battery", "fg": 312, "rotates": false },
         { "id": "bb", "fg": 313, "bg": 10195, "rotates": false },
@@ -638,10 +657,13 @@
         { "id": "betavoltaic", "fg": 314, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_betavoltaic", "fg": 314, "rotates": false },
         { "id": "black_pen_ink", "fg": 315, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_black_pen_ink", "fg": 315, "rotates": false },
         { "id": "blue_pen_ink", "fg": 316, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_blue_pen_ink", "fg": 316, "rotates": false },
         { "id": "brazing_rod_alloy", "fg": 317, "bg": 10195, "rotates": false },
         { "id": "brazing_rod_bronze", "fg": 318, "bg": 10195, "rotates": false },
         { "id": "butane", "fg": 319, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_butane", "fg": 319, "rotates": false },
         { "id": "cable", "fg": 320, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_cable", "fg": 320, "rotates": false },
         { "id": "cac2powder", "fg": 321, "bg": 10195, "rotates": false },
@@ -657,14 +679,16 @@
         { "id": "overlay_wielded_chunk_rubber", "fg": 326, "rotates": false },
         { "id": "coal_lump", "fg": 327, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_coal_lump", "fg": 327, "rotates": false },
-        { "id": "copper", "fg": 328, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_copper", "fg": 328, "rotates": false },
+        { "id": "copper", "fg": 328, "bg": 10195 },
+        { "id": "overlay_wielded_copper", "fg": 328 },
         { "id": "diesel", "fg": 329, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_diesel", "fg": 329, "rotates": false },
         { "id": "down_feather", "fg": 330, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_down_feather", "fg": 330, "rotates": false },
         { "id": "duct_tape", "fg": 331, "rotates": false },
         { "id": "overlay_wielded_duct_tape", "fg": 331, "rotates": false },
         { "id": "extinguishing_agent", "fg": 332, "rotates": false },
+        { "id": "overlay_wielded_extinguishing_agent", "fg": 332, "rotates": false },
         { "id": "feather", "fg": 333, "rotates": false },
         { "id": "overlay_wielded_feather", "fg": 333, "rotates": false },
         { "id": "fish_bait", "fg": 334 },
@@ -680,11 +704,13 @@
         { "id": [ "gasfilter_s", "gasfilter_sm" ], "fg": 339, "rotates": false },
         { "id": [ "overlay_wielded_gasfilter_s", "overlay_wielded_gasfilter_sm" ], "fg": 339, "rotates": false },
         { "id": "gasoline", "fg": 340, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_gasoline", "fg": 340, "rotates": false },
         { "id": "generic_no_ammo", "fg": 341, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_generic_no_ammo", "fg": 341, "rotates": false },
         { "id": "graphite", "fg": 342, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_graphite", "fg": 342, "rotates": false },
         { "id": "green_pen_ink", "fg": 343, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_green_pen_ink", "fg": 343, "rotates": false },
         { "id": "gunpowder", "fg": 344, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_gunpowder", "fg": 344, "rotates": false },
         { "id": "gunpowder_artillery", "fg": 344, "bg": 10195, "rotates": false },
@@ -700,7 +726,9 @@
         { "id": "gunpowder_shotgun", "fg": 344, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_gunpowder_shotgun", "fg": 344, "rotates": false },
         { "id": "jp8", "fg": 329, "bg": 10195, "rotates": false },
-        { "id": "lamp_oil", "fg": 345, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_jp8", "fg": 329, "rotates": false },
+        { "id": "lamp_oil", "fg": 345, "bg": 10195 },
+        { "id": "overlay_wielded_lamp_oil", "fg": 345 },
         { "id": "lgpistol_primer", "fg": 371, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_lgpistol_primer", "fg": 371, "rotates": false },
         { "id": "lgrifle_primer", "fg": 371, "bg": 10195, "rotates": false },
@@ -712,17 +740,22 @@
         { "id": "medical_tape", "fg": 348, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_medical_tape", "fg": 348, "rotates": false },
         { "id": "milk", "fg": 349, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_milk", "fg": 349, "rotates": false },
         { "id": "milk_raw", "fg": 350, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_milk_raw", "fg": 350, "rotates": false },
         { "id": "money", "fg": 351, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_money", "fg": 351, "rotates": false },
         { "id": "motor_oil", "fg": 352, "bg": 10195, "rotates": false },
-        { "id": "nicotine_liquid", "fg": 353, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_motor_oil", "fg": 352, "rotates": false },
+        { "id": "nicotine_liquid", "fg": 353, "bg": 10195 },
+        { "id": "overlay_wielded_nicotine_liquid", "fg": 353 },
         { "id": "nitrox", "fg": 354, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_nitrox", "fg": 354, "rotates": false },
-        { "id": "oxy_powder", "fg": 355, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_oxy_powder", "fg": 355, "rotates": false },
-        { "id": "oxygen", "fg": 356, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_oxy_powder", "fg": 355 },
+        { "id": "oxy_powder", "fg": 355, "bg": 10195 },
         { "id": "overlay_wielded_oxygen", "fg": 356, "rotates": false },
+        { "id": "oxygen", "fg": 356, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_permanent_ink", "fg": 357, "rotates": false },
         { "id": "permanent_ink", "fg": 357, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_plant_fibre", "fg": 358, "rotates": false },
         { "id": "plant_fibre", "fg": 358, "bg": 10195, "rotates": false },
@@ -730,43 +763,46 @@
         { "id": "plasma", "fg": 359, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_plut_cell", "fg": 360, "rotates": false },
         { "id": "plut_cell", "fg": 360, "bg": 10195, "rotates": false },
-        { "id": "plut_slurry", "fg": 361, "bg": 10195, "rotates": false },
-        { "id": "plut_slurry_dense", "fg": 362, "bg": [ 2675, 3011, 3017, 2772, 2785, 361, 362 ], "rotates": false },
-        { "id": "rebreather_filter", "fg": 363, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_plut_slurry", "fg": 361 },
+        { "id": "plut_slurry", "fg": 361, "bg": 10195 },
+        { "id": "overlay_wielded_plut_slurry_dense", "fg": 362 },
+        { "id": "plut_slurry_dense", "fg": 362, "bg": [ 2675, 3011, 3017, 2772, 2785, 361, 362 ] },
         { "id": "overlay_wielded_rebreather_filter", "fg": 363, "rotates": false },
+        { "id": "rebreather_filter", "fg": 363, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_red_pen_ink", "fg": 364, "rotates": false },
         { "id": "red_pen_ink", "fg": 364, "bg": 10195, "rotates": false },
         { "id": "rock", "fg": 365, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_rock", "fg": 366, "rotates": false },
-        { "id": "rolling_paper", "fg": 367, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_rolling_paper", "fg": 367, "rotates": false },
-        { "id": "rubber_slug", "fg": 368, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_rubber_slug", "fg": 368, "rotates": false },
-        { "id": "scrap_bronze", "fg": 369, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_scrap_bronze", "fg": 369, "rotates": false },
-        { "id": "sinew", "fg": 370, "bg": 10195, "rotates": false },
+        { "id": "rolling_paper", "fg": 367, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_rubber_slug", "fg": 368 },
+        { "id": "rubber_slug", "fg": 368, "bg": 10195 },
+        { "id": "overlay_wielded_scrap_bronze", "fg": 369 },
+        { "id": "scrap_bronze", "fg": 369, "bg": 10195 },
         { "id": "overlay_wielded_sinew", "fg": 370, "rotates": false },
-        { "id": "smpistol_primer", "fg": 371, "bg": 10195, "rotates": false },
+        { "id": "sinew", "fg": 370, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_smpistol_primer", "fg": 371, "rotates": false },
-        { "id": "smrifle_primer", "fg": 371, "bg": 10195, "rotates": false },
+        { "id": "smpistol_primer", "fg": 371, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_smrifle_primer", "fg": 371, "rotates": false },
-        { "id": "shotgun_primer", "fg": 371, "bg": 10195, "rotates": false },
+        { "id": "smrifle_primer", "fg": 371, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_shotgun_primer", "fg": 371, "rotates": false },
-        { "id": "soap", "fg": 372, "bg": 10195, "rotates": false },
+        { "id": "shotgun_primer", "fg": 371, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_soap", "fg": 372, "rotates": false },
-        { "id": "stimpack_ammo", "fg": 373, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_stimpack_ammo", "fg": 373, "rotates": false },
-        { "id": "thread", "fg": 374, "bg": 10195, "rotates": false },
+        { "id": "soap", "fg": 372, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_stimpack_ammo", "fg": 373 },
+        { "id": "stimpack_ammo", "fg": 373, "bg": 10195 },
         { "id": "overlay_wielded_thread", "fg": 374, "rotates": false },
-        { "id": "tinder", "fg": 375, "bg": 10195, "rotates": false },
-        { "id": "overlay_wielded_tinder", "fg": 375, "rotates": false },
-        { "id": "unfinished_cac2", "fg": 376, "bg": 10195, "rotates": false },
+        { "id": "thread", "fg": 374, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_tinder", "fg": 375 },
+        { "id": "tinder", "fg": 375, "bg": 10195 },
         { "id": "overlay_wielded_unfinished_cac2", "fg": 376, "rotates": false },
-        { "id": "unfinished_charcoal", "fg": 377, "bg": 10195, "rotates": false },
+        { "id": "unfinished_cac2", "fg": 376, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_unfinished_charcoal", "fg": 377, "rotates": false },
+        { "id": "unfinished_charcoal", "fg": 377, "bg": 10195, "rotates": false },
         { "id": "welding_rod_alloy", "fg": 378, "bg": 10195, "rotates": false },
         { "id": "welding_rod_steel", "fg": 379, "bg": 10195, "rotates": false },
-        { "id": "yarn", "fg": 380, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_yarn", "fg": 380, "rotates": false },
+        { "id": "yarn", "fg": 380, "bg": 10195, "rotates": false },
         {
           "id": "artifact_slow_aura",
           "fg": [
@@ -2060,8 +2096,10 @@
         { "id": "bow_sling", "fg": 1064, "rotates": false },
         { "id": "overlay_wielded_bow_sling", "fg": 1064, "rotates": false },
         { "id": "overlay_worn_bow_sling", "fg": 1065, "rotates": false },
-        { "id": [ "holster", "shoulder_holster" ], "fg": 1066, "bg": 10195, "rotates": false },
-        { "id": [ "overlay_wielded_holster", "overlay_wielded_shoulder_holster" ], "fg": 1066, "rotates": false },
+        { "id": "holster", "fg": 1066, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_holster", "fg": 1066, "rotates": false },
+        { "id": "shoulder_holster", "fg": 1066, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_shoulder_holster", "fg": 1066, "rotates": false },
         { "id": "overlay_worn_shoulder_holster", "fg": 0, "rotates": false },
         { "id": "overlay_worn_holster", "fg": 1067, "rotates": false },
         { "id": "overlay_wielded_sholster", "fg": 1068, "rotates": false },
@@ -3336,9 +3374,9 @@
         { "id": "overlay_wielded_power_armor_basic_on", "fg": 1841, "rotates": false },
         { "id": "power_armor_basic_on", "fg": 1841, "bg": 10195, "rotates": false },
         { "id": "overlay_worn_power_armor_basic_on", "fg": 1842, "rotates": false },
+        { "id": "overlay_wielded_power_armor_frame", "fg": 1843, "rotates": false },
         {
           "id": [
-            "overlay_wielded_power_armor_frame",
             "overlay_wielded_power_armor_back_holster",
             "overlay_wielded_power_armor_holster",
             "overlay_wielded_power_chest_rig",
@@ -3349,9 +3387,9 @@
           "fg": 1843,
           "rotates": false
         },
+        { "id": "power_armor_frame", "fg": 1843, "bg": 10195, "rotates": false },
         {
           "id": [
-            "power_armor_frame",
             "power_armor_back_holster",
             "power_armor_holster",
             "power_armor_chest_rig",
@@ -8753,10 +8791,23 @@
           "fg": 4470,
           "rotates": false
         },
+        { "id": "overlay_wielded_modular_ar15", "fg": 4471, "rotates": false },
         {
           "id": [
             "overlay_wielded_ar15",
-            "overlay_wielded_modular_ar15"
+            "overlay_wielded_ar15_223medium",
+            "overlay_wielded_ar15_300",
+            "overlay_wielded_ar15_300medium",
+            "overlay_wielded_ar15_300short",
+            "overlay_wielded_ar15_50medium",
+            "overlay_wielded_ar15_50short",
+            "overlay_wielded_ar15_450",
+            "overlay_wielded_ar15_450medium",
+            "overlay_wielded_ar15_450short",
+            "overlay_wielded_ar15_762",
+            "overlay_wielded_ar15_223short",
+            "overlay_wielded_ar15_50",
+            "overlay_wielded_ar15_223long"
           ],
           "fg": 4471,
           "rotates": false
@@ -9087,10 +9138,8 @@
         { "id": "overlay_wielded_colt_saa", "fg": 4734, "rotates": false },
         { "id": "m1911-460", "fg": 4735 },
         { "id": "overlay_wielded_m1911-460", "fg": 4736 },
-        { "id": "hk_mp7", "fg": 4737, "rotates": false },
-        { "id": "overlay_wielded_hk_mp7", "fg": 4738, "rotates": false },
-        { "id": "hk_mp7a1", "fg": 4737, "rotates": false },
-        { "id": "overlay_wielded_hk_mp7a1", "fg": 4738, "rotates": false },
+        { "id": [ "hk_mp7", "hk_mp7a1" ], "fg": 4737, "rotates": false },
+        { "id": [ "overlay_wielded_hk_mp7", "overlay_wielded_hk_mp7a1" ], "fg": 4738, "rotates": false },
         { "id": "bh_m89", "fg": 4739 },
         { "id": "overlay_wielded_bh_m89", "fg": 4740, "rotates": false },
         { "id": "sw_500", "fg": 4741, "bg": 10195, "rotates": false },
@@ -9138,7 +9187,8 @@
         { "id": "tokarev", "fg": 4783, "bg": 10195, "rotates": false },
         { "id": "overlay_wielded_tokarev", "fg": 4784, "rotates": false },
         { "id": "AT4", "fg": 4785, "rotates": false },
-        { "id": [ "overlay_wielded_AT4", "overlay_wielded_AT4_Packed" ], "fg": 4786, "rotates": false },
+        { "id": "overlay_wielded_AT4", "fg": 4786, "rotates": false },
+        { "id": "overlay_wielded_AT4_Packed", "fg": 4786, "rotates": false },
         { "id": "overlay_worn_AT4_Packed", "fg": 2009, "rotates": false },
         { "id": "m3_carlgustav", "fg": 4787, "rotates": false },
         { "id": "overlay_wielded_m3_carlgustav", "fg": 4788, "rotates": false },
@@ -12704,24 +12754,28 @@
         { "id": "overlay_wielded_horn_big", "fg": 7181, "rotates": false },
         { "id": "horn_car", "fg": 7182, "rotates": false },
         { "id": "overlay_wielded_horn_car", "fg": 7182, "rotates": false },
+        { "id": "large_space_heater", "fg": 7183, "rotates": false },
         {
           "id": [
-            "large_space_heater", "f_space_heater_large", "f_space_heater_large_off",
+                                  "f_space_heater_large", "f_space_heater_large_off",
             "large_space_cooler", "f_space_cooler_large", "f_space_cooler_large_off"
             ],
           "fg": 7183,
           "rotates": false
         },
-        { "id": [ "overlay_wielded_large_space_heater", "overlay_wielded_large_space_cooler" ], "fg": 7183, "rotates": false },
+        { "id": "overlay_wielded_large_space_heater", "fg": 7183, "rotates": false },
+        { "id": "overlay_wielded_large_space_cooler", "fg": 7183, "rotates": false },
+        { "id": "large_space_heater_on", "fg": 7184, "rotates": false },
         {
           "id": [
-            "large_space_heater_on", "f_space_heater_large_on",
+                                     "f_space_heater_large_on",
             "large_space_cooler_on", "f_space_cooler_large_on"
           ],
           "fg": 7184,
           "rotates": false
         },
-        { "id": [ "overlay_wielded_large_space_heater_on", "overlay_wielded_large_space_cooler_on"], "fg": 7184, "rotates": false },
+        { "id": "overlay_wielded_large_space_heater_on", "fg": 7184, "rotates": false },
+        { "id": "overlay_wielded_large_space_cooler_on", "fg": 7184, "rotates": false },
         { "id": "lifestraw", "fg": 7185, "rotates": false },
         { "id": "overlay_wielded_lifestraw", "fg": 7185, "rotates": false },
         { "id": "makeshift_halberd", "fg": 7186, "bg": 10195, "rotates": false },
@@ -12741,24 +12795,28 @@
         { "id": "sandbox_kit", "fg": 7193, "rotates": false },
         { "id": "overlay_wielded_sarcophagus_access_code", "fg": 7194, "rotates": false },
         { "id": "sarcophagus_access_code", "fg": 7194, "bg": 10195, "rotates": false },
+        { "id": "overlay_wielded_small_space_heater", "fg": 7195, "rotates": false },
+        { "id": "overlay_wielded_small_space_cooler", "fg": 7195, "rotates": false },
+        { "id": "small_space_heater", "fg": 7195, "rotates": false },
         {
           "id": [
-            "small_space_heater", "f_space_heater", "f_space_heater_off",
+                                  "f_space_heater", "f_space_heater_off",
             "small_space_cooler", "f_space_cooler", "f_space_cooler_off"
           ],
           "fg": 7195,
           "rotates": false
         },
-        { "id": [ "overlay_wielded_small_space_heater", "overlay_wielded_small_space_cooler" ], "fg": 7195, "rotates": false },
+        { "id": "overlay_wielded_small_space_heater_on", "fg": 7196, "rotates": false },
+        { "id": "overlay_wielded_small_space_cooler_on", "fg": 7196, "rotates": false },
+        { "id": "small_space_heater_on", "fg": 7196, "rotates": false },
         {
           "id": [
-            "small_space_heater_on", "f_space_heater_on",
+                                     "f_space_heater_on",
             "small_space_cooler_on", "f_space_cooler_on"
           ],
           "fg": 7196,
           "rotates": false
         },
-        { "id": [ "overlay_wielded_small_space_heater_on", "overlay_wielded_small_space_cooler_on"], "fg": 7196, "rotates": false },
         { "id": "overlay_wielded_spray_can", "fg": 7197, "rotates": false },
         { "id": "spray_can", "fg": 7197, "rotates": false },
         { "id": "stepladder", "fg": 7198 },