diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
index 0943ff70f53b3..34430ee5593c8 100644
--- a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
+++ b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
@@ -49,7 +49,7 @@
       [ "adrenaline_injector", 50 ],
       { "item": "inhaler", "prob": 100, "charges-min": 10, "charges-max": 100 },
       [ "quikclot", 50 ],
-      [ "smoxygen_tank", 70 ],
+      { "item": "smoxygen_tank", "prob": 70, "charges": [ 0, 12 ] },
       [ "ifak", 40 ]
     ]
   },
@@ -100,7 +100,7 @@
       { "item": "bandages", "prob": 100 },
       { "item": "morphine", "prob": 20 },
       { "item": "quikclot", "prob": 20 },
-      { "item": "smoxygen_tank", "prob": 20 },
+      { "item": "smoxygen_tank", "prob": 20, "charges": [ 0, 12 ] },
       { "item": "tramadol", "prob": 20 }
     ]
   },
@@ -165,11 +165,11 @@
         "charges-max": 9
       },
       [ "caff_gum", 10 ],
-      [ "oxygen_tank", 20 ],
-      [ "smoxygen_tank", 5 ],
+      { "item": "oxygen_tank", "prob": 20, "charges": [ 0, 24 ] },
+      { "item": "smoxygen_tank", "prob": 5, "charges": [ 0, 12 ] },
       [ "eyedrops", 35 ],
-      [ "shavingkit", 5 ],
-      [ "elec_hairtrimmer", 2 ],
+      { "item": "shavingkit", "prob": 5, "charges": [ 0, 10 ] },
+      { "item": "elec_hairtrimmer", "prob": 2, "charges": [ 0, 50 ] },
       [ "nic_gum", 25 ],
       [ "weak_antibiotic", 30 ]
     ]
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
index 3b05537226297..0b437afe2103a 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -194,9 +194,9 @@
       [ "hazmat_suit", 5 ],
       [ "fungicide", 10 ],
       [ "insecticide", 5 ],
-      [ "oxygen_tank", 40 ],
+      { "item": "oxygen_tank", "prob": 40, "charges": [ 0, 24 ] },
       [ "autoclave", 20 ],
-      [ "smoxygen_tank", 10 ],
+      { "item": "smoxygen_tank", "prob": 10, "charges": [ 0, 12 ] },
       [ "antifungal", 5 ],
       [ "antiparasitic", 10 ],
       [ "survnote", 1 ],
@@ -225,10 +225,10 @@
       [ "mag_porn", 5 ],
       [ "hairpin", 5 ],
       [ "purse", 30 ],
-      [ "mp3", 15 ],
-      [ "portable_game", 10 ],
-      [ "game_watch", 2 ],
-      [ "laptop", 5 ],
+      { "item": "mp3", "prob": 15, "charges": [ 0, 100 ] },
+      { "item": "portable_game", "prob": 10, "charges": [ 0, 100 ] },
+      { "item": "game_watch", "prob": 2, "charges": [ 0, 100 ] },
+      { "item": "laptop", "prob": 5, "charges": [ 0, 500 ] },
       [ "fish_bowl", 1 ],
       [ "glasses_eye", 30 ],
       [ "contacts", 15 ],
@@ -236,8 +236,8 @@
       [ "fitover_sunglasses", 20 ],
       [ "fancy_sunglasses", 5 ],
       [ "glasses_reading", 30 ],
-      [ "shavingkit", 20 ],
-      [ "elec_hairtrimmer", 10 ],
+      { "item": "shavingkit", "prob": 20, "charges": [ 0, 10 ] },
+      { "item": "elec_hairtrimmer", "prob": 10, "charges": [ 0, 50 ] },
       [ "glasses_bifocal", 30 ],
       [ "tailor_portfolio", 3 ],
       [ "house_coat", 20 ],
@@ -250,7 +250,7 @@
       [ "down_blanket", 10 ],
       [ "pillow", 50 ],
       [ "down_pillow", 15 ],
-      [ "smoxygen_tank", 10 ],
+      { "item": "smoxygen_tank", "prob": 10, "charges": [ 0, 12 ] },
       [ "antiparasitic", 3 ],
       [ "diazepam", 3 ],
       [ "recipe_augs", 3 ],
@@ -344,7 +344,7 @@
       { "group": "ammo_pocket_batteries", "prob": 30 },
       { "group": "candy_chocolate", "prob": 570 },
       { "group": "snacks", "prob": 820 },
-      [ "radio", 10 ],
+      { "item": "radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "eyedrops", 10 ],
       [ "rag", 30 ],
       [ "paper", 30 ],
@@ -362,7 +362,7 @@
     "//": "for ws_regional_dump",
     "items": [
       { "group": "ammo_pocket_batteries", "prob": 10 },
-      [ "radio", 10 ],
+      { "item": "radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "rag", 30 ],
       { "item": "flashlight", "prob": 20, "charges": [ 0, 300 ] },
       { "item": "heavy_flashlight", "prob": 10, "charges": [ 0, 300 ] },
@@ -385,11 +385,11 @@
       [ "shovel", 45 ],
       [ "crowbar", 15 ],
       [ "gloves_work", 45 ],
-      [ "mask_filter", 30 ],
+      { "item": "mask_filter", "prob": 30, "charges": [ 0, 100 ] },
       [ "glasses_safety", 40 ],
       [ "hat_hard", 50 ],
       [ "hat_hard_hooded", 25 ],
-      [ "wearable_light", 5 ],
+      { "item": "wearable_light", "prob": 5, "charges": [ 0, 100 ] },
       [ "ear_plugs", 50 ],
       { "group": "ammo_pocket_batteries", "prob": 50 },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
@@ -541,11 +541,10 @@
       [ "wetsuit_gloves", 20 ],
       [ "wetsuit_booties", 20 ],
       [ "wetsuit_hood", 10 ],
-      [ "scuba_tank", 5 ],
-      [ "small_scuba_tank", 5 ],
+      { "item": "scuba_tank", "prob": 5, "charges": [ 0, 60 ] },
+      { "item": "small_scuba_tank", "prob": 5, "charges": [ 0, 20 ] },
       [ "dive_bag", 10 ],
-      [ "rebreather", 2 ],
-      [ "rebreather_filter", 4 ],
+      { "item": "rebreather", "prob": 2, "charges": [ 0, 60 ] },
       { "item": "glowstick", "prob": 60, "charges": 1400 },
       { "item": "handflare", "prob": 40, "charges": 300 },
       [ "grapnel", 40 ],
@@ -619,7 +618,7 @@
       [ "power_supply", 25 ],
       [ "processor", 25 ],
       { "item": "mp3", "prob": 30, "charges-min": 0, "charges-max": 15 },
-      [ "laptop", 20 ],
+      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
       { "item": "hotplate", "prob": 20, "charges-min": 0, "charges-max": 25 },
       { "item": "flashlight", "prob": 30, "charges-min": 0, "charges-max": 10 },
       { "item": "coffeemaker", "prob": 20, "charges-min": 0, "charges-max": 25 },
@@ -629,15 +628,15 @@
       { "item": "cell_phone", "prob": 35, "charges-min": 0, "charges-max": 15 },
       [ "e_scrap", 55 ],
       [ "amplifier", 25 ],
-      [ "smart_lamp", 5 ],
-      [ "reading_light", 10 ],
-      [ "carver_off", 5 ],
-      [ "coffeemaker", 5 ],
-      [ "dehydrator", 5 ],
-      [ "food_processor", 5 ],
-      [ "hotplate", 5 ],
-      [ "multi_cooker", 5 ],
-      [ "vac_sealer", 5 ]
+      { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
+      { "item": "reading_light", "prob": 10, "charges": [ 0, 100 ] },
+      { "item": "carver_off", "prob": 5, "charges": [ 0, 500 ] },
+      { "item": "coffeemaker", "prob": 5, "charges": [ 0, 500 ] },
+      { "item": "dehydrator", "prob": 5, "charges": [ 0, 500 ] },
+      { "item": "food_processor", "prob": 5, "charges": [ 0, 500 ] },
+      { "item": "hotplate", "prob": 5, "charges": [ 0, 500 ] },
+      { "item": "multi_cooker", "prob": 5, "charges": [ 0, 500 ] },
+      { "item": "vac_sealer", "prob": 5, "charges": [ 0, 500 ] }
     ]
   },
   {
@@ -853,9 +852,9 @@
       [ "ref_lighter", 1 ],
       [ "matches", 60 ],
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
-      [ "laptop", 20 ],
+      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
       [ "atomic_light", 1 ],
-      [ "eink_tablet_pc", 1 ],
+      { "item": "eink_tablet_pc", "prob": 1, "charges": [ 0, 100 ] },
       [ "mobile_memory_card", 5 ],
       { "item": "cell_phone", "prob": 10, "charges": [ 0, 150 ] },
       { "item": "smart_phone", "prob": 30, "charges-min": 0 },
@@ -869,7 +868,7 @@
       [ "jar_3l_glass_sealed", 8 ],
       [ "flyer", 10 ],
       [ "gasoline_lantern", 10 ],
-      [ "electric_lantern", 8 ],
+      { "item": "electric_lantern", "prob": 8, "charges": [ 0, 100 ] },
       [ "oil_lamp", 5 ],
       [ "lamp_oil", 1 ],
       [ "child_book", 4 ],
@@ -1110,9 +1109,9 @@
     "items": [
       [ "television", 90 ],
       [ "tonfa", 20 ],
-      [ "tazer", 20 ],
+      { "item": "tazer", "prob": 20, "charges": [ 0, 500 ] },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
-      [ "two_way_radio", 10 ],
+      { "item": "two_way_radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "camera_control", 5 ]
     ]
   },
@@ -1143,7 +1142,7 @@
       [ "crack", 8 ],
       [ "crackpipe", 37 ],
       [ "lsd", 10 ],
-      [ "chemistry_set", 50 ],
+      { "item": "chemistry_set", "prob": 50, "charges": [ 0, 500 ] },
       { "group": "ammo_pocket_batteries_full", "prob": 70 },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       [ "chem_acetone", 40 ],
@@ -1169,15 +1168,15 @@
       [ "coat_lab", 20 ],
       [ "gloves_rubber", 20 ],
       [ "fishing_waders", 12 ],
-      [ "mask_filter", 30 ],
+      { "item": "mask_filter", "prob": 30, "charges": [ 0, 100 ] },
       [ "glasses_safety", 40 ],
       [ "hat_hard", 50 ],
-      [ "wearable_light", 15 ],
+      { "item": "wearable_light", "prob": 15, "charges": [ 0, 100 ] },
       [ "ear_plugs", 50 ],
       { "item": "extinguisher", "prob": 20, "charges": 100 },
-      [ "laptop", 20 ],
+      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
-      [ "water_purifier", 5 ],
+      { "item": "water_purifier", "prob": 5, "charges": [ 0, 100 ] },
       [ "bio_tools", 10 ],
       [ "bio_flashlight", 10 ],
       [ "bio_lighter", 10 ],
@@ -1232,14 +1231,14 @@
       [ "boots_steel", 50 ],
       [ "jumpsuit", 20 ],
       [ "gloves_leather", 45 ],
-      [ "mask_filter", 30 ],
-      [ "mask_gas", 10 ],
+      { "item": "mask_filter", "prob": 30, "charges": [ 0, 100 ] },
+      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
       [ "glasses_safety", 40 ],
       [ "goggles_welding", 70 ],
-      [ "goggles_nv", 1 ],
-      [ "goggles_ir", 2 ],
+      { "item": "goggles_nv", "prob": 1, "charges": [ 0, 100 ] },
+      { "item": "goggles_ir", "prob": 2, "charges": [ 0, 100 ] },
       [ "hat_hard", 50 ],
-      [ "wearable_light", 20 ],
+      { "item": "wearable_light", "prob": 20, "charges": [ 0, 100 ] },
       [ "ear_plugs", 50 ],
       [ "backpack", 38 ],
       [ "slingpack", 19 ],
@@ -1264,12 +1263,12 @@
       [ "jerrycan", 10 ],
       [ "jerrycan_big", 10 ],
       [ "gasoline_lantern", 5 ],
-      [ "electric_lantern", 8 ],
+      { "item": "electric_lantern", "prob": 8, "charges": [ 0, 100 ] },
       [ "oil_lamp", 5 ],
       [ "lamp_oil", 5 ],
       [ "shovel", 10 ],
       [ "e_tool", 5 ],
-      [ "miner_hat", 40 ],
+      { "item": "miner_hat", "prob": 40, "charges": [ 0, 100 ] },
       [ "bucket", 10 ],
       [ "grapnel", 1 ],
       { "group": "tools_toolbox", "prob": 1 },
@@ -1385,8 +1384,8 @@
       [ "tonfa", 50 ],
       [ "tonfa_wood", 10 ],
       [ "blackjack", 50 ],
-      [ "shocktonfa_off", 25 ],
-      [ "tazer", 25 ],
+      { "item": "shocktonfa_off", "prob": 25, "charges": [ 0, 500 ] },
+      { "item": "tazer", "prob": 25, "charges": [ 0, 500 ] },
       [ "remington_700", 5 ],
       [ "3006", 5 ],
       [ "ksg", 8 ],
@@ -1406,7 +1405,7 @@
     "id": "prison_armor",
     "items": [
       [ "helmet_riot", 25 ],
-      [ "mask_gas", 25 ],
+      { "item": "mask_gas", "prob": 25, "charges": [ 0, 100 ] },
       [ "armor_riot", 20 ],
       [ "gloves_tactical", 10 ],
       [ "armguard_hard", 20 ],
@@ -1497,10 +1496,10 @@
       { "item": "mag_stabbing", "prob": 20 },
       { "item": "mag_melee", "prob": 10 },
       { "item": "mag_traps", "prob": 10 },
-      { "item": "mp3", "prob": 9 },
+      { "item": "mp3", "prob": 9, "charges": [ 0, 100 ] },
       { "item": "cell_phone", "prob": 20, "charges": [ 0, 150 ] },
       { "item": "smart_phone", "prob": 20, "charges-min": 0 },
-      { "item": "eink_tablet_pc", "prob": 5 },
+      { "item": "eink_tablet_pc", "prob": 5, "charges": [ 0, 100 ] },
       { "item": "camera", "prob": 3, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "gold_watch", "prob": 3 },
@@ -1519,7 +1518,7 @@
       { "item": "knuckle_brass", "prob": 10 },
       { "item": "switchblade", "prob": 4 },
       { "item": "throwing_knife", "prob": 5 },
-      { "item": "tazer", "prob": 1 },
+      { "item": "tazer", "prob": 1, "charges": [ 0, 100 ] },
       { "item": "cig", "prob": 30 },
       { "item": "rope_6", "prob": 5 },
       { "item": "rope_30", "prob": 2 },
@@ -1600,7 +1599,7 @@
       [ "boots_steel", 50 ],
       [ "wrapped_rad_badge", 15 ],
       [ "cleansuit", 10 ],
-      [ "mask_gas", 10 ],
+      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
       [ "hat_hard", 50 ],
       [ "ear_plugs", 50 ],
       [ "textbook_carpentry", 6 ],
@@ -1608,9 +1607,9 @@
       [ "decoy_elfa", 8 ],
       [ "recipe_elfa", 1 ],
       { "item": "extinguisher", "prob": 20, "charges": 100 },
-      [ "radio", 20 ],
-      [ "geiger_off", 8 ],
-      [ "rad_monitor", 4 ],
+      { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
+      { "item": "geiger_off", "prob": 8, "charges": [ 0, 100 ] },
+      { "item": "rad_monitor", "prob": 4, "charges": [ 0, 50 ] },
       [ "UPS_off", 5 ],
       [ "flyer", 10 ],
       [ "bio_purifier", 10 ],
@@ -1624,7 +1623,7 @@
       [ "30gal_drum", 30 ],
       [ "steam_triple_small", 1 ],
       [ "steam_triple_medium", 1 ],
-      [ "wearable_light", 10 ],
+      { "item": "wearable_light", "prob": 10, "charges": [ 0, 100 ] },
       [ "antiparasitic", 5 ],
       [ "diazepam", 5 ],
       { "item": "misc_repairkit", "prob": 5, "charges-min": 0 },
@@ -1702,13 +1701,13 @@
       [ "recipe_labchem", 1 ],
       [ "textbook_anarch", 1 ],
       [ "recipe_caseless", 1 ],
-      [ "laptop", 30 ],
+      { "item": "laptop", "prob": 30, "charges": [ 0, 500 ] },
       [ "atomic_light", 3 ],
       [ "atomic_lamp", 3 ],
-      [ "smart_lamp", 5 ],
+      { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
       { "item": "cell_phone", "prob": 20, "charges": [ 0, 150 ] },
       { "item": "smart_phone", "prob": 40, "charges": [ 0, 150 ] },
-      [ "eink_tablet_pc", 15 ],
+      { "item": "eink_tablet_pc", "prob": 15, "charges": [ 0, 100 ] },
       [ "mobile_memory_card", 40 ],
       [ "mobile_memory_card_science", 10 ],
       [ "standard_template_construct", 5 ],
@@ -1723,12 +1722,12 @@
       [ "scissors", 50 ],
       { "item": "soldering_iron", "prob": 70, "charges": [ 0, 50 ] },
       [ "solder_wire", 70 ],
-      [ "radio", 20 ],
+      { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       [ "syringe", 8 ],
-      [ "mp3", 18 ],
-      [ "portable_game", 8 ],
-      [ "game_watch", 2 ],
-      [ "vibrator", 6 ],
+      { "item": "mp3", "prob": 18, "charges": [ 0, 100 ] },
+      { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
+      { "item": "game_watch", "prob": 2, "charges": [ 0, 50 ] },
+      { "item": "vibrator", "prob": 6, "charges": [ 0, 100 ] },
       [ "usb_drive", 8 ],
       [ "firecracker_pack", 1 ],
       [ "firecracker", 1 ],
@@ -1745,9 +1744,9 @@
       { "item": "glowstick", "prob": 60, "charges": 1400 },
       [ "blanket", 10 ],
       [ "house_coat", 25 ],
-      [ "talking_doll", 5 ],
+      { "item": "talking_doll", "prob": 5, "charges": [ 0, 100 ] },
       [ "marble", 5 ],
-      [ "creepy_doll", 1 ],
+      { "item": "creepy_doll", "prob": 1, "charges": [ 0, 100 ] },
       [ "straw_doll", 1 ],
       [ "wristwatch", 15 ],
       [ "pocketwatch", 5 ],
@@ -1842,7 +1841,7 @@
       [ "roller_shoes_off", 10 ],
       [ "survnote", 3 ],
       [ "radio_car_box", 3 ],
-      [ "radiocontrol", 10 ],
+      { "item": "radiocontrol", "prob": 10, "charges": [ 0, 50 ] },
       [ "scots_cookbook", 1 ],
       [ "scots_tailor", 1 ],
       [ "eclipse_glasses", 1 ],
@@ -1961,7 +1960,7 @@
       [ "matches", 60 ],
       { "item": "extinguisher", "prob": 20, "charges": 100 },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
-      [ "radio", 20 ],
+      { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       [ "bubblewrap", 50 ],
       [ "coffee_raw", 15 ],
       [ "usb_drive", 5 ],
@@ -2025,7 +2024,7 @@
       { "item": "matches", "prob": 60 },
       { "item": "extinguisher", "prob": 20, "charges": 100 },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
-      { "item": "radio", "prob": 20 },
+      { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       { "item": "bubblewrap", "prob": 50 },
       { "item": "coffee_raw", "prob": 15 },
       { "item": "usb_drive", "prob": 5 },
@@ -2037,9 +2036,9 @@
       { "item": "ref_lighter", "prob": 5 },
       { "item": "matches", "prob": 60 },
       { "item": "extinguisher", "prob": 20, "charges": 100 },
-      { "item": "mp3", "prob": 18 },
-      { "item": "portable_game", "prob": 8 },
-      { "item": "game_watch", "prob": 2 },
+      { "item": "mp3", "prob": 18, "charges": [ 0, 100 ] },
+      { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
+      { "item": "game_watch", "prob": 2, "charges": [ 0, 50 ] },
       { "item": "umbrella", "prob": 5 },
       { "item": "teleumbrella", "prob": 2 },
       { "item": "mag_tailor", "prob": 5 },
@@ -2072,7 +2071,7 @@
       [ "lighter", 50 ],
       [ "glasses_eye", 30 ],
       [ "contacts", 30 ],
-      [ "radio", 100 ],
+      { "item": "radio", "prob": 100, "charges": [ 0, 100 ] },
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "umbrella", 50 ],
       [ "teleumbrella", 20 ],
@@ -2240,12 +2239,12 @@
       { "item": "extinguisher", "prob": 20, "charges": 100 },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       { "item": "heavy_flashlight", "prob": 5, "charges": [ 0, 300 ] },
-      [ "mess_kit", 10 ],
-      [ "hotplate", 10 ],
+      { "item": "mess_kit", "prob": 10, "charges": [ 0, 500 ] },
+      { "item": "hotplate", "prob": 10, "charges": [ 0, 500 ] },
       [ "popcan_stove", 5 ],
       { "item": "denat_alcohol", "prob": 10, "charges-min": 250 },
-      [ "water_purifier", 5 ],
-      [ "radio", 20 ],
+      { "item": "water_purifier", "prob": 5, "charges": [ 0, 100 ] },
+      { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       [ "rollmat", 40 ],
       [ "tent_kit", 17 ],
       [ "large_tent_kit", 17 ],
@@ -2263,7 +2262,7 @@
       [ "emer_blanket", 20 ],
       [ "flyer", 10 ],
       [ "gasoline_lantern", 5 ],
-      [ "electric_lantern", 8 ],
+      { "item": "electric_lantern", "prob": 8, "charges": [ 0, 100 ] },
       [ "oil_lamp", 5 ],
       [ "lamp_oil", 5 ],
       [ "flotation_vest", 1 ],
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
index 4e97083ae30ac..38df4e5c57835 100644
--- a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
+++ b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -13,7 +13,7 @@
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       { "item": "rm103a_pistol", "prob": 1 },
       { "item": "rm228", "prob": 2 },
-      { "item": "vibrator", "prob": 3 },
+      { "item": "vibrator", "prob": 3, "charges": [ 0, 100 ] },
       { "item": "condom", "prob": 5, "count": [ 1, 3 ] },
       { "item": "mag_porn", "prob": 20 },
       { "item": "lighter", "prob": 60 },
@@ -21,10 +21,10 @@
       { "item": "matches", "prob": 60 },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       { "item": "extinguisher", "prob": 20, "charges": 100 },
-      { "item": "tazer", "prob": 3 },
-      { "item": "mp3", "prob": 18 },
-      { "item": "portable_game", "prob": 8 },
-      { "item": "game_watch", "prob": 2 },
+      { "item": "tazer", "prob": 3, "charges": [ 0, 500 ] },
+      { "item": "mp3", "prob": 18, "charges": [ 0, 100 ] },
+      { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
+      { "item": "game_watch", "prob": 2, "charges": [ 0, 50 ] },
       { "item": "deck_of_cards", "prob": 2 },
       { "item": "roadmap", "prob": 40 },
       { "item": "trailmap", "prob": 20 },
@@ -89,7 +89,7 @@
       [ "thread", 20 ],
       { "group": "ammo_pocket_batteries_full", "prob": 25 },
       [ "superglue", 25 ],
-      [ "candle", 25 ],
+      { "item": "candle", "prob": 25, "charges": [ 0, 100 ] },
       [ "hammer", 20 ],
       [ "screwdriver", 20 ],
       [ "lighter", 25 ],
@@ -194,7 +194,7 @@
     "items": [
       { "group": "mags_pawnshop", "prob": 300 },
       [ "mag_fieldrepair", 50 ],
-      [ "oxylamp", 50 ],
+      { "item": "oxylamp", "prob": 50, "charges-min": 0 },
       [ "bathroom_scale", 50 ],
       [ "polisher", 6 ],
       [ "inflatable_boat", 10 ],
@@ -221,10 +221,10 @@
       [ "microwave", 5 ],
       [ "multi_cooker", 1 ],
       [ "pastaextruder", 8 ],
-      [ "can_sealer", 5 ],
+      { "item": "can_sealer", "prob": 5, "charges": [ 0, 500 ] },
       [ "knuckle_brass", 15 ],
       [ "platinum_small", 10 ],
-      [ "foodperson_mask", 1 ],
+      { "item": "foodperson_mask", "prob": 1, "charges": [ 0, 500 ] },
       [ "gold_small", 10 ],
       [ "silver_small", 20 ],
       [ "cane", 10 ],
@@ -245,10 +245,10 @@
       [ "platinum_watch", 1 ],
       [ "tieclip", 3 ],
       [ "collarpin", 3 ],
-      [ "mask_gas", 10 ],
+      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
       [ "goggles_welding", 70 ],
-      [ "goggles_nv", 1 ],
-      [ "goggles_ir", 1 ],
+      { "item": "goggles_nv", "prob": 1, "charges": [ 0, 100 ] },
+      { "item": "goggles_ir", "prob": 1, "charges": [ 0, 100 ] },
       [ "glasses_monocle", 2 ],
       [ "fancy_sunglasses", 15 ],
       [ "fc_hairpin", 5 ],
@@ -263,8 +263,8 @@
       [ "10gal_hat", 5 ],
       [ "hat_chef", 5 ],
       [ "jacket_chef", 5 ],
-      [ "eink_tablet_pc", 12 ],
-      [ "smart_lamp", 5 ],
+      { "item": "eink_tablet_pc", "prob": 12, "charges": [ 0, 100 ] },
+      { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
       [ "mask_guy_fawkes", 5 ],
       { "item": "camera", "prob": 10, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 5, "charges": [ 0, 150 ] },
@@ -275,15 +275,15 @@
       [ "mn_ebr_kit", 1 ],
       [ "match_trigger", 3 ],
       [ "autoclave", 1 ],
-      [ "geiger_off", 8 ],
-      [ "rad_monitor", 1 ],
+      { "item": "geiger_off", "prob": 8, "charges": [ 0, 100 ] },
+      { "item": "rad_monitor", "prob": 1, "charges": [ 0, 50 ] },
       [ "UPS_off", 5 ],
-      [ "tazer", 3 ],
-      [ "mp3", 18 ],
-      [ "portable_game", 8 ],
-      [ "game_watch", 2 ],
+      { "item": "tazer", "prob": 3, "charges": [ 0, 100 ] },
+      { "item": "mp3", "prob": 18, "charges": [ 0, 100 ] },
+      { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
+      { "item": "game_watch", "prob": 2, "charges": [ 0, 50 ] },
       [ "deck_of_cards", 2 ],
-      [ "vibrator", 5 ],
+      { "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] },
       [ "string_36", 40 ],
       [ "chain", 20 ],
       [ "steel_chunk", 30 ],
@@ -373,10 +373,10 @@
       [ "recipe_caseless", 1 ],
       { "item": "extinguisher", "prob": 20, "charges": 100 },
       [ "fan", 5 ],
-      [ "radio", 20 ],
+      { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       [ "chainsaw_off", 7 ],
-      [ "elec_chainsaw_off", 4 ],
-      [ "carver_off", 7 ],
+      { "item": "elec_chainsaw_off", "prob": 4, "charges": [ 0, 500 ] },
+      { "item": "carver_off", "prob": 7, "charges": [ 0, 500 ] },
       [ "jackhammer", 2 ],
       [ "elec_jackhammer", 1 ],
       [ "pickaxe", 1 ],
@@ -792,8 +792,8 @@
       { "item": "magnifying_glass", "prob": 25 },
       { "item": "glasses_reading", "prob": 50 },
       { "item": "string_6", "prob": 25 },
-      { "item": "candle", "prob": 20 },
-      { "item": "reading_light", "prob": 25 },
+      { "item": "candle", "prob": 20, "charges": [ 0, 100 ] },
+      { "item": "reading_light", "prob": 25, "charges": [ 0, 100 ] },
       { "item": "survnote", "prob": 1 }
     ]
   },
@@ -830,11 +830,11 @@
       { "item": "folding_bicycle", "prob": 3 },
       { "item": "sunglasses", "prob": 25 },
       { "item": "cowboy_hat", "prob": 25 },
-      { "item": "mp3", "prob": 35 },
+      { "item": "mp3", "prob": 35, "charges": [ 0, 100 ] },
       { "item": "wolfsuit", "prob": 5 },
       { "item": "dinosuit", "prob": 5 },
       { "item": "gum", "prob": 10 },
-      { "item": "talking_doll", "prob": 11 },
+      { "item": "talking_doll", "prob": 11, "charges": [ 0, 100 ] },
       { "item": "marble", "prob": 15 },
       { "item": "creepy_doll", "prob": 1 },
       { "item": "jedi_cloak", "prob": 5 },
@@ -1173,7 +1173,7 @@
       [ "hand_drill", 100 ],
       [ "screwdriver", 20 ],
       [ "screwdriver_set", 10 ],
-      [ "cordless_drill", 70 ],
+      { "item": "cordless_drill", "prob": 70, "charges": [ 0, 500 ] },
       [ "thermometer", 60 ],
       [ "saw", 90 ],
       [ "chainsaw_off", 10 ],
@@ -1252,7 +1252,7 @@
     "//": "For cs_car_showroom",
     "items": [
       { "group": "ammo_pocket_batteries_full", "prob": 10 },
-      [ "radio", 10 ],
+      { "item": "radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "rag", 30 ],
       [ "dress_shoes", 20 ],
       [ "longshirt", 30 ],
@@ -1277,7 +1277,7 @@
     "//": "for cs_car_dealership",
     "items": [
       { "group": "ammo_pocket_batteries_full", "prob": 30 },
-      [ "radio", 10 ],
+      { "item": "radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "eyedrops", 10 ],
       [ "rag", 30 ],
       [ "paper", 30 ],
@@ -1299,7 +1299,7 @@
     "//": "for cs_car_dealership",
     "items": [
       { "group": "ammo_pocket_batteries_full", "prob": 10 },
-      [ "radio", 10 ],
+      { "item": "radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "rag", 30 ],
       [ "jack", 20 ],
       [ "jack_small", 30 ],
@@ -1327,7 +1327,7 @@
     "//": "for cs_car_dealership",
     "items": [
       { "group": "ammo_any_batteries_full", "prob": 10 },
-      [ "radio", 10 ],
+      { "item": "radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "rag", 30 ],
       [ "jack", 20 ],
       [ "jack_small", 30 ],
@@ -1371,7 +1371,7 @@
     "id": "oa_ig_ts_tables",
     "//": "for cs_tire_shop",
     "items": [
-      [ "radio", 30 ],
+      { "item": "radio", "prob": 30, "charges": [ 0, 100 ] },
       [ "rag", 30 ],
       { "item": "cell_phone", "prob": 20, "charges": [ 0, 150 ] },
       [ "mag_mechanics", 20 ],
@@ -1390,7 +1390,7 @@
     "//": "for cs_tire_shop",
     "items": [
       { "group": "ammo_pocket_batteries_full", "prob": 10 },
-      [ "radio", 10 ],
+      { "item": "radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "rag", 30 ],
       [ "jack", 20 ],
       [ "jack_small", 30 ],
@@ -1420,7 +1420,7 @@
     "//": "for cs_tire_shop",
     "items": [
       { "group": "ammo_any_batteries_full", "prob": 10 },
-      [ "radio", 10 ],
+      { "item": "radio", "prob": 10, "charges": [ 0, 100 ] },
       [ "rag", 30 ],
       [ "jack", 20 ],
       [ "jack_small", 30 ],
@@ -1456,13 +1456,13 @@
     "//": "for cs_sex_shop",
     "items": [
       [ "corset", 20 ],
-      [ "vibrator", 20 ],
+      { "item": "vibrator", "prob": 20, "charges": [ 0, 100 ] },
       [ "leather_cat_tail", 20 ],
       [ "leather_cat_ears", 20 ],
       [ "leather_collar", 20 ],
       [ "bondage_mask", 20 ],
       [ "bullwhip", 20 ],
-      [ "candle", 20 ],
+      { "item": "candle", "prob": 20, "charges": [ 0, 100 ] },
       [ "condom", 20 ]
     ]
   },
@@ -1501,7 +1501,7 @@
       { "item": "hairpin", "prob": 5 },
       { "item": "syringe", "prob": 10 },
       { "item": "blanket", "prob": 20 },
-      { "item": "candle", "prob": 20 },
+      { "item": "candle", "prob": 20, "charges": [ 0, 100 ] },
       { "item": "pillow", "prob": 20 }
     ]
   },
@@ -1550,7 +1550,7 @@
     "magazine": 100,
     "items": [
       { "item": "flashlight", "prob": 95, "charges": 300 },
-      [ "wearable_light", 65 ],
+      { "item": "wearable_light", "prob": 65, "charges": 100 },
       [ "floodlight", 10 ],
       [ "atomic_light", 1 ]
     ]
@@ -1578,12 +1578,12 @@
     "ammo": 75,
     "magazine": 100,
     "items": [
-      [ "portable_game", 65 ],
+      { "item": "portable_game", "prob": 65, "charges": 100 },
       { "item": "cell_phone", "prob": 30, "charges": 150 },
       { "item": "smart_phone", "prob": 65, "charges": 120 },
-      [ "mp3", 65 ],
+      { "item": "mp3", "prob": 65, "charges": 100 },
       [ "radio_car_box", 35 ],
-      [ "vibrator", 1 ]
+      { "item": "vibrator", "prob": 1, "charges": 100 }
     ]
   },
   {