--- a/data/json/itemgroups/SUS/evac_shelter.json
+++ b/data/json/itemgroups/SUS/evac_shelter.json
@@ -10,7 +10,13 @@
       { "item": "jacket_evac", "prob": 75 },
       { "item": "emer_blanket", "prob": 75 },
       { "item": "mask_gas", "prob": 2 },
-      { "item": "flashlight", "prob": 50 },
+      {
+        "item": "light_disposable_cell",
+        "charges-min": 150,
+        "charges-max": 300,
+        "container-item": "flashlight",
+        "prob": 50
+      },
       { "item": "light_disposable_cell", "prob": 10 },
       { "item": "lighter", "prob": 20, "charges": [ 60, 100 ] },
       { "item": "whistle", "prob": 70 },
@@ -83,9 +89,21 @@
             "collection": [
               { "item": "extinguisher", "prob": 70, "charges": 100 },
               { "group": "full_1st_aid", "count": [ 1, 3 ], "prob": 65 },
-              { "item": "two_way_radio", "prob": 65 },
+              {
+                "item": "light_disposable_cell",
+                "charges-min": 150,
+                "charges-max": 300,
+                "container-item": "two_way_radio",
+                "prob": 65
+              },
               { "item": "light_disposable_cell", "count": [ 2, 4 ], "prob": 65 },
-              { "item": "electric_lantern", "prob": 35 },
+              {
+                "item": "light_disposable_cell",
+                "charges-min": 150,
+                "charges-max": 300,
+                "container-item": "electric_lantern",
+                "prob": 35
+              },
               { "item": "barometer", "prob": 8 }
             ],
             "prob": 10