diff --git a/data/json/mapgen/evac_center.json b/data/json/mapgen/evac_center.json
index 1e622cb32a5db..f595faa0596e5 100644
--- a/data/json/mapgen/evac_center.json
+++ b/data/json/mapgen/evac_center.json
@@ -288,6 +288,11 @@
         { "class": "refugee_GarryVilleneuve", "x": 21, "y": 13 },
         { "class": "refugee_JohnClemens", "x": 22, "y": 3 },
         { "class": "guard", "x": 19, "y": 21 }
+      ],
+      "place_zones": [
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "free_merchants", "x": [ 1, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "old_guard", "x": [ 1, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "wasteland_scavengers", "x": [ 1, 23 ], "y": [ 0, 23 ] }
       ]
     }
   },
@@ -331,7 +336,15 @@
         { "item": "jackets", "x": [ 19, 19 ], "y": [ 8, 10 ], "chance": 80 },
         { "item": "cleaning", "x": [ 4, 4 ], "y": [ 8, 10 ], "chance": 80 }
       ],
-      "place_npcs": [ { "class": "evac_broker", "x": 2, "y": 20 }, { "class": "guard", "x": 15, "y": 15 } ]
+      "place_npcs": [ { "class": "evac_broker", "x": 2, "y": 20 }, { "class": "guard", "x": 15, "y": 15 } ],
+      "place_zones": [
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "free_merchants", "x": [ 0, 15 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "old_guard", "x": [ 0, 15 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "wasteland_scavengers", "x": [ 0, 15 ], "y": [ 0, 23 ] },
+        { "type": "NPC_NO_INVESTIGATE", "faction": "free_merchants", "x": [ 16, 23 ], "y": [ 6, 16 ] },
+        { "type": "NPC_NO_INVESTIGATE", "faction": "old_guard", "x": [ 16, 23 ], "y": [ 6, 16 ] },
+        { "type": "NPC_NO_INVESTIGATE", "faction": "wasteland_scavengers", "x": [ 16, 23 ], "y": [ 6, 16 ] }
+      ]
     }
   },
   {
@@ -388,7 +401,14 @@
         { "item": "allclothes", "x": [ 3, 15 ], "y": [ 11, 11 ], "chance": 60 },
         { "item": "allclothes", "x": [ 6, 15 ], "y": [ 16, 16 ], "chance": 60 }
       ],
-      "place_monsters": [ { "monster": "GROUP_MALL", "x": [ 2, 15 ], "y": [ 4, 20 ], "density": 0.6 } ]
+      "place_monsters": [ { "monster": "GROUP_MALL", "x": [ 2, 15 ], "y": [ 4, 20 ], "density": 0.6 } ],
+      "place_zones": [
+        { "type": "NPC_NO_INVESTIGATE", "faction": "lobby_beggars", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_NO_INVESTIGATE", "faction": "free_merchants", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_NO_INVESTIGATE", "faction": "old_guard", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_NO_INVESTIGATE", "faction": "wasteland_scavengers", "x": [ 0, 23 ], "y": [ 0, 23 ] }
+      ]
+
     }
   },
   {
@@ -503,7 +523,12 @@
         { "item": "cleaning", "x": [ 19, 19 ], "y": [ 13, 13 ], "chance": 80 }
       ],
       "place_npcs": [ { "class": "evac_guard2", "x": 18, "y": 18 } ],
-      "place_vehicles": [ { "vehicle": "schoolbus", "x": 4, "y": 8, "chance": 75, "rotation": 270 } ]
+      "place_vehicles": [ { "vehicle": "schoolbus", "x": 4, "y": 8, "chance": 75, "rotation": 270 } ],
+      "place_zones": [
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "free_merchants", "x": [ 9, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "old_guard", "x": [ 9, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "wasteland_scavengers", "x": [ 9, 23 ], "y": [ 0, 23 ] }
+      ]
     }
   },
   {
@@ -554,6 +579,12 @@
         { "class": "evac_guard1", "x": 9, "y": 21 },
         { "class": "guard", "x": 14, "y": 21 },
         { "class": "refugee_beggar5", "x": 16, "y": 22 }
+      ],
+      "place_zones": [
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "free_merchants", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "old_guard", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "wasteland_scavengers", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "lobby_beggars", "x": [ 0, 23 ], "y": [ 21, 23 ] }
       ]
     }
   },
@@ -598,6 +629,11 @@
       "place_vehicles": [
         { "vehicle": "car", "x": 17, "y": 16, "chance": 75, "rotation": 90 },
         { "vehicle": "pickup", "x": 18, "y": 8, "chance": 75, "rotation": 90 }
+      ],
+      "place_zones": [
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "free_merchants", "x": [ 13, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "old_guard", "x": [ 13, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "wasteland_scavengers", "x": [ 13, 23 ], "y": [ 0, 23 ] }
       ]
     }
   },
@@ -719,6 +755,12 @@
         { "class": "scavenger_merc", "x": 8, "y": 5 },
         { "class": "old_guard_rep", "x": 19, "y": 7 },
         { "class": "arsonist", "x": 11, "y": 7 }
+      ],
+      "place_zones": [
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "free_merchants", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "old_guard", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "wasteland_scavengers", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "lobby_beggars", "x": [ 0, 23 ], "y": [ 21, 23 ] }
       ]
     }
   },
@@ -769,6 +811,12 @@
         { "class": "refugee_beggar2", "x": 7, "y": 2 },
         { "class": "refugee_beggar3", "x": 16, "y": 0 },
         { "class": "refugee_beggar4", "x": 17, "y": 2 }
+      ],
+      "place_zones": [
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "free_merchants", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "old_guard", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "wasteland_scavengers", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "lobby_beggars", "x": [ 1, 22 ], "y": [ 0, 5 ] }
       ]
     }
   },
@@ -815,7 +863,12 @@
         { "item": "cannedfood", "x": [ 1, 2 ], "y": [ 10, 12 ], "chance": 20 },
         { "item": "cannedfood", "x": [ 1, 2 ], "y": [ 15, 17 ], "chance": 20 }
       ],
-      "place_npcs": [ { "class": "guard", "x": 7, "y": 8 } ]
+      "place_npcs": [ { "class": "guard", "x": 7, "y": 8 } ],
+      "place_zones": [
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "free_merchants", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "old_guard", "x": [ 0, 23 ], "y": [ 0, 23 ] },
+        { "type": "NPC_INVESTIGATE_ONLY", "faction": "wasteland_scavengers", "x": [ 0, 23 ], "y": [ 0, 23 ] }
+      ]
     }
   },
   {