diff --git a/data/json/effects_on_condition/scenario_specific_eocs.json b/data/json/effects_on_condition/scenario_specific_eocs.json
index d672537674e81..6ec42b402f578 100644
--- a/data/json/effects_on_condition/scenario_specific_eocs.json
+++ b/data/json/effects_on_condition/scenario_specific_eocs.json
@@ -68,7 +68,8 @@
       { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" },
       {
         "u_run_monster_eocs": [ { "id": "EOC_BANISH_MONSTERS_AROUND_PLAYER", "effect": { "run_eocs": "EOC_BANISH_SELF" } } ],
-        "monster_range": 6
+        "mtype_ids": [ "mon_zombie", "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake", "mon_feral_maid_knife" ],
+        "monster_range": 10
       }
     ]
   },
@@ -111,7 +112,7 @@
       {
         "u_spawn_monster": "GROUP_MANSION_START",
         "group": true,
-        "real_count": 20,
+        "real_count": 15,
         "min_radius": 0,
         "max_radius": 36,
         "target_var": { "u_val": "mansion_centre" },
diff --git a/data/json/mapgen/mansion.json b/data/json/mapgen/mansion.json
index 07af21bc41e94..7356f83df7a8d 100644
--- a/data/json/mapgen/mansion.json
+++ b/data/json/mapgen/mansion.json
@@ -41,7 +41,7 @@
         "!": { "item": "crate_stack", "chance": 100 },
         "q": { "item": "tool_common_stack", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 17, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 17, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -85,7 +85,7 @@
         "K": { "item": "crate_cleaning", "chance": 100 },
         "I": { "item": "table_foyer", "chance": 40 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -133,7 +133,7 @@
       },
       "furniture": { "&": "f_sofa" },
       "items": { " ": { "item": "clutter_mansion", "chance": 2 }, "c": { "item": "suit_of_armor", "chance": 100 } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 17, 21 ], "density": 0.15 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 17, 21 ], "density": 0.15 } ]
     }
   },
   {
@@ -187,7 +187,7 @@
         "?": { "item": "wetbar_fridge", "chance": 80 },
         "1": { "item": "wetbar_stack", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 14, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 14, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -232,7 +232,7 @@
         "s": { "item": "table_foyer", "chance": 40 },
         "c": { "item": "suit_of_armor", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -498,13 +498,22 @@
           { "item": "tailorbooks", "chance": 60, "repeat": [ 0, 1 ] },
           { "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 2, 6 ] }
         ],
+        "f": [
+          { "item": "snacks_fancy", "chance": 65, "repeat": [ 1, 2 ] },
+          { "item": "table_sideboard", "chance": 40, "repeat": [ 2, 3 ] }
+        ],
+        "D": [ { "item": "sex_lair", "chance": 75, "repeat": [ 2, 3 ] }, { "item": "ss_merch_1", "chance": 55, "repeat": [ 2, 3 ] } ],
+        "d": [
+          { "item": "clothing_fancy", "chance": 75, "repeat": [ 2, 3 ] },
+          { "item": "beauty", "chance": 75, "repeat": [ 2, 3 ] }
+        ],
+        "h": [ { "item": "backroom", "chance": 55, "repeat": [ 1, 2 ] }, { "item": "tools_lighting", "chance": 100 } ],
         ".": { "item": "clutter_basement" },
         "=": { "item": "sex_lair", "chance": 25, "repeat": [ 2, 4 ] },
         "!": { "item": "crate_stack", "chance": 100 },
-        "D": { "item": "sex_lair", "chance": 55, "repeat": [ 2, 6 ] },
-        "d": { "item": "sex_lair", "chance": 55, "repeat": [ 2, 6 ] }
+        "$": { "item": "creepy", "chance": 25 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ],
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ],
       "place_monster": [ { "monster": "mon_zombie_resort_dancer", "x": [ 5, 19 ], "y": [ 16, 18 ], "repeat": [ 1, 2 ] } ]
     }
   },
@@ -555,7 +564,7 @@
         "s": { "item": "nightstand", "chance": 40 },
         "d": { "item": "dresser_stack", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -602,7 +611,7 @@
         "~": { "item": "clutter_bathroom", "chance": 10 },
         ")": { "item": "bed", "chance": 40 },
         "R": { "item": "mansion_bookcase", "chance": 100 },
-        "6": { "item": "panic_room", "chance": 65, "repeat": [ 2, 6 ] },
+        "6": { "item": "panic_room", "chance": 75, "repeat": [ 2, 6 ] },
         "I": { "item": "nightstand", "chance": 40 },
         "d": { "item": "dresser_stack", "chance": 100 }
       },
@@ -610,7 +619,7 @@
         { "group": "corpse_mansion", "x": [ 10, 12 ], "y": [ 5, 7 ], "chance": 50, "repeat": [ 0, 2 ] },
         { "item": "television", "x": 12, "y": 17, "chance": 100 }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 10, 13 ], "y": [ 6, 10 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 10, 13 ], "y": [ 6, 10 ], "density": 0.1 } ]
     }
   },
   {
@@ -670,7 +679,7 @@
         ",": { "item": "clutter_bathroom", "chance": 15 },
         "I": { "item": "vanity", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 11 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 11 ], "density": 0.1 } ]
     }
   },
   {
@@ -723,7 +732,7 @@
         "x": { "item": "a_television", "chance": 100 },
         "c": { "item": "suit_of_armor", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
     }
   },
   {
@@ -777,7 +786,7 @@
         { "item": "stereo", "x": 4, "y": 4, "chance": 100 },
         { "item": "television", "x": 14, "y": 9, "chance": 100 }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 11 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 11 ], "density": 0.1 } ]
     }
   },
   {
@@ -830,7 +839,7 @@
         "&": { "item": "table_wine", "chance": 100, "repeat": [ 1, 4 ] },
         ".": { "item": "clutter_basement" }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
     }
   },
   {
@@ -881,7 +890,7 @@
         "J": { "item": "table_sideboard", "chance": 35 },
         "x": { "item": "table_livingroom", "chance": 35 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -992,7 +1001,7 @@
         "`": { "item": "clutter_gym", "chance": 2 },
         "%": { "item": "locker_gym", "chance": 40 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 14 ], "y": [ 2, 9 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 14 ], "y": [ 2, 9 ], "density": 0.1 } ]
     }
   },
   {
@@ -1045,7 +1054,7 @@
         "R": { "item": "mansion_bookcase", "chance": 100 },
         "&": { "item": "mansion_bookcase", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1100,7 +1109,7 @@
         "&": { "item": "mansion_guns", "chance": 50, "repeat": [ 2, 3 ] },
         "∞": { "item": "mansion_guns", "chance": 50, "repeat": [ 2, 3 ] }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 4, 21 ], "y": [ 2, 9 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 4, 21 ], "y": [ 2, 9 ], "density": 0.1 } ]
     }
   },
   {
@@ -1167,7 +1176,7 @@
         "!": { "item": "crate_stack", "chance": 100 },
         "x": { "item": "a_television", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ],
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ],
       "place_vehicles": [ { "vehicle": "laundry_cart", "x": [ 14, 15 ], "y": [ 0, 6 ], "chance": 100 } ]
     }
   },
@@ -1224,7 +1233,7 @@
         ")": { "item": "bed", "chance": 30 },
         "∞": { "item": "mansion_guns", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1291,7 +1300,7 @@
         ",": { "item": "clutter_bathroom", "chance": 10 },
         "D": { "item": "dresser_servant", "chance": 45 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 7 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 7 ], "density": 0.1 } ]
     }
   },
   {
@@ -1349,7 +1358,7 @@
         "s": { "item": "snacks_fancy", "chance": 35 },
         "n": { "item": "mansion_ammo", "chance": 40 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
     }
   },
   {
@@ -1403,7 +1412,7 @@
         { "item": "metal_RPG_die", "x": 2, "y": 3, "chance": 10 },
         { "item": "RPG_die", "x": [ 1, 2 ], "y": [ 2, 3 ], "chance": 90, "repeat": [ 1, 4 ] }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1456,7 +1465,7 @@
         "F": { "item": "fridgesnacks", "chance": 45 },
         "f": { "item": "wetbar_stack", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 8 ], "y": [ 2, 11 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 8 ], "y": [ 2, 11 ], "density": 0.1 } ]
     }
   },
   {
@@ -1540,7 +1549,7 @@
         "C": { "item": "garden_shed", "chance": 40 },
         "G": { "item": "snacks_fancy", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1643,9 +1652,10 @@
         "J": { "item": "hardware_bulk", "chance": 30 },
         "q": { "item": "hardware_plumbing", "chance": 40 }
       },
+      "//": "Flavor spawn group for panic rooms with a different configuration of monsters for better story-telling.",
       "place_monsters": [
-        { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 9, 14 ], "y": [ 9, 14 ], "density": 0.1 }
+        { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 },
+        { "monster": "GROUP_PANICROOM", "x": [ 9, 14 ], "y": [ 9, 14 ], "density": 0.1 }
       ]
     }
   },
@@ -1698,7 +1708,7 @@
         "f": { "item": "table_ballroom", "chance": 35 },
         "c": { "item": "suit_of_armor", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1789,7 +1799,7 @@
         "&": { "item": "hardware_bulk", "chance": 30 },
         "N": { "item": "construction_worker", "chance": 35 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1854,7 +1864,7 @@
         "F": { "item": "vending_drink", "chance": 45 },
         "w": { "item": "sports", "chance": 35 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1948,7 +1958,7 @@
         "?": { "item": "fridgesnacks", "chance": 45 },
         "!": { "item": "crate_stack", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 8 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 8 ], "density": 0.1 } ]
     }
   },
   {
@@ -2028,7 +2038,7 @@
           "y": 15
         }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2075,7 +2085,7 @@
       },
       "furniture": { "&": "f_sofa" },
       "items": { "_": { "item": "clutter_mansion" }, " ": { "item": "clutter_mansion" }, "-": { "item": "clutter_mansion" } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 7 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 7 ], "density": 0.1 } ]
     }
   },
   {
@@ -2230,7 +2240,7 @@
         "1": { "item": "wetbar_stack", "chance": 100 },
         "l": { "item": "snacks_fancy", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 21 ], "y": [ 17, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 9, 21 ], "y": [ 17, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2270,7 +2280,7 @@
       "terrain": { " ": "t_soil", ".": "t_thconc_floor", "]": "t_sewage_pipe", ")": "t_sewage_pump" },
       "furniture": { "=": "f_machinery_old", "&": "f_table", "?": "f_generator_broken", "!": [ "f_crate_c", "f_cardboard_box" ] },
       "items": { ".": { "item": "clutter_basement" }, "!": { "item": "crate_stack", "chance": 100 } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 8, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 8, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2327,7 +2337,7 @@
         "J": { "item": "wetbar_stack", "chance": 100 },
         "l": { "item": "table_livingroom", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2387,7 +2397,7 @@
         ",": { "item": "clutter_bathroom", "chance": 10 },
         "i": { "item": "wetbar_counter", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 21 ], "y": [ 9, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 9, 21 ], "y": [ 9, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2431,7 +2441,7 @@
         "!": { "item": "crate_stack", "chance": 100 },
         "x": { "item": "a_television", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 8, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 8, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2484,7 +2494,7 @@
         "R": { "item": "mansion_bookcase", "chance": 100 },
         ")": { "item": "table_livingroom", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2544,7 +2554,7 @@
         "s": { "item": "snacks_fancy", "chance": 20 },
         "∞": { "item": "mansion_guns", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 15, 21 ], "y": [ 9, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 15, 21 ], "y": [ 9, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2610,7 +2620,7 @@
         "!": { "item": "crate_stack", "chance": 100 },
         "x": { "item": "a_television", "chance": 100 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 13, 21 ], "y": [ 7, 21 ], "density": 0.1 } ],
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 13, 21 ], "y": [ 7, 21 ], "density": 0.1 } ],
       "place_vehicles": [ { "vehicle": "laundry_cart", "x": [ 13, 18 ], "y": [ 8, 9 ], "chance": 50 } ]
     }
   },
@@ -2659,7 +2669,7 @@
         "R": { "item": "mansion_bookcase", "chance": 100 },
         "s": { "item": "nightstand", "chance": 35 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2710,7 +2720,7 @@
         ",": { "item": "softdrugs", "chance": 40 },
         "?": { "item": "dresser_servant", "chance": 45 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 18, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 18, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2765,7 +2775,7 @@
         "&": { "item": "table_wine", "chance": 100, "repeat": [ 1, 4 ] },
         ".": { "item": "clutter_basement" }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 11, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 11, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2816,7 +2826,7 @@
         ".": { "item": "clutter_yard" },
         "r": { "item": "table_sideboard", "chance": 40 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ],
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ],
       "place_vehicles": [ { "vehicle": "cannon_3in", "x": 18, "y": 3, "chance": 1 } ]
     }
   },
@@ -2879,7 +2889,7 @@
         "-": { "item": "clutter_bedroom", "chance": 2 },
         "I": { "item": "nightstand", "chance": 40 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 8, 21 ], "y": [ 12, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 8, 21 ], "y": [ 12, 21 ], "density": 0.1 } ]
     }
   }
 ]
diff --git a/data/json/mapgen/mansion_boarded.json b/data/json/mapgen/mansion_boarded.json
index 1e4df060a2b8a..2ea2a584ee298 100644
--- a/data/json/mapgen/mansion_boarded.json
+++ b/data/json/mapgen/mansion_boarded.json
@@ -40,7 +40,7 @@
         "K": { "item": "crate_cleaning", "chance": 100 },
         "I": { "item": "table_foyer", "chance": 40 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 12, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 12, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -89,7 +89,7 @@
       },
       "furniture": { "&": "f_sofa" },
       "items": { " ": { "item": "clutter_mansion", "chance": 2 }, "c": { "item": "suit_of_armor", "chance": 100 } },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 17, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 17, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -142,7 +142,7 @@
         "x": { "item": "a_television", "chance": 100 },
         "c": { "item": "suit_of_armor", "chance": 100 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -226,15 +226,24 @@
           { "item": "tailorbooks", "chance": 60, "repeat": [ 0, 1 ] },
           { "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 2, 6 ] }
         ],
+        "f": [
+          { "item": "snacks_fancy", "chance": 65, "repeat": [ 1, 2 ] },
+          { "item": "table_sideboard", "chance": 40, "repeat": [ 2, 3 ] }
+        ],
+        "D": [ { "item": "sex_lair", "chance": 75, "repeat": [ 2, 3 ] }, { "item": "ss_merch_1", "chance": 55, "repeat": [ 2, 3 ] } ],
+        "d": [
+          { "item": "clothing_fancy", "chance": 75, "repeat": [ 2, 3 ] },
+          { "item": "beauty", "chance": 75, "repeat": [ 2, 3 ] }
+        ],
+        "h": [ { "item": "backroom", "chance": 55, "repeat": [ 1, 2 ] }, { "item": "tools_lighting", "chance": 100 } ],
         ".": { "item": "clutter_basement" },
         "=": { "item": "sex_lair", "chance": 25, "repeat": [ 2, 4 ] },
         "!": { "item": "crate_stack", "chance": 100 },
-        "D": { "item": "sex_lair", "chance": 55, "repeat": [ 2, 6 ] },
-        "d": { "item": "sex_lair", "chance": 55, "repeat": [ 2, 6 ] }
+        "$": { "item": "creepy", "chance": 25 }
       },
       "place_monster": [
-        { "group": "GROUP_ZOMBIE", "x": [ 2, 23 ], "y": [ 2, 12 ], "chance": 35, "repeat": [ 1, 4 ] },
-        { "monster": "mon_zombie_resort_dancer", "x": [ 5, 19 ], "y": [ 16, 18 ], "chance": 50, "repeat": [ 1, 2 ] }
+        { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 2, 23 ], "y": [ 2, 12 ], "chance": 35, "repeat": [ 2, 3 ] },
+        { "monster": "mon_zombie_resort_dancer", "x": [ 5, 19 ], "y": [ 16, 18 ], "chance": 33, "repeat": [ 1, 2 ] }
       ],
       "place_zones": [ { "type": "ZONE_START_POINT", "faction": "your_followers", "x": [ 5, 10 ], "y": [ 16, 18 ] } ]
     }
@@ -286,7 +295,7 @@
         "s": { "item": "nightstand", "chance": 40 },
         "d": { "item": "dresser_stack", "chance": 100 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -334,7 +343,7 @@
         "~": { "item": "clutter_bathroom", "chance": 10 },
         ")": { "item": "bed", "chance": 40 },
         "R": { "item": "mansion_bookcase", "chance": 100 },
-        "6": { "item": "panic_room", "chance": 65, "repeat": [ 2, 6 ] },
+        "6": { "item": "panic_room", "chance": 75, "repeat": [ 2, 6 ] },
         "I": { "item": "nightstand", "chance": 40 },
         "d": { "item": "dresser_stack", "chance": 100 }
       },
@@ -342,9 +351,10 @@
         { "group": "corpse_mansion", "x": [ 10, 12 ], "y": [ 5, 7 ], "chance": 50, "repeat": [ 0, 2 ] },
         { "item": "television", "x": 12, "y": 17, "chance": 100 }
       ],
+      "//": "Flavor spawn group for panic rooms with a different configuration of monsters for better story-telling.",
       "place_monster": [
-        { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 12, 23 ], "chance": 35, "repeat": [ 1, 4 ] },
-        { "group": "GROUP_ZOMBIE", "x": [ 11, 13 ], "y": [ 6, 10 ], "chance": 65, "repeat": [ 1, 2 ] }
+        { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 12, 23 ], "chance": 35, "repeat": [ 2, 3 ] },
+        { "group": "GROUP_FANCY_PANICROOM", "x": [ 11, 13 ], "y": [ 6, 10 ], "chance": 65, "repeat": [ 1, 2 ] }
       ],
       "place_zones": [ { "type": "ZONE_START_POINT", "faction": "your_followers", "x": [ 10, 13 ], "y": [ 3, 4 ] } ]
     }
@@ -407,7 +417,7 @@
         ",": { "item": "clutter_bathroom", "chance": 15 },
         "I": { "item": "vanity", "chance": 30 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 11 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 11 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -462,7 +472,7 @@
         { "item": "stereo", "x": 4, "y": 4, "chance": 100 },
         { "item": "television", "x": 14, "y": 9, "chance": 100 }
       ],
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 11 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 11 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -514,7 +524,7 @@
         "J": { "item": "table_sideboard", "chance": 35 },
         "x": { "item": "table_livingroom", "chance": 35 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 0, 23 ], "y": [ 0, 15 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 0, 23 ], "y": [ 0, 15 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -616,7 +626,7 @@
         "i": { "item": "pool_side", "chance": 30 },
         ",": { "item": "pool_side", "chance": 2 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE_POOL", "x": [ 9, 23 ], "y": [ 4, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_ZOMBIE_POOL", "x": [ 9, 23 ], "y": [ 4, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -679,7 +689,7 @@
         "1": { "item": "wetbar_stack", "chance": 100 },
         "l": { "item": "snacks_fancy", "chance": 30 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 9, 23 ], "y": [ 17, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 9, 23 ], "y": [ 17, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -742,7 +752,7 @@
         "J": { "item": "wetbar_stack", "chance": 100 },
         "l": { "item": "table_livingroom", "chance": 30 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 6, 23 ], "y": [ 4, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 6, 23 ], "y": [ 4, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -803,7 +813,7 @@
         ",": { "item": "clutter_bathroom", "chance": 10 },
         "i": { "item": "wetbar_counter", "chance": 30 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 9, 23 ], "y": [ 9, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 9, 23 ], "y": [ 9, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -857,7 +867,7 @@
         "R": { "item": "mansion_bookcase", "chance": 100 },
         ")": { "item": "table_livingroom", "chance": 30 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 5, 23 ], "y": [ 6, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 5, 23 ], "y": [ 6, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -918,7 +928,7 @@
         "s": { "item": "snacks_fancy", "chance": 20 },
         "∞": { "item": "mansion_guns", "chance": 100 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 15, 23 ], "y": [ 9, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 15, 23 ], "y": [ 9, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -966,7 +976,7 @@
         "R": { "item": "mansion_bookcase", "chance": 100 },
         "s": { "item": "nightstand", "chance": 35 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 10, 23 ], "y": [ 6, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 10, 23 ], "y": [ 6, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   },
   {
@@ -1018,7 +1028,7 @@
         ",": { "item": "softdrugs", "chance": 40 },
         "?": { "item": "dresser_servant", "chance": 45 }
       },
-      "place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 18, 23 ], "y": [ 8, 23 ], "chance": 65, "repeat": [ 3, 5 ] } ]
+      "place_monster": [ { "group": "GROUP_VANILLA_ONLY_HUMANS", "x": [ 18, 23 ], "y": [ 8, 23 ], "chance": 65, "repeat": [ 2, 3 ] } ]
     }
   }
 ]
diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
index 93c48e05bc118..1719912342443 100644
--- a/data/json/monstergroups/misc.json
+++ b/data/json/monstergroups/misc.json
@@ -65,10 +65,10 @@
     "name": "GROUP_MANSION_START",
     "//": "Nonsense ferals for the mansion escape challenge scenario, shouldn't be used for general spawns",
     "monsters": [
-      { "monster": "mon_feral_maid_broom", "weight": 400 },
-      { "monster": "mon_feral_maid_candlestick", "weight": 400 },
+      { "monster": "mon_feral_maid_broom", "weight": 600 },
+      { "monster": "mon_feral_maid_candlestick", "weight": 600 },
       { "monster": "mon_feral_maid_knife", "weight": 400 },
-      { "monster": "mon_feral_fancy_rapier", "weight": 300 },
+      { "monster": "mon_feral_fancy_rapier", "weight": 200 },
       { "monster": "mon_feral_fancy_rapier_fake", "weight": 300 }
     ]
   },
diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
index d5e58fe93b56b..52c7b99398f08 100644
--- a/data/json/monstergroups/zombies.json
+++ b/data/json/monstergroups/zombies.json
@@ -538,6 +538,41 @@
       { "monster": "mon_dog_zombie_cop", "weight": 50, "cost_multiplier": 2, "pack_size": [ 1, 2 ] }
     ]
   },
+  {
+    "name": "GROUP_PANICROOM",
+    "type": "monstergroup",
+    "//": "Flavor spawn group for panic rooms for better story-telling.  Improved chance of dogs, fancy dogs, and (still) breathing people and children.",
+    "monsters": [
+      { "monster": "mon_zombie_child", "weight": 180 },
+      { "monster": "mon_zombie", "weight": 120, "cost_multiplier": 2 },
+      { "group": "GROUP_CIVILIANS_STANDARD", "weight": 200 },
+      { "group": "GROUP_FERAL", "weight": 150, "cost_multiplier": 2 },
+      { "group": "GROUP_PET_DOGS", "weight": 100, "cost_multiplier": 2 },
+      { "monster": "mon_dog_rottweiler", "weight": 100, "cost_multiplier": 2 },
+      { "monster": "mon_dog_gpyrenees", "weight": 100, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_dog", "weight": 20 }
+    ]
+  },
+  {
+    "name": "GROUP_FANCY_PANICROOM",
+    "type": "monstergroup",
+    "//": "Same as above, but with the fancy ferals thrown into the mix for the scenario.",
+    "monsters": [
+      { "monster": "mon_zombie_child", "weight": 250 },
+      { "monster": "mon_zombie", "weight": 20, "cost_multiplier": 2 },
+      { "group": "GROUP_CIVILIANS_STANDARD", "weight": 100 },
+      { "group": "GROUP_FERAL", "weight": 50, "cost_multiplier": 2 },
+      { "monster": "mon_feral_maid_broom", "weight": 20 },
+      { "monster": "mon_feral_maid_candlestick", "weight": 20 },
+      { "monster": "mon_feral_maid_knife", "weight": 20 },
+      { "monster": "mon_feral_fancy_rapier", "weight": 140, "cost_multiplier": 5 },
+      { "monster": "mon_feral_fancy_rapier_fake", "weight": 100, "cost_multiplier": 3 },
+      { "group": "GROUP_PET_DOGS", "weight": 100, "cost_multiplier": 2 },
+      { "monster": "mon_dog_rottweiler", "weight": 100, "cost_multiplier": 2 },
+      { "monster": "mon_dog_gpyrenees", "weight": 100, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_dog", "weight": 20 }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_ZOMBULL_FROG_UPGRADE",
diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
index a85cdb3a56880..e66af0d242ce5 100644
--- a/data/json/monsters/feral_humans.json
+++ b/data/json/monsters/feral_humans.json
@@ -271,7 +271,10 @@
     "description": "Once a fancy servant of some rich family, this maniac walks around with a broom in hand, searching for a victim to sweep off this mortal coil.",
     "copy-from": "mon_feral_human_pipe",
     "melee_skill": 2,
-    "special_attacks": [ { "id": "feral_weapon_broom" } ],
+    "special_attacks": [ { "id": "feral_weapon_broom" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT_AT_DANGER", 0 ] ],
+    "extend": { "flags": [ "CLIMBS" ] },
+    "delete": { "flags": [ "BASHES", "GROUP_BASH" ] },
+    "//2": "Removed bashing and added CLIMBS to avoid them from trashing too much the mansion.",
     "death_drops": "feral_maids_death_drops_broom"
   },
   {
@@ -280,7 +283,7 @@
     "copy-from": "mon_feral_maid_broom",
     "name": { "str": "feral servant" },
     "description": "Once a fancy servant of some rich family, this maniac walks around with a candlestick in hand, ready to snuff out your life.",
-    "special_attacks": [ { "id": "feral_weapon_candlestick" } ],
+    "special_attacks": [ { "id": "feral_weapon_candlestick" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT_AT_DANGER", 0 ] ],
     "death_drops": "feral_maids_death_drops_candlestick"
   },
   {
@@ -290,7 +293,7 @@
     "name": { "str": "feral servant" },
     "description": "Once a fancy servant of some rich family, this maniac walks around with a knife in hand, searching for some victims to butcher.",
     "melee_skill": 3,
-    "special_attacks": [ { "id": "feral_weapon_knife_chef" } ],
+    "special_attacks": [ { "id": "feral_weapon_knife_chef" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT_AT_DANGER", 0 ] ],
     "death_drops": "feral_maids_death_drops_knife"
   },
   {
@@ -300,7 +303,7 @@
     "name": { "str": "well dressed feral" },
     "description": "Wearing fancy clothes and with a rapier in hand, this maniac was once a socialite.  They smile with madness and seem like they want to invite you to dinner.",
     "melee_skill": 4,
-    "special_attacks": [ { "id": "feral_weapon_rapier" } ],
+    "special_attacks": [ { "id": "feral_weapon_rapier" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT", 400 ] ],
     "death_drops": "feral_fancy_death_drops_rapier"
   },
   {
@@ -309,7 +312,7 @@
     "copy-from": "mon_feral_fancy_rapier",
     "name": { "str": "well dressed feral" },
     "description": "Wearing fancy clothes and with a rapier in hand, this maniac was once a socialite.  They smile with madness and seem like they want to invite you to dinner.",
-    "special_attacks": [ { "id": "feral_weapon_rapier_fake" } ],
+    "special_attacks": [ { "id": "feral_weapon_rapier_fake" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT", 400 ] ],
     "death_drops": "feral_fancy_death_drops_rapier_fake"
   },
   {
@@ -320,10 +323,14 @@
     "color": "i_magenta",
     "description": "Clad in ancient armor and with a mace in hand, this maniac walks around in search of their next prey.  You can see stains of dried blood all over their mace.",
     "melee_skill": 3,
-    "speed": 85,
-    "special_attacks": [ { "id": "feral_weapon_mace" } ],
+    "speed": 75,
+    "special_attacks": [ { "id": "feral_weapon_mace" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT", 600 ] ],
     "death_drops": "feral_armored_death_drops_mace",
-    "extend": { "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ] },
+    "extend": {
+      "flags": [ "LOUDMOVES", "BASHES", "GROUP_BASH" ],
+      "weakpoint_sets": [ "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ]
+    },
+    "delete": { "flags": [ "CLIMBS" ] },
     "//": "No synthetic armor proficiency because plate armor doesn't work the same as modern armor",
     "armor": { "bash": 20, "cut": 20, "stab": 15, "bullet": 12 }
   },
@@ -334,7 +341,7 @@
     "color": "i_magenta",
     "name": { "str": "armored feral" },
     "description": "Clad in ancient armor and with a battle axe in hand, this maniac walks around in search of their next prey.  You can see stains of dried blood all over their axe.",
-    "special_attacks": [ { "id": "feral_weapon_battleaxe" } ],
+    "special_attacks": [ { "id": "feral_weapon_battleaxe" }, [ "BROWSE", 100 ], [ "EAT_FOOD", 100 ], [ "PARROT", 600 ] ],
     "death_drops": "feral_armored_death_drops_battleaxe"
   },
   {
diff --git a/data/json/speech.json b/data/json/speech.json
index 95aa2607b8ddb..c119369b30200 100644
--- a/data/json/speech.json
+++ b/data/json/speech.json
@@ -2725,7 +2725,7 @@
   },
   {
     "type": "speech",
-    "speaker": [ "mon_civilian_zombiefighter" ],
+    "speaker": [ "mon_civilian_zombiefighter", "mon_feral_maid_broom", "mon_feral_maid_candlestick", "mon_feral_maid_knife" ],
     "sound": "\"Die!\"",
     "volume": 30
   },
@@ -2789,6 +2789,132 @@
     "sound": "someone calling for their child.",
     "volume": 25
   },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_broom", "mon_feral_maid_candlestick", "mon_feral_maid_knife" ],
+    "sound": "\"Here!\"",
+    "volume": 40
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_broom", "mon_feral_maid_candlestick", "mon_feral_maid_knife" ],
+    "sound": "\"Here it is!\"",
+    "volume": 40
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_broom", "mon_feral_maid_candlestick", "mon_feral_maid_knife" ],
+    "sound": "\"Found you!\"",
+    "volume": 30
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_broom", "mon_feral_maid_candlestick", "mon_feral_maid_knife" ],
+    "sound": "\"You are trapped!\"",
+    "volume": 30
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_broom" ],
+    "sound": "\"Time to take out the trash!\"",
+    "volume": 30
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_candlestick" ],
+    "sound": "\"Time to turn off the lights!\"",
+    "volume": 30
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_knife" ],
+    "sound": "\"Food is ready!\"",
+    "volume": 30
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_knife" ],
+    "sound": "\"Today's menu is… You!\"",
+    "volume": 30
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_knife" ],
+    "sound": "\"Looks like meat is back on the menu!\"",
+    "volume": 30
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_maid_broom", "mon_feral_maid_candlestick", "mon_feral_maid_knife" ],
+    "sound": "\"Come here!\"",
+    "volume": 30
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake", "mon_feral_armored_mace", "mon_feral_armored_battleaxe" ],
+    "sound": "\"Where…\"",
+    "volume": 5
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake" ],
+    "sound": "\"Look over there!\"",
+    "volume": 10
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake" ],
+    "sound": "\"Come eat with me…\"",
+    "volume": 8
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake" ],
+    "sound": "\"Come dance with me!\"",
+    "volume": 10
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake" ],
+    "sound": "\"You can't hide forever…\"",
+    "volume": 8
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake" ],
+    "sound": "\"Did you hear that?…\"",
+    "volume": 8
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_fancy_rapier", "mon_feral_fancy_rapier_fake" ],
+    "sound": "\"Another dead end!\"",
+    "volume": 10
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_armored_mace", "mon_feral_armored_battleaxe" ],
+    "sound": "the sound of metal dragged on the floor.",
+    "volume": 8
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_armored_mace", "mon_feral_armored_battleaxe" ],
+    "sound": "heavy but muffled breathing.",
+    "volume": 5
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_armored_mace", "mon_feral_armored_battleaxe" ],
+    "sound": "a strong swing of something in the air.",
+    "volume": 10
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_armored_mace", "mon_feral_armored_battleaxe" ],
+    "sound": "footsteps of something heavy and big.",
+    "volume": 8
+  },
   {
     "type": "speech",
     "speaker": [ "mon_star_vampire", "mon_vocal_frog", "mon_vocal_bigfrog" ],
diff --git a/data/mods/No_Hope/Mapgen/mansion.json b/data/mods/No_Hope/Mapgen/mansion.json
index 331d80d8176b8..33de1af8b01ec 100644
--- a/data/mods/No_Hope/Mapgen/mansion.json
+++ b/data/mods/No_Hope/Mapgen/mansion.json
@@ -41,7 +41,7 @@
         "!": { "item": "crate_stack", "chance": 20 },
         "q": { "item": "tool_common_stack", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 17, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 17, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -85,7 +85,7 @@
         "K": { "item": "crate_cleaning", "chance": 20 },
         "I": { "item": "table_foyer", "chance": 40 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -133,7 +133,7 @@
       },
       "furniture": { "&": "f_sofa" },
       "items": { " ": { "item": "clutter_mansion", "chance": 2 }, "c": { "item": "suit_of_armor", "chance": 10 } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 17, 21 ], "density": 0.15 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 17, 21 ], "density": 0.15 } ]
     }
   },
   {
@@ -187,7 +187,7 @@
         "?": { "item": "wetbar_fridge", "chance": 20 },
         "1": { "item": "wetbar_stack", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 14, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 14, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -232,7 +232,7 @@
         "s": { "item": "table_foyer", "chance": 40 },
         "c": { "item": "suit_of_armor", "chance": 10 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -316,13 +316,22 @@
           { "item": "tailorbooks", "chance": 20, "repeat": [ 0, 1 ] },
           { "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 2, 6 ] }
         ],
+        "f": [
+          { "item": "snacks_fancy", "chance": 35 },
+          { "item": "table_sideboard", "chance": 20 }
+        ],
+        "D": [ { "item": "sex_lair", "chance": 35 }, { "item": "ss_merch_1", "chance": 25 } ],
+        "d": [
+          { "item": "clothing_fancy", "chance": 35 },
+          { "item": "beauty", "chance": 25 }
+        ],
+        "h": [ { "item": "backroom", "chance": 15 }, { "item": "tools_lighting", "chance": 25 } ],
         ".": { "item": "clutter_basement" },
         "=": { "item": "sex_lair", "chance": 10 },
         "!": { "item": "crate_stack", "chance": 10 },
-        "D": { "item": "sex_lair", "chance": 15 },
-        "d": { "item": "sex_lair", "chance": 15 }
+        "$": { "item": "creepy", "chance": 5 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ],
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ],
       "place_monster": [ { "monster": "mon_zombie_resort_dancer", "x": [ 6, 19 ], "y": [ 16, 18 ], "repeat": [ 1, 2 ] } ]
     }
   },
@@ -373,7 +382,7 @@
         "s": { "item": "nightstand", "chance": 40 },
         "d": { "item": "dresser_stack", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -428,7 +437,7 @@
         { "group": "corpse_mansion", "x": [ 10, 12 ], "y": [ 5, 7 ], "chance": 50, "repeat": [ 0, 2 ] },
         { "item": "television", "x": 12, "y": 17, "chance": 50 }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 11, 14 ], "y": [ 6, 10 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 11, 14 ], "y": [ 6, 10 ], "density": 0.1 } ]
     }
   },
   {
@@ -488,7 +497,7 @@
         ",": { "item": "clutter_bathroom", "chance": 15 },
         "I": { "item": "vanity", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 11 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 11 ], "density": 0.1 } ]
     }
   },
   {
@@ -541,7 +550,7 @@
         "x": { "item": "a_television", "chance": 50 },
         "c": { "item": "suit_of_armor", "chance": 10 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
     }
   },
   {
@@ -595,7 +604,7 @@
         { "item": "stereo", "x": 4, "y": 4, "chance": 50 },
         { "item": "television", "x": 14, "y": 9, "chance": 50 }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 11 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 11 ], "density": 0.1 } ]
     }
   },
   {
@@ -648,7 +657,7 @@
         "&": { "item": "table_wine", "chance": 20, "repeat": [ 1, 4 ] },
         ".": { "item": "clutter_basement" }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
     }
   },
   {
@@ -744,7 +753,7 @@
         "R": { "item": "mansion_bookcase", "chance": 20 },
         "&": { "item": "mansion_bookcase", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -799,7 +808,7 @@
         "&": { "item": "mansion_guns", "chance": 20, "repeat": [ 2, 3 ] },
         "∞": { "item": "mansion_guns", "chance": 20, "repeat": [ 2, 3 ] }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 4, 21 ], "y": [ 2, 9 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 4, 21 ], "y": [ 2, 9 ], "density": 0.1 } ]
     }
   },
   {
@@ -867,7 +876,7 @@
         "!": { "item": "crate_stack", "chance": 20 },
         "x": { "item": "a_television", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ],
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ],
       "place_vehicles": [ { "vehicle": "laundry_cart", "x": [ 14, 15 ], "y": [ 0, 6 ], "chance": 100 } ]
     }
   },
@@ -935,7 +944,7 @@
         ",": { "item": "clutter_bathroom", "chance": 10 },
         "D": { "item": "dresser_servant", "chance": 45 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 7 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 7 ], "density": 0.1 } ]
     }
   },
   {
@@ -993,7 +1002,7 @@
         "s": { "item": "snacks_fancy", "chance": 35 },
         "n": { "item": "mansion_ammo", "chance": 40 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 12 ], "density": 0.1 } ]
     }
   },
   {
@@ -1047,7 +1056,7 @@
         { "item": "metal_RPG_die", "x": 2, "y": 3, "chance": 10 },
         { "item": "RPG_die", "x": [ 1, 2 ], "y": [ 2, 3 ], "chance": 90, "repeat": [ 1, 4 ] }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1100,7 +1109,7 @@
         "F": { "item": "fridgesnacks", "chance": 25 },
         "f": { "item": "wetbar_stack", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 8 ], "y": [ 2, 11 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 8 ], "y": [ 2, 11 ], "density": 0.1 } ]
     }
   },
   {
@@ -1165,9 +1174,10 @@
         "J": { "item": "hardware_bulk", "chance": 30 },
         "q": { "item": "hardware_plumbing", "chance": 40 }
       },
+      "//": "Flavor spawn group for panic rooms with a different configuration of monsters for better story-telling.",
       "place_monsters": [
-        { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 },
-        { "monster": "GROUP_ZOMBIE", "x": [ 10, 15 ], "y": [ 9, 14 ], "density": 0.1 }
+        { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 },
+        { "monster": "GROUP_PANICROOM", "x": [ 10, 15 ], "y": [ 9, 14 ], "density": 0.1 }
       ]
     }
   },
@@ -1216,7 +1226,7 @@
         "f": { "item": "table_ballroom", "chance": 35 },
         "c": { "item": "suit_of_armor", "chance": 10 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1269,7 +1279,7 @@
         "&": { "item": "hardware_bulk", "chance": 30 },
         "N": { "item": "construction_worker", "chance": 35 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1335,7 +1345,7 @@
         "F": { "item": "vending_drink", "chance": 25 },
         "w": { "item": "sports", "chance": 35 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1392,7 +1402,7 @@
         "?": { "item": "fridgesnacks", "chance": 45 },
         "!": { "item": "crate_stack", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 8 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 8 ], "density": 0.1 } ]
     }
   },
   {
@@ -1472,7 +1482,7 @@
           "y": 15
         }
       ],
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1577,7 +1587,7 @@
         "1": { "item": "wetbar_stack", "chance": 20 },
         "l": { "item": "snacks_fancy", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 21 ], "y": [ 17, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 9, 21 ], "y": [ 17, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1617,7 +1627,7 @@
       "terrain": { " ": "t_soil", ".": "t_thconc_floor", "]": "t_sewage_pipe", ")": "t_sewage_pump" },
       "furniture": { "=": "f_machinery_old", "&": "f_table", "?": "f_generator_broken", "!": [ "f_crate_c", "f_cardboard_box" ] },
       "items": { ".": { "item": "clutter_basement" }, "!": { "item": "crate_stack", "chance": 20 } },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 8, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 8, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1674,7 +1684,7 @@
         "J": { "item": "wetbar_stack", "chance": 20 },
         "l": { "item": "table_livingroom", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1734,7 +1744,7 @@
         ",": { "item": "clutter_bathroom", "chance": 10 },
         "i": { "item": "wetbar_counter", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 21 ], "y": [ 9, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 9, 21 ], "y": [ 9, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1778,7 +1788,7 @@
         "!": { "item": "crate_stack", "chance": 20 },
         "x": { "item": "a_television", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 8, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 8, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1832,7 +1842,7 @@
         "R": { "item": "mansion_bookcase", "chance": 20 },
         ")": { "item": "table_livingroom", "chance": 30 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1892,7 +1902,7 @@
         "s": { "item": "snacks_fancy", "chance": 20 },
         "∞": { "item": "mansion_guns", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 15, 21 ], "y": [ 9, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 15, 21 ], "y": [ 9, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -1959,7 +1969,7 @@
         "!": { "item": "crate_stack", "chance": 20 },
         "x": { "item": "a_television", "chance": 20 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 13, 21 ], "y": [ 7, 21 ], "density": 0.1 } ],
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 13, 21 ], "y": [ 7, 21 ], "density": 0.1 } ],
       "place_vehicles": [ { "vehicle": "laundry_cart", "x": [ 13, 18 ], "y": [ 8, 9 ], "chance": 50 } ]
     }
   },
@@ -2008,7 +2018,7 @@
         "R": { "item": "mansion_bookcase", "chance": 20 },
         "s": { "item": "nightstand", "chance": 35 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2063,7 +2073,7 @@
         "&": { "item": "table_wine", "chance": 20, "repeat": [ 1, 4 ] },
         ".": { "item": "clutter_basement" }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 11, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 11, 21 ], "y": [ 8, 21 ], "density": 0.1 } ]
     }
   },
   {
@@ -2127,7 +2137,7 @@
         "-": { "item": "clutter_bedroom", "chance": 2 },
         "I": { "item": "nightstand", "chance": 40 }
       },
-      "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 8, 21 ], "y": [ 12, 21 ], "density": 0.1 } ]
+      "place_monsters": [ { "monster": "GROUP_VANILLA", "x": [ 8, 21 ], "y": [ 12, 21 ], "density": 0.1 } ]
     }
   }
 ]