diff --git a/data/json/mapgen/house/house23.json b/data/json/mapgen/house/house23.json
new file mode 100644
index 0000000000000..30c42ee35495b
--- /dev/null
+++ b/data/json/mapgen/house/house23.json
@@ -0,0 +1,248 @@
+[
+  {
+    "method": "json",
+    "om_terrain": "house_23",
+    "//": "normal variant",
+    "type": "mapgen",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        "......[.......p.........",
+        "...........[...`........",
+        "````````````````........",
+        "`%..!!.jj.!!...`........",
+        "`.##oo####oo#$$=$##o##..",
+        "`.#T    s   #G  y#123#..",
+        "`%#H    H   ###*o#J 4#..",
+        "`.oH l  H    E|  |J O#..",
+        "`.oH    H    s|  |J fo..",
+        "`.#          E|  |J no..",
+        "`.#yxxx             7#..",
+        "`.#|||| hhh         Y#..",
+        "`.#S--+ fff  y      6#..",
+        "`.#98t| hhh|>| RR  Y6#..",
+        "`.#####*###|||+||+|||#..",
+        "`......``^#db  T|  dD#^.",
+        "`````````!o    I|    o..",
+        ".........!o@@ hI|   yo..",
+        ".........!o@@   |@  Eo..",
+        "..........#s  ED|@I T#..",
+        "..........##ooo###oo##..",
+        "...........%%%...%.%.%..",
+        "...............[........",
+        "........................"
+      ],
+      "palettes": [ "standard_domestic_palette" ],
+      "terrain": {
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
+        "!": "t_region_groundcover_urban",
+        "`": "t_concrete",
+        "#": "t_rock_wall",
+        "-": "t_linoleum_white",
+        "Q": "t_linoleum_white",
+        "8": "t_linoleum_white",
+        "B": "t_linoleum_white",
+        "S": "t_linoleum_white",
+        "t": "t_linoleum_white",
+        "$": "t_screened_porch_wall",
+        "=": "t_screen_door_c"
+      },
+      "furniture": { "!": "f_region_flower" },
+      "place_item": [ { "item": "stereo", "x": 4, "y": 10, "chance": 100 }, { "item": "television", "x": 5, "y": 10, "chance": 100 } ],
+      "place_nested": [
+        {
+          "chunks": [
+            [ "roof_6x6_garden_4", 15 ],
+            [ "roof_6x6_garden_1", 15 ],
+            [ "greenhouse_6x6_herbal", 15 ],
+            [ "greenhouse_6x6_vegetable", 15 ],
+            [ "pond_6x6", 15 ],
+            [ "shed_6x6_junk", 15 ],
+            [ "shed_6x6_woodworker", 15 ],
+            [ "playset_4x4_2", 15 ],
+            [ "firepit_5x5_1", 15 ],
+            [ "firepit_5x5_2", 15 ],
+            [ "playset_4x4_1", 15 ]
+          ],
+          "x": 1,
+          "y": 17
+        }
+      ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "house_23",
+    "type": "mapgen",
+    "weight": 20,
+    "object": {
+      "fill_ter": "t_dirt",
+      "rows": [
+        ".............P.s.d......",
+        ".....d.........s........",
+        "..d........d...s......d.",
+        ".......d.......s..d.....",
+        "..||OO|||OO||tttt||O||..",
+        "..|_________|tttt|___|..",
+        "..|_________|||_O|___|d.",
+        "..O___________#__#___O..",
+        "..O___________#__#___O..",
+        ".d|___________#__#___|..",
+        "..|__________________|..",
+        "..|####______________|..",
+        "..|__________________|..",
+        "..|___#______________|..",
+        "..||||||_||###_##_###|d.",
+        "..........|_____#____|..",
+        "...dd.....O_____#____O..",
+        "....d.....O_____#____O..",
+        ".......d..O_____#____O..",
+        ".d........|_____#____|.d",
+        "..........||OOO|||OO||..",
+        "...................d....",
+        "...d.............d.d..d.",
+        ".......d................"
+      ],
+      "terrain": {
+        "#": "t_wall_half",
+        ".": "t_grass",
+        "_": "t_floor",
+        "O": "t_window_frame",
+        "P": "t_grass",
+        "s": "t_sidewalk",
+        "d": "t_dirt",
+        "t": "t_thconc_floor",
+        "|": "t_rock_wall"
+      },
+      "furniture": { "P": "f_mailbox" },
+      "place_item": [
+        { "chance": 30, "item": "2x4", "repeat": 1, "x": 11, "y": 15 },
+        { "chance": 50, "item": "2x4", "repeat": 1, "x": 12, "y": 15 },
+        { "chance": 50, "item": "2x4", "repeat": 1, "x": 11, "y": 16 },
+        { "chance": 50, "item": "2x4", "repeat": 1, "x": 12, "y": 16 },
+        { "chance": 50, "item": "2x4", "repeat": 1, "x": 17, "y": 17 }
+      ],
+      "place_items": [
+        { "chance": 20, "item": "hardware_trash", "x": 6, "y": 17 },
+        { "chance": 20, "item": "hardware_trash", "x": 7, "y": 13 },
+        { "chance": 5, "item": "hardware_bulk", "x": 20, "y": 11 },
+        { "chance": 20, "item": "hand_tools", "x": 11, "y": 17 },
+        { "chance": 20, "item": "hand_tools", "x": 20, "y": 9 },
+        { "chance": 10, "item": "trash", "x": 14, "y": 19 },
+        { "chance": 10, "item": "trash", "x": 4, "y": 19 },
+        { "chance": 10, "item": "trash", "x": 20, "y": 17 },
+        { "chance": 10, "item": "trash", "x": 4, "y": 13 },
+        { "chance": 10, "item": "trash", "x": 20, "y": 10 },
+        { "chance": 10, "item": "trash", "x": 6, "y": 6 }
+      ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "house_23",
+    "type": "mapgen",
+    "weight": 40,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        ".............P.s........",
+        "...............s..d..d..",
+        ".dd..d.......d.s........",
+        "...............s.d......",
+        "..||ww||||ww|--t-||w||..",
+        "..|_________|tttt|cJc|..",
+        "..|_________|||+w|J_{|.d",
+        "..w___________#__#J_o|..",
+        "..w___________#__#J_&w..",
+        "..|___________#__#J_&w..",
+        ".d|__________________|..",
+        "..|####______________|..",
+        "..|&__D______________|..",
+        "..|__T#______________|..",
+        "d.||||||a||###D##D###|..",
+        "..........|_____#____|d.",
+        ".....d...dw_____#____w..",
+        "..........w_____#____w..",
+        "..d.......w_____#____w..",
+        "....dd....|_____#____|..",
+        "..........||www|||ww||..",
+        "..d.....................",
+        "..d....d.....d.....d....",
+        "...d..................d."
+      ],
+      "terrain": {
+        "+": "t_door_metal_locked",
+        "-": "t_fence_h",
+        ".": "t_grass",
+        "D": "t_door_o",
+        "P": "t_grass",
+        "_": "t_floor",
+        "a": "t_door_c",
+        "d": "t_dirt",
+        "s": "t_sidewalk",
+        "t": "t_thconc_floor",
+        "w": "t_window",
+        "|": "t_rock_wall",
+        "#": "t_wall_w"
+      },
+      "furniture": {
+        "J": "f_counter",
+        "&": "f_sink",
+        "P": "f_mailbox",
+        "T": "f_toilet",
+        "c": "f_cupboard",
+        "o": "f_oven",
+        "{": "f_fridge"
+      },
+      "place_items": [
+        { "chance": 10, "item": "hardware_bulk", "x": 17, "y": 16 },
+        { "chance": 10, "item": "hardware_bulk", "x": 17, "y": 17 },
+        { "chance": 10, "item": "hardware_bulk", "x": 18, "y": 9 },
+        { "chance": 10, "item": "hand_tools", "x": 10, "y": 13 },
+        { "chance": 10, "item": "hand_tools", "x": 3, "y": 10 },
+        { "chance": 10, "item": "tools_construction", "x": 15, "y": 17 },
+        { "chance": 10, "item": "tools_construction", "x": 20, "y": [ 12, 13 ] },
+        { "chance": 10, "item": "tools_construction", "x": 4, "y": 10 },
+        { "chance": 10, "item": "hardware_clothing", "x": 14, "y": 16 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_23_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "                        ",
+        "                        ",
+        "  |2222222222222222223  ",
+        "  |..................3  ",
+        "  |..................3  ",
+        "  |..&...............3  ",
+        "  |..............=...3  ",
+        "  |..................3  ",
+        "  |..................3  ",
+        "  |..................3  ",
+        "  |..................3  ",
+        "  |..................3  ",
+        "  |-------5..........3  ",
+        "          |..........5  ",
+        "          |..........3  ",
+        "          |..........3  ",
+        "          |..........3  ",
+        "          |..........3  ",
+        "          |----------3  ",
+        "                        ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
+  }
+]
diff --git a/data/json/mapgen/house/house24.json b/data/json/mapgen/house/house24.json
new file mode 100644
index 0000000000000..60105226ec672
--- /dev/null
+++ b/data/json/mapgen/house/house24.json
@@ -0,0 +1,314 @@
+[
+  {
+    "method": "json",
+    "om_terrain": "house_24",
+    "//": "normal variant",
+    "type": "mapgen",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        "...``````..p............",
+        "...``````....%.%%.%.%%..",
+        "...````````##ooo##ooo##.",
+        "..%````````#c  y  hhh #.",
+        "...````````*      fff o.",
+        "...``````!!# rr   hhhT#.",
+        ".%.``````!%#||||+|||||#.",
+        "...``````.##23F| |@@sd#.",
+        "...``````%#1   | |@@  #.",
+        ".%.``````.o5     |E   o.",
+        "...``````%#O  7| +  h o.",
+        "...``````.#J  4| |yDII#.",
+        "..#~~~~~~##|| || |||||#.",
+        "..#~~~~~~#TE     | bdy#.",
+        "..#~~~~~~#x  H   +    o.",
+        "..#~~~~~~#x lH   |    o.",
+        "..#~~~~~Y#x  H   |@@ E#.",
+        "..#U~~~~Y#     hr|@@ D#.",
+        "..#U~~~~~*      r|||||#.",
+        ".^#~A~~~~#       +---B#^",
+        "..#NNNqq~#RyHHHsR|t8SB#.",
+        "..##########ooo########.",
+        "...........!!!!!........",
+        "........................"
+      ],
+      "palettes": [ "standard_domestic_palette" ],
+      "terrain": {
+        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
+        "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
+        "!": "t_region_groundcover_urban",
+        "`": "t_concrete",
+        "#": "t_adobe_brick_wall",
+        "-": "t_linoleum_white",
+        "Q": "t_linoleum_white",
+        "8": "t_linoleum_white",
+        "B": "t_linoleum_white",
+        "S": "t_linoleum_white",
+        "t": "t_linoleum_white",
+        "N": "t_thconc_floor",
+        "Y": "t_thconc_floor",
+        "U": "t_thconc_floor",
+        "q": "t_thconc_floor",
+        "A": "t_thconc_floor",
+        "~": "t_thconc_floor"
+      },
+      "furniture": { "!": "f_region_flower" },
+      "place_item": [ { "item": "stereo", "x": 15, "y": 20, "chance": 100 }, { "item": "television", "x": 10, "y": 15, "chance": 100 } ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "house_24",
+    "type": "mapgen",
+    "weight": 40,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        "..pcccccc...............",
+        "...ccccccP..............",
+        "...ccccccss||www||www||.",
+        "...ccccccss|__________|.",
+        "...cTTTTcss+__________w.",
+        "...cccccc..|_XXX______|.",
+        "...TcTcTc..|HHHH+HHHHH|.",
+        "...TcTcTc.||CCfH_H____|.",
+        "...TcTcTc.|&___H_H____|.",
+        "...TcTcTc.wC_____H____w.",
+        "...cccccc.|o__aH_+____w.",
+        "...cccccc.|C__aH_H____|.",
+        "..|#t##t#||HH_HH_HHHHH|.",
+        "..|#t##t#|_______H____|.",
+        "..|#t##t#|_X_____+____w.",
+        ".{|#t##t#|_X_____H____w.",
+        ".{|#t##t#|_X____XH____|.",
+        "..|tttttt|______XH____|.",
+        ".^|tttttt+_______HHHHH|^",
+        "..|tttttd|_______+&Ceg|.",
+        "..|tttbb#|_______H____|.",
+        "..||||||||||www||||||||.",
+        "........................",
+        "........................"
+      ],
+      "terrain": {
+        "#": "t_thconc_floor",
+        "+": [ "t_door_c", "t_door_o", "t_door_o" ],
+        ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "P": "t_grass",
+        "T": "t_concrete",
+        "_": "t_floor",
+        "b": "t_thconc_floor",
+        "c": "t_concrete",
+        "d": "t_thconc_floor",
+        "p": "t_grass",
+        "s": "t_sidewalk",
+        "t": "t_thconc_floor",
+        "^": "t_gutter_downspout",
+        "w": "t_window_domestic",
+        "{": "t_grass",
+        "|": "t_adobe_brick_wall",
+        "H": "t_wall_w"
+      },
+      "furniture": {
+        "#": "f_table",
+        "&": "f_sink",
+        "C": "f_counter",
+        "P": "f_sign",
+        "T": "f_table",
+        "X": "f_crate_c",
+        "a": "f_cupboard",
+        "b": "f_crate_c",
+        "d": "f_chair",
+        "e": "f_trashcan",
+        "f": "f_fridge",
+        "g": "f_toilet",
+        "o": "f_oven",
+        "p": "f_mailbox",
+        "{": "f_dumpster"
+      },
+      "place_items": [
+        { "chance": 5, "item": "ammo_shotgun_rare", "x": 8, "y": 15 },
+        { "chance": 50, "item": "camping", "x": 6, "y": 12 },
+        { "chance": 50, "item": "glass_set", "x": 6, "y": 14 },
+        { "chance": 25, "item": "clothing_work_boots", "x": 7, "y": 9 },
+        { "chance": 80, "item": "crate_toys", "x": 16, "y": 16 },
+        { "chance": 20, "item": "book_survival", "x": 5, "y": 16 },
+        { "chance": 25, "item": "fancyfurs", "x": 3, "y": 7 },
+        { "chance": 80, "item": "crate_sports", "x": 16, "y": 17 },
+        { "chance": 80, "item": "crate_cleaning", "x": 6, "y": 20 },
+        { "chance": 25, "item": "clothing_work_gloves", "x": 7, "y": 8 },
+        { "chance": 50, "item": "clothing_male", "x": 4, "y": 4 },
+        { "chance": 50, "item": "clothing_male", "x": 5, "y": 4 },
+        { "chance": 35, "repeat": 2, "item": "toy_box", "x": 3, "y": 12 },
+        { "chance": 50, "item": "clothing_watch", "x": 3, "y": 15 },
+        { "chance": 20, "item": "tools_construction", "x": 5, "y": 8 },
+        { "chance": 20, "repeat": 2, "item": "sports", "x": 5, "y": 6 },
+        { "chance": 20, "repeat": 2, "item": "sports", "x": 5, "y": 7 },
+        { "chance": 50, "item": "dress_shoes", "x": 7, "y": 6 },
+        { "chance": 15, "item": "book_military", "x": 5, "y": 15 },
+        { "chance": 50, "item": "clothing_female", "x": 6, "y": 4 },
+        { "chance": 50, "item": "clothing_female", "x": 7, "y": 4 },
+        { "chance": 30, "item": "clothing_glasses", "x": 3, "y": 14 },
+        { "chance": 10, "item": "guns_pistol_rare", "x": 8, "y": 16 },
+        { "chance": 70, "item": "crate_winter", "x": 14, "y": 5 },
+        { "chance": 20, "repeat": 2, "item": "book_school", "x": 5, "y": 14 },
+        { "chance": 80, "item": "crate_kitchen", "x": 11, "y": 14 },
+        { "chance": 70, "item": "crate_kitchen", "x": 13, "y": 5 },
+        { "chance": 22, "item": "kitchen_nonfood", "x": 3, "y": 9 },
+        { "chance": 80, "item": "crate_clothes", "x": 11, "y": 15 },
+        { "chance": 70, "item": "crate_clothes", "x": 15, "y": 5 },
+        { "chance": 80, "item": "crate_linens", "x": 7, "y": 20 },
+        { "chance": 80, "item": "crate_linens", "x": 11, "y": 16 }
+      ],
+      "place_toilets": [ { "x": 21, "y": 19 } ],
+      "place_signs": [ { "signage": "Moving away sale!", "x": 9, "y": 1 } ]
+    }
+  },
+  {
+    "method": "json",
+    "om_terrain": "house_24",
+    "type": "mapgen",
+    "weight": 40,
+    "object": {
+      "fill_ter": "t_floor",
+      "rows": [
+        "...cccccc..p............",
+        "...cccccc...............",
+        "..Pccccccss||www||www||.",
+        "...ccccccss|_________a|.",
+        "...ccccccss+_________Tw.",
+        "...cccccc..|_TT___HH_a|.",
+        "...cccccc..|%%%%+%%%%%|.",
+        "...cccccc.||CCf%_%bb_{|.",
+        "...cccccc.|&___%_%bb_{|.",
+        "...cccccc.wC_____%____w.",
+        "...cccccc.|o__d%_+____w.",
+        "...cccccc.|C__d%_%___T|.",
+        "..|tttttt||%%_%%_%%%%%|.",
+        "..|tttttt|T_T____%___e|.",
+        "..|ttttt#|__H____+____w.",
+        "..|ttttt#|__H____%____w.",
+        "..|tt##t#|__H____%bb_{|.",
+        "..|tt##tt|__H____%bb_{|.",
+        "..|tt##tt+_______%%%%%|.",
+        ".^|tttttt|B______+&Cgh|^",
+        "..|t####i|B____aT%____|.",
+        "..||||||||||www||||||||.",
+        "........................",
+        "........................"
+      ],
+      "terrain": {
+        "#": "t_thconc_floor",
+        "+": [ "t_door_c", "t_door_o", "t_door_o" ],
+        ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
+        "P": "t_grass",
+        "_": "t_floor",
+        "c": "t_concrete",
+        "i": "t_thconc_floor",
+        "p": "t_grass",
+        "s": "t_concrete",
+        "t": "t_thconc_floor",
+        "^": "t_gutter_downspout",
+        "w": "t_window_domestic",
+        "%": "t_wall_w",
+        "|": "t_adobe_brick_wall"
+      },
+      "furniture": {
+        "#": "f_table",
+        "&": "f_sink",
+        "B": "f_bookcase",
+        "C": "f_counter",
+        "H": "f_sofa",
+        "P": "f_sign",
+        "T": "f_table",
+        "a": "f_armchair",
+        "b": "f_bed",
+        "d": "f_cupboard",
+        "e": "f_bigmirror",
+        "f": "f_fridge",
+        "g": "f_trashcan",
+        "h": "f_toilet",
+        "i": "f_trashcan",
+        "o": "f_oven",
+        "p": "f_mailbox",
+        "{": "f_dresser"
+      },
+      "place_items": [
+        { "chance": 40, "item": "oven", "x": 11, "y": 10 },
+        { "chance": 45, "item": "bed", "x": 18, "y": 17 },
+        { "chance": 45, "item": "bed", "x": 19, "y": 17 },
+        { "chance": 45, "item": "bed", "x": 18, "y": 7 },
+        { "chance": 45, "item": "bed", "x": 19, "y": 7 },
+        { "chance": 35, "repeat": 2, "item": "homebooks", "x": 5, "y": 16 },
+        { "chance": 20, "repeat": 2, "item": "book_survival", "x": 8, "y": 15 },
+        { "chance": 25, "item": "barbecue", "x": 3, "y": 16 },
+        { "chance": 25, "item": "fancyfurs", "x": [ 6, 7 ], "y": 20 },
+        { "chance": 25, "item": "guns_obscure", "x": 21, "y": 7 },
+        { "chance": 50, "repeat": 2, "item": "clothing_male", "x": 21, "y": 11 },
+        { "chance": 25, "item": "clothing_work_hat", "x": 21, "y": 16 },
+        { "chance": 30, "repeat": 2, "item": "female_underwear_top", "x": 5, "y": 18 },
+        { "chance": 40, "item": "beauty", "x": 19, "y": 19 },
+        { "chance": 25, "repeat": 2, "item": "bags_trip", "x": 6, "y": 13 },
+        { "chance": 25, "repeat": 2, "item": "bags_trip", "x": 6, "y": 14 },
+        { "chance": 50, "item": "clothing_watch", "x": 21, "y": 17 },
+        { "chance": 40, "item": "book_school", "x": 8, "y": 14 },
+        { "chance": 35, "repeat": 2, "item": "magazines", "x": 16, "y": 20 },
+        { "chance": 25, "repeat": 2, "item": "magazines", "x": 12, "y": 13 },
+        { "chance": 45, "item": "kitchen", "x": 11, "y": 11 },
+        { "chance": 40, "repeat": 2, "item": "sports", "x": 4, "y": 14 },
+        { "chance": 30, "item": "sports", "x": 3, "y": 13 },
+        { "chance": 20, "item": "sports", "x": 3, "y": 14 },
+        { "chance": 30, "repeat": 2, "item": "kitchen_nonfood", "x": 14, "y": 10 },
+        { "chance": 35, "repeat": 2, "item": "kitchen_nonfood", "x": 14, "y": 11 },
+        { "chance": 35, "repeat": 2, "item": "kitchen_nonfood", "x": [ 12, 13 ], "y": 7 },
+        { "chance": 30, "item": "manuals", "x": 6, "y": 16 },
+        { "chance": 40, "item": "pool_table", "x": 4, "y": 13 },
+        { "chance": 45, "repeat": 2, "item": "book_gunmags", "x": 8, "y": 16 },
+        { "chance": 40, "repeat": 2, "item": "nightstand", "x": 21, "y": 8 },
+        { "chance": 45, "repeat": 2, "item": "dresses", "x": 6, "y": 18 },
+        { "chance": 35, "item": "garden_shed", "x": 4, "y": 20 },
+        { "chance": 35, "item": "garden_shed", "x": 3, "y": 18 },
+        { "chance": 35, "item": "garden_shed", "x": 3, "y": 19 },
+        { "chance": 35, "item": "garden_shed", "x": 3, "y": 20 }
+      ],
+      "place_toilets": [ { "x": 21, "y": 19 } ],
+      "place_signs": [ { "signage": "Estate sale!", "x": 2, "y": 2 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": "house_24_roof",
+    "object": {
+      "fill_ter": "t_shingle_flat_roof",
+      "rows": [
+        "                        ",
+        "                        ",
+        "           |22222222223 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        "           |..........3 ",
+        "           |..N.......3 ",
+        "          ||..........3 ",
+        "          |...........3 ",
+        "          |...........3 ",
+        "          |...........3 ",
+        "          |...........3 ",
+        "  |22222222...........3 ",
+        "  |...................3 ",
+        "  |............&......3 ",
+        "  |...................3 ",
+        "  |...................3 ",
+        "  |......X........=...3 ",
+        "  |...................3 ",
+        "  5...................5 ",
+        "  |...................3 ",
+        "  |-------------------3 ",
+        "                        ",
+        "                        "
+      ],
+      "palettes": [ "roof_palette" ],
+      "terrain": { ".": "t_shingle_flat_roof" }
+    }
+  }
+]
diff --git a/data/json/mapgen/house/house_vacant.json b/data/json/mapgen/house/house_vacant.json
index 8642ce15096db..f11064847b587 100644
--- a/data/json/mapgen/house/house_vacant.json
+++ b/data/json/mapgen/house/house_vacant.json
@@ -193,409 +193,6 @@
     "type": "mapgen",
     "weight": 80
   },
-  {
-    "method": "json",
-    "object": {
-      "place_item": [
-        { "chance": 30, "item": "2x4", "repeat": 1, "x": 11, "y": 15 },
-        { "chance": 50, "item": "2x4", "repeat": 1, "x": 12, "y": 15 },
-        { "chance": 50, "item": "2x4", "repeat": 1, "x": 11, "y": 16 },
-        { "chance": 50, "item": "2x4", "repeat": 1, "x": 12, "y": 16 },
-        { "chance": 50, "item": "2x4", "repeat": 1, "x": 17, "y": 17 }
-      ],
-      "furniture": { "#": "f_null", ".": "f_null", "_": "f_null", "P": "f_mailbox", "s": "f_null", "t": "f_null", "|": "f_null" },
-      "place_items": [
-        { "chance": 20, "item": "hardware_trash", "x": 6, "y": 17 },
-        { "chance": 20, "item": "hardware_trash", "x": 7, "y": 13 },
-        { "chance": 5, "item": "hardware_bulk", "x": 20, "y": 11 },
-        { "chance": 20, "item": "hand_tools", "x": 11, "y": 17 },
-        { "chance": 20, "item": "hand_tools", "x": 20, "y": 9 },
-        { "chance": 10, "item": "trash", "x": 14, "y": 19 },
-        { "chance": 10, "item": "trash", "x": 4, "y": 19 },
-        { "chance": 10, "item": "trash", "x": 20, "y": 17 },
-        { "chance": 10, "item": "trash", "x": 4, "y": 13 },
-        { "chance": 10, "item": "trash", "x": 20, "y": 10 },
-        { "chance": 10, "item": "trash", "x": 6, "y": 6 }
-      ],
-      "rows": [
-        ".............P.s.d......",
-        ".....d.........s........",
-        "..d........d...s......d.",
-        ".......d.......s..d.....",
-        "..||OO|||OO||tttt||O||..",
-        "..|_________|tttt|___|..",
-        "..|_________|||_O|___|d.",
-        "..O___________#__|___O..",
-        "..O___________#__|___O..",
-        ".d|___________#__|___|..",
-        "..|___________#__|___|..",
-        "..|||||______________|..",
-        "..|__________________|..",
-        "..|___#______________|..",
-        "..||||||_||###_##_||||d.",
-        "..........|_____#____|..",
-        "...dd.....O_____#____O..",
-        "....d.....O_____#____O..",
-        ".......d..O_____#____O..",
-        ".d........|_____#____|.d",
-        "..........||OOO|||OO||..",
-        "...................d....",
-        "...d.............d.d..d.",
-        ".......d................"
-      ],
-      "terrain": {
-        "#": "t_wall_half",
-        ".": "t_grass",
-        "_": "t_floor",
-        "O": "t_window_frame",
-        "P": "t_grass",
-        "s": "t_sidewalk",
-        "d": "t_dirt",
-        "t": "t_thconc_floor",
-        "|": "t_wall"
-      }
-    },
-    "om_terrain": "house",
-    "type": "mapgen",
-    "weight": 80
-  },
-  {
-    "method": "json",
-    "object": {
-      "furniture": {
-        "#": "f_counter",
-        "&": "f_sink",
-        "+": "f_null",
-        "-": "f_null",
-        ".": "f_null",
-        "D": "f_null",
-        "P": "f_mailbox",
-        "T": "f_toilet",
-        "_": "f_null",
-        "a": "f_null",
-        "b": "f_bathtub",
-        "c": "f_cupboard",
-        "d": "f_null",
-        "o": "f_oven",
-        "s": "f_null",
-        "t": "f_null",
-        "w": "f_null",
-        "{": "f_fridge",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 10, "item": "hardware_bulk", "x": 17, "y": 16 },
-        { "chance": 10, "item": "hardware_bulk", "x": 17, "y": 17 },
-        { "chance": 10, "item": "hardware_bulk", "x": 18, "y": 9 },
-        { "chance": 10, "item": "hand_tools", "x": 10, "y": 13 },
-        { "chance": 10, "item": "hand_tools", "x": 3, "y": 10 },
-        { "chance": 10, "item": "tools_construction", "x": 15, "y": 17 },
-        { "chance": 10, "item": "tools_construction", "x": 20, "y": [ 12, 13 ] },
-        { "chance": 10, "item": "tools_construction", "x": 4, "y": 10 },
-        { "chance": 10, "item": "hardware_clothing", "x": 14, "y": 16 }
-      ],
-      "rows": [
-        ".............P.s........",
-        "...............s..d..d..",
-        ".dd..d.......d.s........",
-        "...............s.d......",
-        "..||ww||||ww|--t-||w||..",
-        "..|_________|tttt|c#c|..",
-        "..|_________|||+w|#_{|.d",
-        "..w___________|__|#_o|..",
-        "..w___________|__|#_&w..",
-        "..|___________|__|#_&w..",
-        ".d|___________|__|__#|..",
-        "..|||||_____________#|..",
-        "..|&__D______________|..",
-        "..|T_b|______________|..",
-        "d.||||||a|||||D||D||||..",
-        "..........|_____|____|d.",
-        ".....d...dw_____|____w..",
-        "..........w_____|____w..",
-        "..d.......w_____|____w..",
-        "....dd....|_____|____|..",
-        "..........||www|||ww||..",
-        "..d.....................",
-        "..d....d.....d.....d....",
-        "...d..................d."
-      ],
-      "terrain": {
-        "#": "t_floor",
-        "&": "t_floor",
-        "+": "t_door_metal_locked",
-        "-": "t_fence_h",
-        ".": "t_grass",
-        "D": "t_door_o",
-        "P": "t_grass",
-        "T": "t_floor",
-        "_": "t_floor",
-        "a": "t_door_metal_c",
-        "b": "t_floor",
-        "c": "t_floor",
-        "d": "t_dirt",
-        "o": "t_floor",
-        "s": "t_sidewalk",
-        "t": "t_thconc_floor",
-        "w": "t_window",
-        "{": "t_floor",
-        "|": "t_wall"
-      }
-    },
-    "om_terrain": "house",
-    "type": "mapgen",
-    "weight": 80
-  },
-  {
-    "method": "json",
-    "object": {
-      "furniture": {
-        "#": "f_table",
-        "&": "f_sink",
-        "+": "f_null",
-        ".": "f_null",
-        "C": "f_counter",
-        "P": "f_sign",
-        "T": "f_table",
-        "X": "f_crate_c",
-        "_": "f_null",
-        "a": "f_cupboard",
-        "b": "f_crate_c",
-        "c": "f_null",
-        "d": "f_chair",
-        "e": "f_trashcan",
-        "f": "f_fridge",
-        "g": "f_toilet",
-        "o": "f_oven",
-        "p": "f_mailbox",
-        "s": "f_null",
-        "t": "f_null",
-        "w": "f_null",
-        "{": "f_dumpster",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 5, "item": "ammo_shotgun_rare", "x": 8, "y": 15 },
-        { "chance": 50, "item": "camping", "x": 6, "y": 12 },
-        { "chance": 50, "item": "glass_set", "x": 6, "y": 14 },
-        { "chance": 25, "item": "clothing_work_boots", "x": 7, "y": 9 },
-        { "chance": 80, "item": "crate_toys", "x": 16, "y": 16 },
-        { "chance": 20, "item": "book_survival", "x": 5, "y": 16 },
-        { "chance": 25, "item": "fancyfurs", "x": 3, "y": 7 },
-        { "chance": 80, "item": "crate_sports", "x": 16, "y": 17 },
-        { "chance": 80, "item": "crate_cleaning", "x": 6, "y": 20 },
-        { "chance": 25, "item": "clothing_work_gloves", "x": 7, "y": 8 },
-        { "chance": 50, "item": "clothing_male", "x": 4, "y": 4 },
-        { "chance": 50, "item": "clothing_male", "x": 5, "y": 4 },
-        { "chance": 35, "repeat": 2, "item": "toy_box", "x": 3, "y": 12 },
-        { "chance": 50, "item": "clothing_watch", "x": 3, "y": 15 },
-        { "chance": 20, "item": "tools_construction", "x": 5, "y": 8 },
-        { "chance": 20, "repeat": 2, "item": "sports", "x": 5, "y": 6 },
-        { "chance": 20, "repeat": 2, "item": "sports", "x": 5, "y": 7 },
-        { "chance": 50, "item": "dress_shoes", "x": 7, "y": 6 },
-        { "chance": 15, "item": "book_military", "x": 5, "y": 15 },
-        { "chance": 50, "item": "clothing_female", "x": 6, "y": 4 },
-        { "chance": 50, "item": "clothing_female", "x": 7, "y": 4 },
-        { "chance": 30, "item": "clothing_glasses", "x": 3, "y": 14 },
-        { "chance": 10, "item": "guns_pistol_rare", "x": 8, "y": 16 },
-        { "chance": 70, "item": "crate_winter", "x": 14, "y": 5 },
-        { "chance": 20, "repeat": 2, "item": "book_school", "x": 5, "y": 14 },
-        { "chance": 80, "item": "crate_kitchen", "x": 11, "y": 14 },
-        { "chance": 70, "item": "crate_kitchen", "x": 13, "y": 5 },
-        { "chance": 22, "item": "kitchen_nonfood", "x": 3, "y": 9 },
-        { "chance": 80, "item": "crate_clothes", "x": 11, "y": 15 },
-        { "chance": 70, "item": "crate_clothes", "x": 15, "y": 5 },
-        { "chance": 80, "item": "crate_linens", "x": 7, "y": 20 },
-        { "chance": 80, "item": "crate_linens", "x": 11, "y": 16 }
-      ],
-      "place_toilets": [ { "x": 21, "y": 19 } ],
-      "rows": [
-        "..pcccccc...............",
-        "...ccccccP..............",
-        "...ccccccss||www||www||.",
-        "...ccccccss|__________|.",
-        "...cTTTTcss+__________w.",
-        "...cccccc..|_XXX______|.",
-        "...TcTcTc..|||||+||||||.",
-        "...TcTcTc.||CCf|_|____|.",
-        "...TcTcTc.|&___|_|____|.",
-        "...TcTcTc.wC_____|____w.",
-        "...cccccc.|o__a|_+____w.",
-        "...cccccc.|C__a|_|____|.",
-        "..|#t##t#||||_||_||||||.",
-        "..|#t##t#|_______|____|.",
-        "..|#t##t#|_X_____+____w.",
-        ".{|#t##t#|_X_____|____w.",
-        ".{|#t##t#|_X____X|____|.",
-        "..|tttttt|______X|____|.",
-        "..|tttttt+_______||||||.",
-        "..|tttttd|_______+&Ceg|.",
-        "..|tttbb#|_______|____|.",
-        "..||||||||||www||||||||.",
-        "........................",
-        "........................"
-      ],
-      "terrain": {
-        "#": "t_thconc_floor",
-        "&": "t_floor",
-        "+": [ "t_door_c", "t_door_o", "t_door_o" ],
-        ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "C": "t_floor",
-        "P": "t_grass",
-        "T": "t_concrete",
-        "X": "t_floor",
-        "_": "t_floor",
-        "a": "t_floor",
-        "b": "t_thconc_floor",
-        "c": "t_concrete",
-        "d": "t_thconc_floor",
-        "e": "t_floor",
-        "f": "t_floor",
-        "g": "t_floor",
-        "o": "t_floor",
-        "p": "t_grass",
-        "s": "t_sidewalk",
-        "t": "t_thconc_floor",
-        "w": "t_window_domestic",
-        "{": "t_grass",
-        "|": "t_brick_wall"
-      },
-      "place_signs": [ { "signage": "Moving away sale!", "x": 9, "y": 1 } ]
-    },
-    "om_terrain": "house",
-    "type": "mapgen",
-    "weight": 80
-  },
-  {
-    "method": "json",
-    "object": {
-      "furniture": {
-        "#": "f_table",
-        "&": "f_sink",
-        "+": "f_null",
-        ".": "f_null",
-        "B": "f_bookcase",
-        "C": "f_counter",
-        "H": "f_sofa",
-        "P": "f_sign",
-        "T": "f_table",
-        "_": "f_null",
-        "a": "f_armchair",
-        "b": "f_bed",
-        "c": "f_null",
-        "d": "f_cupboard",
-        "e": "f_bigmirror",
-        "f": "f_fridge",
-        "g": "f_trashcan",
-        "h": "f_toilet",
-        "i": "f_trashcan",
-        "o": "f_oven",
-        "p": "f_mailbox",
-        "s": "f_null",
-        "t": "f_null",
-        "w": "f_null",
-        "{": "f_dresser",
-        "|": "f_null"
-      },
-      "place_items": [
-        { "chance": 40, "item": "oven", "x": 11, "y": 10 },
-        { "chance": 45, "item": "bed", "x": 18, "y": 17 },
-        { "chance": 45, "item": "bed", "x": 19, "y": 17 },
-        { "chance": 45, "item": "bed", "x": 18, "y": 7 },
-        { "chance": 45, "item": "bed", "x": 19, "y": 7 },
-        { "chance": 35, "repeat": 2, "item": "homebooks", "x": 5, "y": 16 },
-        { "chance": 20, "repeat": 2, "item": "book_survival", "x": 8, "y": 15 },
-        { "chance": 25, "item": "barbecue", "x": 3, "y": 16 },
-        { "chance": 25, "item": "fancyfurs", "x": [ 6, 7 ], "y": 20 },
-        { "chance": 25, "item": "guns_obscure", "x": 21, "y": 7 },
-        { "chance": 50, "repeat": 2, "item": "clothing_male", "x": 21, "y": 11 },
-        { "chance": 25, "item": "clothing_work_hat", "x": 21, "y": 16 },
-        { "chance": 30, "repeat": 2, "item": "female_underwear_top", "x": 5, "y": 18 },
-        { "chance": 40, "item": "beauty", "x": 19, "y": 19 },
-        { "chance": 25, "repeat": 2, "item": "bags_trip", "x": 6, "y": 13 },
-        { "chance": 25, "repeat": 2, "item": "bags_trip", "x": 6, "y": 14 },
-        { "chance": 50, "item": "clothing_watch", "x": 21, "y": 17 },
-        { "chance": 40, "item": "book_school", "x": 8, "y": 14 },
-        { "chance": 35, "repeat": 2, "item": "magazines", "x": 16, "y": 20 },
-        { "chance": 25, "repeat": 2, "item": "magazines", "x": 12, "y": 13 },
-        { "chance": 45, "item": "kitchen", "x": 11, "y": 11 },
-        { "chance": 40, "repeat": 2, "item": "sports", "x": 4, "y": 14 },
-        { "chance": 30, "item": "sports", "x": 3, "y": 13 },
-        { "chance": 20, "item": "sports", "x": 3, "y": 14 },
-        { "chance": 30, "repeat": 2, "item": "kitchen_nonfood", "x": 14, "y": 10 },
-        { "chance": 35, "repeat": 2, "item": "kitchen_nonfood", "x": 14, "y": 11 },
-        { "chance": 35, "repeat": 2, "item": "kitchen_nonfood", "x": [ 12, 13 ], "y": 7 },
-        { "chance": 30, "item": "manuals", "x": 6, "y": 16 },
-        { "chance": 40, "item": "pool_table", "x": 4, "y": 13 },
-        { "chance": 45, "repeat": 2, "item": "book_gunmags", "x": 8, "y": 16 },
-        { "chance": 40, "repeat": 2, "item": "nightstand", "x": 21, "y": 8 },
-        { "chance": 45, "repeat": 2, "item": "dresses", "x": 6, "y": 18 },
-        { "chance": 35, "item": "garden_shed", "x": 4, "y": 20 },
-        { "chance": 35, "item": "garden_shed", "x": 3, "y": 18 },
-        { "chance": 35, "item": "garden_shed", "x": 3, "y": 19 },
-        { "chance": 35, "item": "garden_shed", "x": 3, "y": 20 }
-      ],
-      "place_toilets": [ { "x": 21, "y": 19 } ],
-      "rows": [
-        "...cccccc..p............",
-        "...cccccc...............",
-        "..Pccccccss||www||www||.",
-        "...ccccccss|_________a|.",
-        "...ccccccss+_________Tw.",
-        "...cccccc..|_TT___HH_a|.",
-        "...cccccc..|||||+||||||.",
-        "...cccccc.||CCf|_|bb_{|.",
-        "...cccccc.|&___|_|bb_{|.",
-        "...cccccc.wC_____|____w.",
-        "...cccccc.|o__d|_+____w.",
-        "...cccccc.|C__d|_|___T|.",
-        "..|tttttt||||_||_||||||.",
-        "..|tttttt|T_T____|___e|.",
-        "..|ttttt#|__H____+____w.",
-        "..|ttttt#|__H____|____w.",
-        "..|tt##t#|__H____|bb_{|.",
-        "..|tt##tt|__H____|bb_{|.",
-        "..|tt##tt+_______||||||.",
-        "..|tttttt|B______+&Cgh|.",
-        "..|t####i|B____aT|____|.",
-        "..||||||||||www||||||||.",
-        "........................",
-        "........................"
-      ],
-      "terrain": {
-        "#": "t_thconc_floor",
-        "&": "t_floor",
-        "+": [ "t_door_c", "t_door_o", "t_door_o" ],
-        ".": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],
-        "B": "t_floor",
-        "C": "t_floor",
-        "H": "t_floor",
-        "P": "t_grass",
-        "T": "t_floor",
-        "_": "t_floor",
-        "a": "t_floor",
-        "b": "t_floor",
-        "c": "t_concrete",
-        "d": "t_floor",
-        "e": "t_floor",
-        "f": "t_floor",
-        "g": "t_floor",
-        "h": "t_floor",
-        "i": "t_thconc_floor",
-        "o": "t_floor",
-        "p": "t_grass",
-        "s": "t_sidewalk",
-        "t": "t_thconc_floor",
-        "w": "t_window_domestic",
-        "{": "t_floor",
-        "|": "t_brick_wall"
-      },
-      "place_signs": [ { "signage": "Estate sale!", "x": 2, "y": 2 } ]
-    },
-    "om_terrain": "house",
-    "type": "mapgen",
-    "weight": 80
-  },
   {
     "method": "json",
     "object": {
diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json
index 2dee912faf96a..6f1405e0e5341 100644
--- a/data/json/mapgen_palettes/house_general_palette.json
+++ b/data/json/mapgen_palettes/house_general_palette.json
@@ -121,7 +121,8 @@
       "q": [
         { "item": "tools_home", "chance": 40, "repeat": [ 1, 2 ] },
         { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] },
-        { "item": "mechanics", "chance": 15, "repeat": [ 1, 2 ] },
+        { "item": "mechanics", "chance": 1, "repeat": [ 1, 2 ] },
+        { "item": "camping", "chance": 10, "repeat": [ 1, 2 ] },
         { "item": "tools_survival", "chance": 25, "repeat": [ 1, 2 ] }
       ],
       "r": [ { "item": "office_paper", "chance": 5 }, { "item": "office", "chance": 25 } ],
@@ -149,9 +150,9 @@
       "J": { "item": "kitchen_counters", "chance": 5 },
       "L": { "item": "unisex_coat_rack", "chance": 30, "repeat": [ 1, 4 ] },
       "N": [
-        { "item": "home_hw", "chance": 20, "repeat": [ 1, 2 ] },
-        { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] },
-        { "item": "mechanics", "chance": 10, "repeat": [ 1, 2 ] }
+        { "item": "tools_common", "chance": 20, "repeat": [ 1, 2 ] },
+        { "item": "hardware", "chance": 30, "repeat": [ 1, 2 ] },
+        { "item": "cleaning", "chance": 10, "repeat": [ 1, 2 ] }
       ],
       "O": { "item": "SUS_oven", "chance": 100 },
       "P": { "item": "office_paper", "chance": 100 },
@@ -165,7 +166,7 @@
       "U": [
         { "item": "home_hw", "chance": 20, "repeat": [ 1, 2 ] },
         { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] },
-        { "item": "mechanics", "chance": 10, "repeat": [ 1, 2 ] }
+        { "item": "camping", "chance": 10, "repeat": [ 1, 2 ] }
       ],
       "Y": { "item": "trash", "chance": 30, "repeat": [ 1, 4 ] },
       "1": [ { "item": "SUS_dishes", "chance": 100 }, { "item": "SUS_silverware", "chance": 100 } ],
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
index c058563f5fe13..ffc52d747ce9d 100644
--- a/data/json/overmap/multitile_city_buildings.json
+++ b/data/json/overmap/multitile_city_buildings.json
@@ -283,6 +283,18 @@
       { "point": [ 0, 0, -1 ], "overmap": "basement" }
     ]
   },
+  {
+    "type": "city_building",
+    "id": "house_23",
+    "locations": [ "land" ],
+    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_23_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_23_roof_north" } ]
+  },
+  {
+    "type": "city_building",
+    "id": "house_24",
+    "locations": [ "land" ],
+    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "house_24_north" }, { "point": [ 0, 0, 1 ], "overmap": "house_24_roof_north" } ]
+  },
   {
     "type": "city_building",
     "id": "house_08",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
index 1f2982fa1d9b5..324926a741239 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json
@@ -1104,6 +1104,40 @@
     "color": "light_green",
     "see_cost": 2
   },
+  {
+    "type": "overmap_terrain",
+    "id": "house_23",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_23_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_24",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2,
+    "flags": [ "SIDEWALK", "GENERIC_LOOT" ]
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "house_24_roof",
+    "name": "house",
+    "copy-from": "generic_city_building",
+    "color": "light_green",
+    "see_cost": 2
+  },
   {
     "type": "overmap_terrain",
     "id": "house_toolshed",
diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
index 6bda810ad5b50..ad12e246470af 100644
--- a/data/json/regional_map_settings.json
+++ b/data/json/regional_map_settings.json
@@ -581,6 +581,8 @@
         "house_20": 50,
         "house_21": 50,
         "house_22": 50,
+        "house_23": 50,
+        "house_24": 50,
         "house_garage": 50,
         "house_garage2": 50,
         "house_garage3": 50,