diff --git a/data/json/itemgroups/gear.json b/data/json/itemgroups/gear.json
index 5fc77023a9c4e..021013b7cefc6 100644
--- a/data/json/itemgroups/gear.json
+++ b/data/json/itemgroups/gear.json
@@ -14,11 +14,7 @@
       [ "joint", 10 ],
       [ "ref_lighter", 50 ],
       [ "matches", 50 ],
-      [ "ecig", 15 ],
-      [ "chaw", 5 ],
-      [ "cigar", 5 ],
-      [ "advanced_ecig", 10 ],
-      [ "nicotine_liquid", 25 ],
+      { "group": "tobacco_products", "prob": 60 },
       [ "permanent_marker", 10 ],
       [ "dog_whistle", 5 ],
       [ "multitool", 1 ],
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
index 1b8b560a8b604..a4da5291b5873 100644
--- a/data/json/itemgroups/item_groups.json
+++ b/data/json/itemgroups/item_groups.json
@@ -202,14 +202,7 @@
       { "item": "orangesoda", "prob": 15, "container-item": "bottle_plastic" },
       { "item": "colamdew", "prob": 10, "container-item": "bottle_plastic" },
       [ "sponge", 5 ],
-      [ "cig", 90 ],
-      [ "chaw", 20 ],
-      [ "cigar", 5 ],
-      [ "ecig", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
-      [ "pipe_tobacco", 5 ],
-      [ "tobacco", 5 ],
+      { "group": "tobacco_products", "prob": 151 },
       [ "weed", 10 ],
       [ "joint", 10 ],
       [ "seed_weed", 5 ],
@@ -817,17 +810,10 @@
       [ "backpack_hiking", 3 ],
       [ "clock", 10 ],
       [ "basket_laundry", 30 ],
-      [ "cig", 60 ],
-      [ "tobacco", 30 ],
-      [ "chaw", 20 ],
-      [ "cigar", 5 ],
-      [ "pipe_tobacco", 5 ],
+      { "group": "tobacco_products", "prob": 146 },
       [ "weed", 15 ],
       [ "joint", 5 ],
       [ "razor_blade", 5 ],
-      [ "ecig", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
       [ "weed", 20 ],
       [ "seed_weed", 15 ],
       [ "seed_tobacco", 5 ],
@@ -1285,14 +1271,8 @@
     "items": [
       [ "aspirin", 85 ],
       [ "caffeine", 25 ],
-      [ "cig", 60 ],
-      [ "tobacco", 30 ],
-      [ "chaw", 40 ],
-      [ "cigar", 5 ],
-      [ "ecig", 10 ],
+      { "group": "tobacco_products", "prob": 161 },
       [ "sponge", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "l_enforcer_45", 4 ],
       [ "l_sp_45", 3 ],
@@ -2881,10 +2861,7 @@
       [ "recipe_augs", 8 ],
       [ "aspirin", 85 ],
       [ "junk_burrito", 25 ],
-      [ "cigar", 5 ],
-      [ "ecig", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
+      { "group": "tobacco_products", "prob": 31 },
       [ "glasses_eye", 90 ],
       [ "contacts", 15 ],
       [ "sunglasses", 90 ],
@@ -2954,11 +2931,7 @@
       [ "decoy_anarch", 10 ],
       [ "aspirin", 85 ],
       [ "maltballs", 30 ],
-      [ "cigar", 5 ],
-      [ "ecig", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
-      [ "chaw", 10 ],
+      { "group": "tobacco_products", "prob": 151 },
       [ "glasses_eye", 90 ],
       [ "contacts", 15 ],
       [ "sunglasses", 90 ],
@@ -2987,9 +2960,6 @@
       [ "bubblewrap", 50 ],
       [ "coffee_raw", 15 ],
       [ "usb_drive", 5 ],
-      [ "cig", 80 ],
-      [ "tobacco", 10 ],
-      [ "chaw", 20 ],
       [ "coat_rain", 50 ],
       [ "hood_rain", 10 ],
       [ "poncho", 15 ],
@@ -3028,13 +2998,10 @@
       [ "cookies", 60 ],
       [ "brownie", 60 ],
       [ "aspirin", 40 ],
-      [ "ecig", 20 ],
-      [ "chaw", 20 ],
-      [ "cig", 100 ],
+      { "group": "tobacco_products", "prob": 150 },
       [ "gum", 100 ],
       [ "caff_gum", 20 ],
       [ "nic_gum", 20 ],
-      [ "tobacco", 10 ],
       [ "weed", 10 ],
       [ "joint", 10 ],
       [ "matches", 50 ],
@@ -4606,14 +4573,7 @@
       [ "inhaler", 14 ],
       [ "eyedrops", 20 ],
       [ "clock", 10 ],
-      [ "cig", 90 ],
-      [ "chaw", 20 ],
-      [ "cigar", 5 ],
-      [ "ecig", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
-      [ "pipe_tobacco", 5 ],
-      [ "tobacco", 5 ],
+      { "group": "tobacco_products", "prob": 151 },
       [ "weed", 10 ],
       [ "joint", 10 ],
       [ "seed_weed", 15 ],
@@ -5066,12 +5026,7 @@
       { "group": "softdrinks_canned", "prob": 290 },
       [ "caffeine", 25 ],
       [ "maltballs", 30 ],
-      [ "cig", 90 ],
-      [ "ecig", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
-      [ "chaw", 20 ],
-      [ "pipe_tobacco", 5 ],
+      { "group": "tobacco_products", "prob": 141 },
       [ "weed", 10 ],
       [ "joint", 10 ],
       [ "seed_weed", 15 ],
@@ -5618,11 +5573,7 @@
       [ "iodine", 5 ],
       [ "prussian_blue", 5 ],
       [ "adrenaline_injector", 4 ],
-      [ "cig", 90 ],
-      [ "ecig", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
-      [ "chaw", 30 ],
+      { "group": "tobacco_products", "prob": 146 },
       [ "knife_combat", 14 ],
       [ "kukri", 2 ],
       [ "throwing_knife", 7 ],
@@ -6206,10 +6157,7 @@
       [ "matches", 8 ],
       [ "lighter", 10 ],
       [ "ref_lighter", 2 ],
-      [ "cig", 15 ],
-      [ "cigar", 2 ],
-      [ "ecig", 5 ],
-      [ "advanced_ecig", 1 ],
+      { "group": "tobacco_products", "prob": 26 },
       [ "gum", 13 ],
       [ "glowstick", 2 ],
       [ "flashlight", 5 ],
@@ -6338,11 +6286,7 @@
       [ "pocket_firstaid", 10 ],
       [ "pocketwatch", 5 ],
       [ "wristwatch", 10 ],
-      [ "cigar", 5 ],
-      [ "ecig", 10 ],
-      [ "advanced_ecig", 8 ],
-      [ "nicotine_liquid", 8 ],
-      [ "chaw", 1 ],
+      { "group": "tobacco_products", "prob": 32 },
       [ "ref_lighter", 1 ],
       [ "flask_hip", 1 ],
       [ "textbook_fireman", 10 ],
@@ -6368,6 +6312,20 @@
       [ "bag_body_bag", 5 ]
     ]
   },
+  {
+    "type": "item_group",
+    "id": "tobacco_products",
+    "items": [
+      [ "cig", 60 ],
+      [ "tobacco", 20 ],
+      [ "chaw", 20 ],
+      [ "cigar", 10 ],
+      [ "ecig", 10 ],
+      [ "advanced_ecig", 8 ],
+      [ "nicotine_liquid", 15 ],
+      [ "pipe_tobacco", 10 ]
+    ]
+  },
   {
     "type": "item_group",
     "id": "rad_gear",
diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json
index 353f90610d01a..84aebd6001746 100644
--- a/data/json/itemgroups/mansion.json
+++ b/data/json/itemgroups/mansion.json
@@ -1163,7 +1163,7 @@
       [ "novel_pulp", 30 ],
       [ "mag_news", 30 ],
       [ "mag_tv", 30 ],
-      [ "cig", 30 ],
+      { "group": "tobacco_products", "prob": 50 },
       [ "gum", 30 ],
       { "group": "vending_drink", "prob": 20 },
       [ "mag_beauty", 20 ],
@@ -1174,15 +1174,11 @@
       [ "mp3", 10 ],
       [ "weeks_old_newspaper", 5 ],
       [ "newest_newspaper", 5 ],
-      [ "advanced_ecig", 5 ],
       [ "portable_game", 5 ],
       [ "cell_phone", 1 ],
       [ "smart_phone", 5 ],
       [ "phonebook", 5 ],
       [ "hairpin", 5 ],
-      [ "cigar", 5 ],
-      [ "chaw", 5 ],
-      [ "ecig", 5 ],
       { "group": "tinware", "prob": 5 },
       [ "months_old_newspaper", 4 ],
       [ "one_year_old_newspaper", 3 ],
@@ -1200,16 +1196,12 @@
       { "item": "beer", "prob": 40, "container-item": "glass" },
       { "group": "beer_selection", "prob": 40 },
       { "group": "glass_of_wine", "prob": 40 },
-      [ "cig", 30 ],
       { "group": "vending_drink", "prob": 20 },
       [ "glass", 20 ],
-      [ "cigar", 20 ],
-      [ "ecig", 20 ],
+      { "group": "tobacco_products", "prob": 75 },
       [ "money_bundle", 10 ],
-      [ "advanced_ecig", 5 ],
       [ "pretzels", 5 ],
       [ "chips", 5 ],
-      [ "chaw", 5 ],
       { "item": "cash_card", "prob": 1, "charges-min": 25000, "charges-max": 100000 }
     ]
   },