diff --git a/data/json/mapgen/hazardous_waste_sarcophagus.json b/data/json/mapgen/hazardous_waste_sarcophagus.json
index cad8a360f219..eef53a335f7d 100644
--- a/data/json/mapgen/hazardous_waste_sarcophagus.json
+++ b/data/json/mapgen/hazardous_waste_sarcophagus.json
@@ -3,16 +3,16 @@
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ [ "haz_sar_1_2", "haz_sar_1_1" ], [ "haz_sar_1_4", "haz_sar_1_3" ] ],
-    "weight": 10,
     "object": {
+      "fill_ter": "t_floor",
       "rows": [
         "                            ::::::::::::::::    ",
         "                            ::::::::::::::::    ",
         "                            ::::::::::::::::    ",
-        " ffffffffffffffffffffffffffffffff:::::::|www-   ",
+        " ffffffffffffffffffffffffffffffff:::::::|www|   ",
         " f  ,,,,,,,,,,,,,,,,,,,,,,      f:::::::wcdcw   ",
         " f  ,,:::::::::;:::::::::,  v   f:::::::+.C6w   ",
-        " f  ,,:::::::::;:::::::::,      |LLLLLLL--+--ff ",
+        " f  ,,:::::::::;:::::::::,      |LLLLLLL||+||ff ",
         " f  ,,:::::::::;:::::::::,,,,,,,,:::::::,,,,  f ",
         " f  ,,::::::::::::::::::::::::::::::::::,,,,  f ",
         " f  ,,::::::::::::::::::::::::::::::::::,     f ",
@@ -20,17 +20,17 @@
         " f  ,,::::::::::::::::::::::::::::::::::,     f ",
         " f  ,,::::;::::;::::;::::,,,,,,,,:::::::,     f ",
         " f  ,,::::;::::;::::;::::,,,,,,,,:::::::,     f ",
-        " f  ,,::::;::::;::::;::::,,|-+-|-LLLLLLL-|    f ",
+        " f  ,,::::;::::;::::;::::,,||+|||LLLLLLL||    f ",
         " f  ,,::::;::::;::::;::::,,|4.6|~~~~~~~~~|    f ",
         " f  ,,,,,,,,,,,,,,,,,,,,,,,|4..`~~~~~~~~~|    f ",
-        " f  ,,,,,,,,,,,,,,,,,,,,,,,|4..`~~~~~~~~l|    f ",
-        " f |-000--000-0*0|000-000| |4..`~~~~~~~~l|    f ",
-        " f |dddrFFddcW..2|2..Fddd| |s..|~~~~~~~~l|    f ",
+        " f ^,,,,,,,,,,,,,,,,,,,,,,,|4..`~~~~~~~~ḻ|    f ",
+        " f ||000||000|0*0|000|000| |4..`~~~~~~~~ḻ|    f ",
+        " f |dddrFFddcW..2|2..Fddd| |s..|~~~~~~~~ḻ|    f ",
         " f 0dC.....Cc....*....dCr| |4..?~~~~~~~~~|    f ",
-        " f 0............a|b...d..| |4..|~~~~~~~~4|    f ",
-        " f 0..C...|*-|-*-|b......| |4..`::::::::4|    f ",
-        " f |rddd1p|.l|&.s|a36561p| |s..`~~~~~~~~4|    f ",
-        " f |-000--|--|---|-------| |4..`~~~~~~~~~|    f ",
+        " f 0............a|b...d..| |4..|~~~~~~~~F̱|    f ",
+        " f 0..C...|*|||*||b......| |4..`~~~~~~~~F̱|    f ",
+        " f |rddd1p|.l|&.s|a36561p| |s..`~~~~~~~~F̱|    f ",
+        " f ||000|||||||||||||||||| |4..`~~~~~~~~~|    f ",
         " f                         |4.6|6~~~~~~~~|    f ",
         " f       ////////////////////+///LLLLLLL///   f ",
         " f      /////////////////////.//6~~~~~~~.///  f ",
@@ -56,18 +56,10 @@
         "                                                "
       ],
       "terrain": {
-        " ": [
-          [ "t_grass", 20 ],
-          [ "t_grass_dead", 3 ],
-          [ "t_grass_tall", 5 ],
-          [ "t_grass_long", 3 ],
-          [ "t_dirt", 5 ],
-          [ "t_shrub", 2 ],
-          [ "t_tree", 1 ]
-        ],
+        " ": [ [ "t_region_groundcover", 40 ], [ "t_region_shrub", 2 ], [ "t_region_tree", 1 ] ],
+        "^": "t_gutter_downspout",
         "f": "t_chainfence",
         "|": "t_wall",
-        "-": "t_wall",
         "/": "t_concrete_wall",
         "+": "t_door_locked",
         "*": "t_door_c",
@@ -77,46 +69,29 @@
         ",": "t_sidewalk",
         ":": "t_pavement",
         ";": "t_pavement_y",
-        "1": "t_floor",
-        "2": "t_floor",
-        "3": "t_floor",
-        "4": "t_floor",
         "5": "t_console",
         "6": "t_console_broken",
-        "7": "t_floor",
-        "8": "t_floor",
-        "9": "t_floor",
-        "&": "t_floor",
         "$": "t_sewage",
         ".": "t_floor",
-        "a": "t_floor",
-        "b": "t_floor",
-        "r": "t_floor",
-        "F": "t_floor",
-        "c": "t_floor",
-        "C": "t_floor",
-        "d": "t_floor",
-        "l": "t_floor",
-        "p": "t_floor",
-        "A": "t_floor",
         "P": "t_sewage_pipe",
         "S": "t_sewage_pump",
-        "G": "t_grate",
+        "G": "t_grate_indoor",
         "E": "t_elevator",
         "e": "t_elevator_control_off",
-        "s": "t_floor",
-        "v": "t_dirt",
+        "v": "t_region_groundcover",
         "V": "t_vat",
-        "W": "t_floor",
         "L": "t_door_metal_locked",
         "~": "t_thconc_floor",
-        "`": "t_wall_glass"
+        "`": "t_wall_glass",
+        "F̱": "t_thconc_floor",
+        "ḻ": "t_thconc_floor"
       },
       "furniture": {
         "1": "f_shredder",
         "2": "f_rack_coat",
         "3": "f_server",
         "4": "f_utility_shelf",
+        "F̱": "f_utility_shelf",
         "7": "f_locker",
         "8": "f_utility_shelf",
         "9": "f_utility_shelf",
@@ -129,6 +104,7 @@
         "C": "f_chair",
         "d": "f_desk",
         "l": "f_locker",
+        "ḻ": "f_locker",
         "p": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "s": "f_sink",
         "W": "f_water_dispenser",
@@ -139,6 +115,7 @@
       "items": {
         "2": { "item": "coat_rack", "chance": 60, "repeat": 2 },
         "4": { "item": "toxic_dump_equipment", "chance": 85, "repeat": [ 1, 2 ] },
+        "F̱": { "item": "toxic_dump_equipment", "chance": 85, "repeat": [ 1, 2 ] },
         "7": { "item": "tools_common", "chance": 85, "repeat": [ 1, 2 ] },
         "8": { "item": "tools_common", "chance": 85, "repeat": [ 1, 2 ] },
         "9": { "item": "cleaning", "chance": 85, "repeat": [ 1, 2 ] },
@@ -147,6 +124,7 @@
         "c": { "item": "office_supplies", "chance": 60 },
         "b": { "item": "lab_bookshelves", "chance": 60, "repeat": 2 },
         "l": { "item": "cleaning", "chance": 85, "repeat": 2 },
+        "ḻ": { "item": "cleaning", "chance": 85, "repeat": 2 },
         "F": { "item": "office_paper", "chance": 50 }
       },
       "place_item": [