diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json
index b0df3271b1d49..0015eb8edc1bf 100644
--- a/data/json/monsters/zed-classic.json
+++ b/data/json/monsters/zed-classic.json
@@ -171,7 +171,11 @@
     ],
     "death_drops": "mon_zombie_hazmat_death_drops",
     "armor": { "bash": 5, "cut": 4, "bullet": 3, "electric": 5 },
-    "extend": { "weakpoint_sets": [ "wps_humanoid_gasmask" ], "families": [ "prof_wp_syn_armored" ], "flags": [ "ACIDPROOF" ] },
+    "extend": {
+      "weakpoint_sets": [ "wps_humanoid_gasmask" ],
+      "families": [ "prof_wp_syn_armored" ],
+      "flags": [ "ACIDPROOF", "GEN_DORMANT" ]
+    },
     "delete": { "special_attacks": [ "bite_humanoid", "scratch_humanoid" ] }
   },
   {
diff --git a/data/json/monsters/zed_burned.json b/data/json/monsters/zed_burned.json
index 4be6bc7b78dc2..e664056922f9e 100644
--- a/data/json/monsters/zed_burned.json
+++ b/data/json/monsters/zed_burned.json
@@ -46,7 +46,7 @@
     "vision_day": 10,
     "grab_strength": 10,
     "armor": { "bash": 2, "cut": 4, "acid": 3, "heat": 15, "bullet": 2, "electric": 3 },
-    "extend": { "flags": [ "REVIVES_HEALTHY", "NO_NECRO" ] }
+    "extend": { "flags": [ "REVIVES_HEALTHY", "NO_NECRO", "GEN_DORMANT" ] }
   },
   {
     "id": "mon_zombie_scorched_lasher",
diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json
index dae316e36c4cb..938a4e2f3fdda 100644
--- a/data/json/monsters/zed_soldiers.json
+++ b/data/json/monsters/zed_soldiers.json
@@ -16,7 +16,11 @@
     "death_drops": "mon_zombie_soldier_death_drops",
     "upgrades": { "half_life": 42, "into_group": "GROUP_SOLDIER_UPGRADE" },
     "armor": { "bash": 12, "cut": 25, "bullet": 20, "electric": 3 },
-    "extend": { "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], "families": [ "prof_wp_syn_armored" ] }
+    "extend": {
+      "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
+      "families": [ "prof_wp_syn_armored" ],
+      "flags": [ "GEN_DORMANT" ]
+    }
   },
   {
     "id": "mon_zombie_soldier_no_weakpoints",
@@ -57,7 +61,7 @@
     "upgrades": { "half_life": 45, "into": "mon_zombie_soldier_blackops_2" },
     "armor": { "bash": 12, "cut": 25, "bullet": 20, "electric": 3 },
     "extend": {
-      "flags": [ "SMELLS", "NIGHT_INVISIBILITY" ],
+      "flags": [ "SMELLS", "NIGHT_INVISIBILITY", "GEN_DORMANT" ],
       "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
       "families": [ "prof_wp_syn_armored" ]
     }
@@ -193,7 +197,8 @@
     "armor": { "bash": 20, "cut": 30, "bullet": 24, "electric": 3 },
     "extend": {
       "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
-      "families": [ "prof_wp_syn_armored", "prof_wp_nat_armored" ]
+      "families": [ "prof_wp_syn_armored", "prof_wp_nat_armored" ],
+      "flags": [ "GEN_DORMANT" ]
     },
     "delete": { "flags": [ "GRABS" ] }
   },
@@ -238,7 +243,7 @@
     "harvest": "zombie_humanoid",
     "death_drops": "mon_zombie_military_pilot_death_drops",
     "armor": { "bash": 5, "cut": 5, "bullet": 4, "electric": 2 },
-    "extend": { "weakpoint_sets": [ "wps_humanoid_full_helmet" ], "flags": [ "NOHEAD" ] },
+    "extend": { "weakpoint_sets": [ "wps_humanoid_full_helmet" ], "flags": [ "NOHEAD", "GEN_DORMANT" ] },
     "delete": { "flags": [ "HEARS" ] }
   },
   {
@@ -344,6 +349,6 @@
     "death_drops": "mon_zombie_armored_death_drops",
     "burn_into": "mon_zombie_scorched",
     "armor": { "bash": 64, "cut": 64, "acid": 20, "heat": 20, "bullet": 51, "electric": 10 },
-    "extend": { "families": [ "prof_wp_syn_armored" ] }
+    "extend": { "families": [ "prof_wp_syn_armored" ], "flags": [ "GEN_DORMANT" ] }
   }
 ]
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
index 3cde9a8fe6683..9a44b8afb3068 100644
--- a/data/json/overmap/overmap_special/specials.json
+++ b/data/json/overmap/overmap_special/specials.json
@@ -5868,68 +5868,68 @@
       {
         "//": "Roads are done, now time to place the actual buildings",
         "point": [ -5, 1, 0 ],
-        "overmap": "military_base_3x3_1_0"
+        "overmap": "military_base_3x3_1_0_north"
       },
-      { "point": [ -4, 1, 0 ], "overmap": "military_base_3x3_1_1" },
-      { "point": [ -3, 1, 0 ], "overmap": "military_base_3x3_1_2" },
-      { "point": [ -2, 1, 0 ], "overmap": "military_base_2x2_1_0" },
-      { "point": [ -1, 1, 0 ], "overmap": "military_base_2x2_1_1" },
-      { "point": [ 1, 1, 0 ], "overmap": "military_base_2x2_2_0" },
-      { "point": [ 2, 1, 0 ], "overmap": "military_base_2x2_2_1" },
-      { "point": [ 4, 1, 0 ], "overmap": "military_base_2x2_3_0" },
-      { "point": [ 5, 1, 0 ], "overmap": "military_base_2x2_3_1" },
-      { "point": [ -5, 2, 0 ], "overmap": "military_base_3x3_1_3" },
-      { "point": [ -4, 2, 0 ], "overmap": "military_base_3x3_1_4" },
-      { "point": [ -3, 2, 0 ], "overmap": "military_base_3x3_1_5" },
-      { "point": [ -2, 2, 0 ], "overmap": "military_base_2x2_1_2" },
-      { "point": [ -1, 2, 0 ], "overmap": "military_base_2x2_1_3" },
-      { "point": [ 1, 2, 0 ], "overmap": "military_base_2x2_2_2" },
-      { "point": [ 2, 2, 0 ], "overmap": "military_base_2x2_2_3" },
-      { "point": [ 3, 2, 0 ], "overmap": "military_base_1x1_1_0" },
-      { "point": [ 4, 2, 0 ], "overmap": "military_base_2x2_3_2" },
-      { "point": [ 5, 2, 0 ], "overmap": "military_base_2x2_3_3" },
-      { "point": [ -5, 3, 0 ], "overmap": "military_base_3x3_1_6" },
-      { "point": [ -4, 3, 0 ], "overmap": "military_base_3x3_1_7" },
-      { "point": [ -3, 3, 0 ], "overmap": "military_base_3x3_1_8" },
-      { "point": [ -1, 4, 0 ], "overmap": "military_base_1x1_2_0" },
-      { "point": [ 1, 4, 0 ], "overmap": "military_base_1x1_3_0" },
-      { "point": [ 2, 4, 0 ], "overmap": "military_base_3x3_2_0" },
-      { "point": [ 3, 4, 0 ], "overmap": "military_base_3x3_2_1" },
-      { "point": [ 4, 4, 0 ], "overmap": "military_base_3x3_2_2" },
-      { "point": [ 5, 4, 0 ], "overmap": "military_base_1x1_4_0" },
-      { "point": [ 6, 4, 0 ], "overmap": "military_base_1x1_5_0" },
-      { "point": [ -5, 5, 0 ], "overmap": "military_base_2x2_4_0" },
-      { "point": [ -4, 5, 0 ], "overmap": "military_base_2x2_4_1" },
-      { "point": [ -2, 5, 0 ], "overmap": "military_base_2x2_5_0" },
-      { "point": [ -1, 5, 0 ], "overmap": "military_base_2x2_5_1" },
-      { "point": [ 1, 5, 0 ], "overmap": "military_base_1x1_6_0" },
-      { "point": [ 2, 5, 0 ], "overmap": "military_base_3x3_2_3" },
-      { "point": [ 3, 5, 0 ], "overmap": "military_base_3x3_2_4" },
-      { "point": [ 4, 5, 0 ], "overmap": "military_base_3x3_2_5" },
-      { "point": [ -5, 6, 0 ], "overmap": "military_base_2x2_4_2" },
-      { "point": [ -4, 6, 0 ], "overmap": "military_base_2x2_4_3" },
-      { "point": [ -2, 6, 0 ], "overmap": "military_base_2x2_5_2" },
-      { "point": [ -1, 6, 0 ], "overmap": "military_base_2x2_5_3" },
-      { "point": [ 1, 6, 0 ], "overmap": "military_base_1x1_7_0" },
-      { "point": [ 2, 6, 0 ], "overmap": "military_base_3x3_2_6" },
-      { "point": [ 3, 6, 0 ], "overmap": "military_base_3x3_2_7" },
-      { "point": [ 4, 6, 0 ], "overmap": "military_base_3x3_2_8" },
-      { "point": [ 5, 6, 0 ], "overmap": "military_base_1x1_8_0" },
-      { "point": [ -5, 7, 0 ], "overmap": "military_base_barracks_0" },
-      { "point": [ -4, 7, 0 ], "overmap": "military_base_barracks_1" },
-      { "point": [ -3, 7, 0 ], "overmap": "military_base_3x3_3_0" },
-      { "point": [ -2, 7, 0 ], "overmap": "military_base_3x3_3_1" },
-      { "point": [ -1, 7, 0 ], "overmap": "military_base_3x3_3_2" },
-      { "point": [ -5, 8, 0 ], "overmap": "military_base_barracks_2" },
-      { "point": [ -4, 8, 0 ], "overmap": "military_base_barracks_3" },
-      { "point": [ -3, 8, 0 ], "overmap": "military_base_3x3_3_3" },
-      { "point": [ -2, 8, 0 ], "overmap": "military_base_3x3_3_4" },
-      { "point": [ -1, 8, 0 ], "overmap": "military_base_3x3_3_5" },
-      { "point": [ -5, 9, 0 ], "overmap": "military_base_barracks_4" },
-      { "point": [ -4, 9, 0 ], "overmap": "military_base_barracks_5" },
-      { "point": [ -3, 9, 0 ], "overmap": "military_base_3x3_3_6" },
-      { "point": [ -2, 9, 0 ], "overmap": "military_base_3x3_3_7" },
-      { "point": [ -1, 9, 0 ], "overmap": "military_base_3x3_3_8" }
+      { "point": [ -4, 1, 0 ], "overmap": "military_base_3x3_1_1_north" },
+      { "point": [ -3, 1, 0 ], "overmap": "military_base_3x3_1_2_north" },
+      { "point": [ -2, 1, 0 ], "overmap": "military_base_2x2_1_0_north" },
+      { "point": [ -1, 1, 0 ], "overmap": "military_base_2x2_1_1_north" },
+      { "point": [ 1, 1, 0 ], "overmap": "military_base_2x2_2_0_north" },
+      { "point": [ 2, 1, 0 ], "overmap": "military_base_2x2_2_1_north" },
+      { "point": [ 4, 1, 0 ], "overmap": "military_base_2x2_3_0_north" },
+      { "point": [ 5, 1, 0 ], "overmap": "military_base_2x2_3_1_north" },
+      { "point": [ -5, 2, 0 ], "overmap": "military_base_3x3_1_3_north" },
+      { "point": [ -4, 2, 0 ], "overmap": "military_base_3x3_1_4_north" },
+      { "point": [ -3, 2, 0 ], "overmap": "military_base_3x3_1_5_north" },
+      { "point": [ -2, 2, 0 ], "overmap": "military_base_2x2_1_2_north" },
+      { "point": [ -1, 2, 0 ], "overmap": "military_base_2x2_1_3_north" },
+      { "point": [ 1, 2, 0 ], "overmap": "military_base_2x2_2_2_north" },
+      { "point": [ 2, 2, 0 ], "overmap": "military_base_2x2_2_3_north" },
+      { "point": [ 3, 2, 0 ], "overmap": "military_base_1x1_1_0_north" },
+      { "point": [ 4, 2, 0 ], "overmap": "military_base_2x2_3_2_north" },
+      { "point": [ 5, 2, 0 ], "overmap": "military_base_2x2_3_3_north" },
+      { "point": [ -5, 3, 0 ], "overmap": "military_base_3x3_1_6_north" },
+      { "point": [ -4, 3, 0 ], "overmap": "military_base_3x3_1_7_north" },
+      { "point": [ -3, 3, 0 ], "overmap": "military_base_3x3_1_8_north" },
+      { "point": [ -1, 4, 0 ], "overmap": "military_base_1x1_2_0_north" },
+      { "point": [ 1, 4, 0 ], "overmap": "military_base_1x1_3_0_north" },
+      { "point": [ 2, 4, 0 ], "overmap": "military_base_3x3_2_0_north" },
+      { "point": [ 3, 4, 0 ], "overmap": "military_base_3x3_2_1_north" },
+      { "point": [ 4, 4, 0 ], "overmap": "military_base_3x3_2_2_north" },
+      { "point": [ 5, 4, 0 ], "overmap": "military_base_1x1_4_0_north" },
+      { "point": [ 6, 4, 0 ], "overmap": "military_base_1x1_5_0_north" },
+      { "point": [ -5, 5, 0 ], "overmap": "military_base_2x2_4_0_north" },
+      { "point": [ -4, 5, 0 ], "overmap": "military_base_2x2_4_1_north" },
+      { "point": [ -2, 5, 0 ], "overmap": "military_base_2x2_5_0_north" },
+      { "point": [ -1, 5, 0 ], "overmap": "military_base_2x2_5_1_north" },
+      { "point": [ 1, 5, 0 ], "overmap": "military_base_1x1_6_0_north" },
+      { "point": [ 2, 5, 0 ], "overmap": "military_base_3x3_2_3_north" },
+      { "point": [ 3, 5, 0 ], "overmap": "military_base_3x3_2_4_north" },
+      { "point": [ 4, 5, 0 ], "overmap": "military_base_3x3_2_5_north" },
+      { "point": [ -5, 6, 0 ], "overmap": "military_base_2x2_4_2_north" },
+      { "point": [ -4, 6, 0 ], "overmap": "military_base_2x2_4_3_north" },
+      { "point": [ -2, 6, 0 ], "overmap": "military_base_2x2_5_2_north" },
+      { "point": [ -1, 6, 0 ], "overmap": "military_base_2x2_5_3_north" },
+      { "point": [ 1, 6, 0 ], "overmap": "military_base_1x1_7_0_north" },
+      { "point": [ 2, 6, 0 ], "overmap": "military_base_3x3_2_6_north" },
+      { "point": [ 3, 6, 0 ], "overmap": "military_base_3x3_2_7_north" },
+      { "point": [ 4, 6, 0 ], "overmap": "military_base_3x3_2_8_north" },
+      { "point": [ 5, 6, 0 ], "overmap": "military_base_1x1_8_0_north" },
+      { "point": [ -5, 7, 0 ], "overmap": "military_base_barracks_0_north" },
+      { "point": [ -4, 7, 0 ], "overmap": "military_base_barracks_1_north" },
+      { "point": [ -3, 7, 0 ], "overmap": "military_base_3x3_3_0_north" },
+      { "point": [ -2, 7, 0 ], "overmap": "military_base_3x3_3_1_north" },
+      { "point": [ -1, 7, 0 ], "overmap": "military_base_3x3_3_2_north" },
+      { "point": [ -5, 8, 0 ], "overmap": "military_base_barracks_2_north" },
+      { "point": [ -4, 8, 0 ], "overmap": "military_base_barracks_3_north" },
+      { "point": [ -3, 8, 0 ], "overmap": "military_base_3x3_3_3_north" },
+      { "point": [ -2, 8, 0 ], "overmap": "military_base_3x3_3_4_north" },
+      { "point": [ -1, 8, 0 ], "overmap": "military_base_3x3_3_5_north" },
+      { "point": [ -5, 9, 0 ], "overmap": "military_base_barracks_4_north" },
+      { "point": [ -4, 9, 0 ], "overmap": "military_base_barracks_5_north" },
+      { "point": [ -3, 9, 0 ], "overmap": "military_base_3x3_3_6_north" },
+      { "point": [ -2, 9, 0 ], "overmap": "military_base_3x3_3_7_north" },
+      { "point": [ -1, 9, 0 ], "overmap": "military_base_3x3_3_8_north" }
     ],
     "locations": [ "field" ],
     "connections": [ { "point": [ 0, -4, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, -3, 0 ] } ],
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index d3ce5ca0ada1a..c0e7feb257ed0 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -4648,7 +4648,7 @@ bool mapgen_function_json_base::setup_common( const JsonObject &jo )
     point expected_dim = mapgensize + m_offset.xy().raw();
     cata_assert( expected_dim.x >= 0 );
     cata_assert( expected_dim.y >= 0 );
-    const std::string default_row( expected_dim.x, ' ' );
+    const std::string default_row( total_size.x, ' ' );
     const bool default_rows = !jo.has_array( "rows" );
     if( !default_rows ) {
         parray = jo.get_array( "rows" );