diff --git a/data/mods/Aftershock/maps/mapgen/afs_power_station_large.json b/data/mods/Aftershock/maps/mapgen/afs_power_station_large.json
index 95f648625f525..37bee97c68b6b 100644
--- a/data/mods/Aftershock/maps/mapgen/afs_power_station_large.json
+++ b/data/mods/Aftershock/maps/mapgen/afs_power_station_large.json
@@ -55,7 +55,13 @@
         "3  °°° °  3°  °°°     °°°°3°°°   °°°   °°° 3° °3",
         "333333333333333333333333333333333333333333333433"
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_habitat_life_support" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_residential_furnishing",
+        "afs_habitat_life_support",
+        "afs_light_param_palette"
+      ],
       "terrain": {
         "0": "t_thconc_floor_no_roof",
         "3": "t_chainfence",
@@ -93,8 +99,8 @@
         { "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 24, 34 ], "y": [ 41, 44 ], "pack_size": [ 1, 2 ], "chance": 30 }
       ],
       "place_nested": [
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 24, "y": 24 },
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 24 }
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 24 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 24 }
       ]
     }
   },
diff --git a/data/mods/Aftershock/maps/mapgen/afs_power_station_small.json b/data/mods/Aftershock/maps/mapgen/afs_power_station_small.json
index 8892d5e20c3e9..5850e9793df75 100644
--- a/data/mods/Aftershock/maps/mapgen/afs_power_station_small.json
+++ b/data/mods/Aftershock/maps/mapgen/afs_power_station_small.json
@@ -31,7 +31,13 @@
         "3°° ä°°°°°°°°° °°°°3 °  ",
         "33333333333333333333°   "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_habitat_life_support" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_residential_furnishing",
+        "afs_habitat_life_support",
+        "afs_light_param_palette"
+      ],
       "terrain": {
         "3": "t_chainfence",
         "4": "t_chaingate_c",
@@ -61,7 +67,7 @@
         { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 50 },
         { "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 2 ], "chance": 30 }
       ],
-      "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 } ]
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/astrobiology_lab.json b/data/mods/Aftershock/maps/mapgen/astrobiology_lab.json
index e9b5377c7ab81..c0610377a331e 100644
--- a/data/mods/Aftershock/maps/mapgen/astrobiology_lab.json
+++ b/data/mods/Aftershock/maps/mapgen/astrobiology_lab.json
@@ -8,30 +8,30 @@
       "rows": [
         "                ,,      ",
         "               /44/     ",
-        "     /     /   /../     ",
+        "     /     /   /''/     ",
         "    //QQQQ//QQQ/33//    ",
         "   //..hh../t???...//   ",
-        "   /..htt..3......../   ",
+        "   /.'htt'.3....''../   ",
         "  //..htth./...dd5d.//  ",
         "  /5...hh../...d.h..^/  ",
         "  ///////////33////3//  ",
-        "  /h..B/R...3.../&..S/  ",
-        "  /dd.B/R.bb/:==//////  ",
-        "  /hh..//////...=d..E/  ",
+        "  /h..B/R.'.3.'./&'.S/  ",
+        "  /dd'B/R.bb/:==//////  ",
+        "  /hh..//////...=d.'E/  ",
         "  /===:/FFFS/==:=dh.E/  ",
         "  /................ö./  ",
-        "  /.hccc..chccch..ch./  ",
-        "  /.Tchc..ccchcc..cc./  ",
+        "  /.hccc'.chccch.'ch./  ",
+        "  /.Tchc'.ccchcc.'cc./  ",
         "  ó..................ó  ",
         "  /S..((((((((((((..O/  ",
         "  /S..(Iii____IIi(.hc/  ",
         "  //=:(I77_iA___i(:=//  ",
-        "   /..(____iii___(../   ",
+        "   /.'(____iii___('./   ",
         "   //.3__7I___II_3.//   ",
         "    //------------//    ",
         "                        "
       ],
-      "palettes": [ "afs_generic_building" ],
+      "palettes": [ "afs_generic_building", "afs_light_param_palette" ],
       "terrain": {
         "A": "t_basaltfloor",
         "R": "t_metal_floor",
@@ -39,7 +39,8 @@
         "_": [ "t_deaddirt", "t_deaddirt", "t_ice" ],
         "i": [ "t_lichenyum", "t_lichen", "t_lichendirt" ],
         "I": [ "t_lichen", "t_lichendirt" ],
-        "7": [ "t_tree_worm", "t_tree_lichen" ]
+        "7": [ "t_tree_worm", "t_tree_lichen" ],
+        "'": "t_metal_floor_olight_inactive"
       },
       "furniture": {
         "A": "f_geo_vent",
@@ -70,7 +71,8 @@
         "t": [ { "item": "office_paper", "chance": 60 }, { "item": "tools_science", "chance": 10, "repeat": [ 1, 2 ] } ]
       },
       "item": { "c": { "item": "recipe_lichenlog", "chance": 6 } },
-      "monster": { "ö": { "monster": "mon_skitterbot" } }
+      "monster": { "ö": { "monster": "mon_skitterbot" } },
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/exosuit_garage.json b/data/mods/Aftershock/maps/mapgen/exosuit_garage.json
index 6d457f06a19aa..a04eb4f0a8c96 100644
--- a/data/mods/Aftershock/maps/mapgen/exosuit_garage.json
+++ b/data/mods/Aftershock/maps/mapgen/exosuit_garage.json
@@ -31,13 +31,19 @@
         "            /////)))//  ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_life_support", "afs_habitat_residential_furnishing" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_life_support",
+        "afs_habitat_residential_furnishing",
+        "afs_light_param_palette"
+      ],
       "terrain": { "1": "t_afs_security_gate_closed", "3": "t_afs_door_metal_elocked", "4": "t_reinforced_glass_shutter" },
       "furniture": { "2": "f_security_panel", "5": "f_machinery_light", "6": "f_machinery_electronic", "î": "f_rack" },
       "items": { "î": { "item": "magazines", "chance": 80, "repeat": [ 2, 5 ] } },
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ],
       "place_nested": [
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 },
         { "chunks": [ [ "afs_exosuit_garage_unlooted", 60 ], [ "afs_exosuit_garage_looted", 40 ] ], "x": 0, "y": 0 }
       ]
     }
diff --git a/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json b/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json
index d4e798edb8efe..2c4d84f5abb67 100644
--- a/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json
+++ b/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json
@@ -31,13 +31,19 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_life_support", "afs_habitat_residential_furnishing" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_life_support",
+        "afs_habitat_residential_furnishing",
+        "afs_light_param_palette"
+      ],
       "terrain": { "2": "t_afs_security_gate_closed", "1": "t_afs_door_metal_elocked" },
       "furniture": { "4": "f_machinery_light", "5": "f_machinery_electronic" },
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ],
       "vendingmachines": { "3": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true } },
       "place_nested": [
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 },
         {
           "chunks": [ [ "afs_exosuit_garage_2_unlooted", 60 ], [ "afs_exosuit_garage_2_looted", 40 ] ],
           "x": 0,
diff --git a/data/mods/Aftershock/maps/mapgen/freight_transport.json b/data/mods/Aftershock/maps/mapgen/freight_transport.json
index b45bdf928ec2e..e5b79a8638d2f 100644
--- a/data/mods/Aftershock/maps/mapgen/freight_transport.json
+++ b/data/mods/Aftershock/maps/mapgen/freight_transport.json
@@ -14,12 +14,12 @@
         "       -)-)-  -))-   ññññññ      ñññññññ        ",
         "     ---Foj----II--- -)- --!--   -))-))-        ",
         "   ---yh...U-LL..qq---I---...-----ä.â.ä--       ",
-        "   #.#yh.,ss-E...,.....q-l...l-éé-ä.,.ä----     ",
+        "   #.#yh.'ss-E...'.....q-l...l-éé-ä.'.ä----     ",
         "   ---á.....!..f-)---..q-l...l-..---1---hc)     ",
-        "     --!--ee-,h❺)ê!.1,..!..,..-....5..!.,c)     ",
-        "   ---S.S----..f-)---7.q-l....!....,..--hc)     ",
-        "   #.#.,.-OP-E...,.....q-l....-6f4....f----     ",
-        "   ---SS.!,❸-LL..qq---I---...-----fL.fE--       ",
+        "     --!--ee-'h❺)ê!.1'..!..'..-....5..!.'c)     ",
+        "   ---S.S----..f-)---7.q-l....!....'..--hc)     ",
+        "   #.#.'.-OP-E...'.....q-l....-6f4....f----     ",
+        "   ---SS.!'❸-LL..qq---I---...-----fL.fE--       ",
         "     ---W-~----II--- -)- --!--   -))-))-        ",
         "       -)-)-  -))-   ññññññ      ñññññññ        ",
         "       ñññññññññññ                              ",
@@ -35,7 +35,8 @@
         "afs_habitat_structure",
         "afs_habitat_mech_furnishing",
         "afs_habitat_residential_furnishing",
-        "afs_habitat_life_support"
+        "afs_habitat_life_support",
+        "afs_light_param_palette"
       ],
       "terrain": { "ñ": "t_afs_broken_treads", "1": "t_door_metal_locked", "ê": "t_nuclear_reactor" },
       "furniture": {
@@ -75,7 +76,11 @@
           "options": [ { "name": "UNLOCK ARMORY DOORS", "action": "unlock" } ],
           "failures": [ { "action": "shutdown" }, { "action": "alarm" } ]
         }
-      }
+      },
+      "place_nested": [
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 0 }
+      ]
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/general_store.json b/data/mods/Aftershock/maps/mapgen/general_store.json
index 5372effddfb88..f2120c218becc 100644
--- a/data/mods/Aftershock/maps/mapgen/general_store.json
+++ b/data/mods/Aftershock/maps/mapgen/general_store.json
@@ -31,7 +31,7 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": { "1": "t_door_metal_locked" },
       "//": "An Electronic safe would be prefered but the gunsafe furniture is hardcoded to say do you want to hack this gunsafe?",
       "furniture": {
@@ -61,7 +61,7 @@
       },
       "place_loot": [ { "group": "afs_register_random", "x": [ 3, 6 ], "y": 10, "repeat": 1 } ],
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ],
-      "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 } ]
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
@@ -101,13 +101,14 @@
         "afs_habitat_structure",
         "afs_habitat_residential_furnishing",
         "afs_habitat_life_support",
-        "afs_habitat_exterior"
+        "afs_habitat_exterior",
+        "afs_light_param_palette"
       ],
       "terrain": { " ": "t_open_air", "1": { "param": "carpet_color_type", "fallback": "t_carpet_red" } },
       "furniture": { "2": "f_dishwasher", "á": "f_bookcase" },
       "place_item": [ { "item": "television", "repeat": 1, "x": 11, "y": 15 } ],
       "items": { "á": { "item": "homebooks", "repeat": [ 2, 3 ] }, "q": { "item": "afs_old_food_storage", "chance": 60 } },
-      "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 } ]
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
@@ -144,14 +145,5 @@
       ],
       "palettes": [ "roof_palette" ]
     }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "afs_map_lights_on",
-    "object": {
-      "mapgensize": [ 24, 24 ],
-      "place_ter_furn_transforms": [ { "transform": "afs_lights_on", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
-    }
   }
 ]
diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json
index 003941b8913df..15b9000a4de7b 100644
--- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json
+++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json
@@ -35,7 +35,8 @@
         "afs_habitat_structure",
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
-        "afs_habblock_1_paramter_palette"
+        "afs_habblock_1_paramter_palette",
+        "afs_light_param_palette"
       ],
       "furniture": { "1": "f_washer", "2": "f_dryer", "3": "f_atm" },
       "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true } },
@@ -124,7 +125,8 @@
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
         "afs_habitat_life_support",
-        "afs_habblock_1_paramter_palette"
+        "afs_habblock_1_paramter_palette",
+        "afs_light_param_palette"
       ],
       "terrain": { " ": "t_open_air", "1": "t_afs_door_metal_elocked" },
       "place_monster": [
@@ -190,8 +192,7 @@
       "variant": {
         "type": "nested_mapgen_id",
         "default": { "distribution": [ "afs_habblock_1_slot1_cafe_a1", "afs_habblock_1_slot1_diner_a1" ] }
-      },
-      "lightstatus": { "type": "nested_mapgen_id", "default": { "distribution": [ "afs_map_lights_on", "null" ] } }
+      }
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json
index f95a11b86321f..3cc12a927ba07 100644
--- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json
+++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json
@@ -60,7 +60,7 @@
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
         "afs_habitat_life_support",
-        "afs_habblock_2_paramter_palette"
+        "afs_light_param_palette"
       ],
       "terrain": {
         "0": "t_elevator_control",
@@ -172,12 +172,7 @@
         " ////        ////              ////        //// ",
         "                                                "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_2_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_open_air",
         "0": "t_elevator_control",
@@ -294,12 +289,7 @@
         " ////        ////              ////        //// ",
         "                                                "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_2_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_open_air",
         "0": "t_elevator_control",
@@ -391,12 +381,7 @@
         " ////        ////              ////        //// ",
         "                                                "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_2_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_open_air",
         "0": "t_elevator_control",
@@ -486,12 +471,7 @@
         " ////        ////              [[[[        [[[[ ",
         "                                                "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_2_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_open_air",
         ".": "t_metal_floor_no_roof",
@@ -594,10 +574,5 @@
       "palettes": [ "afs_habitat_structure", "afs_habitat_exterior" ],
       "terrain": { " ": "t_open_air", ".": "t_metal_floor_no_roof" }
     }
-  },
-  {
-    "type": "palette",
-    "id": "afs_habblock_2_paramter_palette",
-    "parameters": { "lightstatus": { "type": "nested_mapgen_id", "default": { "distribution": [ "afs_map_lights_on", "null" ] } } }
   }
 ]
diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json
index a73839d02b6c8..171a657c8aa77 100644
--- a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json
+++ b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_3.json
@@ -31,12 +31,7 @@
         " //=//=///    /////===/ ",
         "                        "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_3_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "furniture": {
         "5": "f_atm",
         "1": "f_arcade_machine",
@@ -92,7 +87,7 @@
         " /////==//    //==///// ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_residential_furnishing", "afs_habblock_3_paramter_palette" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": { " ": "t_open_air", "1": "t_linoleum_white", "&": "t_linoleum_white", "*": "t_linoleum_white" },
       "furniture": { "1": "f_shower" },
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 2, 21 ], "y": [ 4, 20 ], "pack_size": [ 1, 3 ], "chance": 45 } ],
@@ -131,7 +126,7 @@
         " /////////    /==////// ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_residential_furnishing", "afs_habblock_3_paramter_palette" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": { " ": "t_open_air", "1": "t_linoleum_white", "&": "t_linoleum_white", "*": "t_linoleum_white" },
       "furniture": { "1": "f_shower" },
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 2, 21 ], "y": [ 4, 20 ], "pack_size": [ 1, 3 ], "chance": 45 } ],
@@ -175,7 +170,7 @@
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
         "afs_habitat_life_support",
-        "afs_habblock_3_paramter_palette"
+        "afs_light_param_palette"
       ],
       "terrain": {
         " ": "t_open_air",
@@ -228,10 +223,5 @@
       "palettes": [ "afs_habitat_structure", "afs_habitat_exterior" ],
       "terrain": { " ": "t_open_air" }
     }
-  },
-  {
-    "type": "palette",
-    "id": "afs_habblock_3_paramter_palette",
-    "parameters": { "lightstatus": { "type": "nested_mapgen_id", "default": { "distribution": [ "afs_map_lights_on", "null" ] } } }
   }
 ]
diff --git a/data/mods/Aftershock/maps/mapgen/houses/houses.json b/data/mods/Aftershock/maps/mapgen/houses/houses.json
index 754269301a98a..62d9f16c64dab 100644
--- a/data/mods/Aftershock/maps/mapgen/houses/houses.json
+++ b/data/mods/Aftershock/maps/mapgen/houses/houses.json
@@ -10,30 +10,32 @@
         "                        ",
         "   ++o+++o++o+++ppp.ppp ",
         "   +@.x.x.@+.@++......p ",
-        "   +D.+.+.D+.D+++++l+++ ",
-        "   ++n+.++n+xn++q+...o  ",
-        "   +D.x......hf+x++l+++ ",
-        "   o@.+......hfn.77.77+ ",
-        "   +n++++x++++n+......o ",
-        "   o...........x......+ ",
+        "   +D'+.+'D+'D+++++l+++ ",
+        "   ++n+.++n+xn++q+.'.o  ",
+        "   +D.x.'..'.hf+x++l+++ ",
+        "   o@'+.'..'.hfn.77.77+ ",
+        "   +n++++x++++n+...'..o ",
+        "   o.....'.....x......+ ",
         "   +nx++nx++nx++...++++ ",
-        "   +5.t+5.t+5.t+...+    ",
+        "   +5't+5't+5't+.'.+    ",
         "   ++9+++9+++9++...o    ",
         "   ++++++++++++....+    ",
         "   +{L.............++++ ",
         "   oF..........H.....y+ ",
-        "   oV.J........H..2..y+ ",
-        "   oI.J........H..2..y+ ",
+        "   oV'J...'....H.'2..y+ ",
+        "   oI'J...'....H.'2..y+ ",
         "   +P.S........H.....y+ ",
         "   +M^M...E.......Y...+ ",
-        "   +++++R.......+++++++ ",
+        "   +++++R...'...+++++++ ",
         "       +RRRR.JWZ+       ",
         "       ++++++ooo+       ",
         "                        "
       ],
-      "palettes": [ "standard_afsshelter_palette" ],
+      "palettes": [ "standard_afsshelter_palette", "afs_light_param_palette" ],
+      "terrain": { "'": "t_metal_floor_olight_inactive" },
       "place_item": [ { "item": "television", "repeat": 1, "x": 21, "y": 17 }, { "item": "toaster", "repeat": 1, "x": 6, "y": 17 } ],
-      "place_monsters": [ { "monster": "AFS_GROUP_MOXIE_LOW_RISK", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 10, "density": 0.1 } ]
+      "place_monsters": [ { "monster": "AFS_GROUP_MOXIE_LOW_RISK", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 10, "density": 0.1 } ],
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json b/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json
index 676ab3419db93..e33417e96e59f 100644
--- a/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json
+++ b/data/mods/Aftershock/maps/mapgen/maintenance_outpost.json
@@ -11,51 +11,51 @@
         "    _________________________  /    / /   /     ",
         "    _________________________  //==////==//     ",
         "    _________________________  /q..9yy4..q/     ",
-        "    __________________     __  /y........y/     ",
-        "    _________________  c       /yh.......y/     ",
+        "    __________________     __  /y....'...y/     ",
+        "    _________________  c       /yh...'...y/     ",
         "    ____________      //!//    /q..8yy.6.q/     ",
         "    ___________       =c..=    //]]////////     ",
         "    ___________  //==///!///////...v/~/~/~/     ",
         "    ___________  /@..@/c../EEEEE..../:/:/:/     ",
-        "    ___________  /@..@/.............:...../     ",
-        "    ___________  /@..@/..Ó........../:/:/:/     ",
+        "    ___________  /@..@/.......'..'..:..'../     ",
+        "    ___________  /@''@/..Ó....'..'../:/:/:/     ",
         "    ___________  /@...+.../lllllllll/~/~/~/     ",
-        "    ___________  /@..@/.../////////////////     ",
+        "    ___________  /@..@/.'./////////////////     ",
         " 1111_________111//////.../ññÑjj^.húh.....//    ",
-        " 1  ___________  /EqOT/...]...........555.=     ",
-        " 1  ___________  /....!.../.húhÓhúh...555.=     ",
-        " 1  ___________  /yyPW/..^/.húh.húhÓ......//    ",
+        " 1  ___________  /EqOT/...]..'....'...555.=     ",
+        " 1  ___________  /.'..!.'./.húhÓhúh...555.=     ",
+        " 1  ___________  /yyPW/..^/.húh.húhÓ..''..//    ",
         " 1  ___________  ///////!////==/==/==/!!///111  ",
         " 1  ___________             /  /  /  /../    1  ",
         " 1  ___________                      =..=    1  ",
-        " 1  ______________________________   =..=    1  ",
+        " 1  ______________________________   =''=    1  ",
         " 1  ______________________________   =..=    1  ",
         " 1  ______________________________   /../    1  ",
         " 1  ______________________________ ///!!///111  ",
         " 1  ______________________________ /E....0/     ",
-        " 1  ______________________________ /E....0/     ",
+        " 1  ______________________________ /E.''.0/     ",
         " 1  ______________________________ /....../     ",
         " 1  ____________________________  ///!/qqq/     ",
-        " 1  ____________________________ ////.///////// ",
+        " 1  ____________________________ ////'///////// ",
         " 1  ____________________________ /HH/!/..8yy../ ",
         " 1  ______________________________............/ ",
         " 1  ______________________________...........l/ ",
-        " 1  ______________________________.Ó.........q/ ",
-        " 1  ______________________________...........q/ ",
+        " 1  ______________________________.Ó....'....q/ ",
+        " 1  ______________________________......'....q/ ",
         " 1   __________    _______________............/ ",
         "  ||||       ||||  _____________ /...........4/ ",
         " |||l|¡¡¡¡¡¡¡|l||| _____________ /..|.qyc.|..8/ ",
-        " ||.............|| _____________ /............/ ",
-        " |E....-)))-....E| _______________............/ ",
-        " |E...--...--...E| _______________...........l/ ",
-        " |E.7..).3.)..7.E| _______________...........c/ ",
-        " |.....)...).....| _______________...........c/ ",
+        " ||......'......|| _____________ /............/ ",
+        " |E.'..-)))-..'.E| _______________............/ ",
+        " |E...--...--...E| _______________......'....l/ ",
+        " |E.7..).3.)..7.E| _______________......'....c/ ",
+        " |.....).'.).....| _______________...........c/ ",
         " |¡||||--.--||||¡| _______________............/ ",
-        " |...¡.......¡...|               /22222//22222/ ",
+        " |.'.¡...'...¡.'.|               /22222//22222/ ",
         " |||||||EEE|||||||111111111111111////////////// ",
         "  |||||||||||||||                               "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_region_groundcover_urban",
         "3": "t_nuclear_reactor",
@@ -100,7 +100,13 @@
           "options": [ { "name": "UNLOCK REACTOR DOORS", "action": "unlock" } ],
           "failures": [ { "action": "shutdown" }, { "action": "alarm" } ]
         }
-      }
+      },
+      "place_nested": [
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 24 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 24 }
+      ]
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/police_station.json b/data/mods/Aftershock/maps/mapgen/police_station.json
index 0763b28ee7d7a..911be38e7cee6 100644
--- a/data/mods/Aftershock/maps/mapgen/police_station.json
+++ b/data/mods/Aftershock/maps/mapgen/police_station.json
@@ -35,7 +35,8 @@
         "afs_habitat_structure",
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
-        "afs_enforcer_station_a1_parrameter_palette"
+        "afs_enforcer_station_a1_parrameter_palette",
+        "afs_light_param_palette"
       ],
       "terrain": {
         "1": "t_door_metal_locked",
@@ -106,7 +107,8 @@
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
         "afs_habitat_life_support",
-        "afs_enforcer_station_a1_parrameter_palette"
+        "afs_enforcer_station_a1_parrameter_palette",
+        "afs_light_param_palette"
       ],
       "terrain": { "1": "t_door_metal_locked", "2": "t_afs_enforcer_card_reader", " ": "t_open_air" },
       "furniture": {
@@ -187,8 +189,7 @@
       "enemies": {
         "type": "nested_mapgen_id",
         "default": { "distribution": [ "afs_enforcer_station_a1_floor1_moxies", "afs_enforcer_station_a1_floor1_robots" ] }
-      },
-      "lightstatus": { "type": "nested_mapgen_id", "default": { "distribution": [ "afs_map_lights_on", "null" ] } }
+      }
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/robot_dispatch.json b/data/mods/Aftershock/maps/mapgen/robot_dispatch.json
index c92cac8acd9f3..37888d72608cd 100644
--- a/data/mods/Aftershock/maps/mapgen/robot_dispatch.json
+++ b/data/mods/Aftershock/maps/mapgen/robot_dispatch.json
@@ -11,27 +11,27 @@
         "    //¡¡¡//             ",
         "    |....c|¡|¡|¡|¡|¡|   ",
         "  |||||!|||.|z|.|.|z|   ",
-        "  ¡z),,,,1|)|)|)|)|)||  ",
-        "  |||.3..||,.,.,.,.,6|  ",
-        "  ¡z).....],3,3,3,3,6|  ",
-        "  |||.3..||,.,.,.,.,||  ",
-        "  ¡z),,,,1|1|1|1|1|1|   ",
+        "  ¡z)''''1|)|)|)|)|)||  ",
+        "  |||.3..||'.,.'.'.'6|  ",
+        "  ¡z).....]'3,3'3'3'6|  ",
+        "  |||.3..||'.,.'.'.'||  ",
+        "  ¡z)''''1|1|1|1|1|1|   ",
         "  |||.3..|||||||||||||| ",
-        "  ¡z),,,,1|..........|| ",
+        "  ¡z)''''1|....''....|| ",
         "  |||.3..||¡||)55)||¡|| ",
-        "  ¡.),,,,1|...))))...|| ",
-        "  |||.3..||.c......c.|| ",
-        "  ¡z),,,,1||..|¡¡|..||| ",
-        "  ||||||]||EE||..||EE|| ",
+        "  ¡.)''''1|...))))...|| ",
+        "  |||.3..||.c..''..c.|| ",
+        "  ¡z)''''1||..|¡¡|..||| ",
+        "  ||||||]||EE||''||EE|| ",
         "  c|c|LL..||||2¡¡|||||| ",
-        "   ¡.!....!.......!<<|  ",
+        "   ¡'!..'.!....''.!<<|  ",
         "  ||=||...|qqyy...|<<|  ",
         "      ||||||||||||||||  ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_light_param_palette" ],
       "terrain": { "2": "t_afs_industrial_card_reader", "¡": "t_door_metal_locked" },
       "furniture": {
         "1": "f_drone_recharge_station",
@@ -41,7 +41,8 @@
         "6": "f_ancient_processor"
       },
       "monsters": { "z": { "monster": "GROUP_UTILIBOT" } },
-      "items": { "1": { "item": "old_industrial_bot_storage", "chance": 20 } }
+      "items": { "1": { "item": "old_industrial_bot_storage", "chance": 20 } },
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
@@ -59,24 +60,24 @@
         "  ..ppppp.|)|)|)|)|)||  ",
         "  ........|cc1c1c141E|  ",
         "  ..ppppp.|c.h.h....E|  ",
-        "  ........|.........||  ",
+        "  ........|....'....||  ",
         "  |.......|E|E...E|E|   ",
-        "  |||===||||||...|||||| ",
-        "  |~:...:~|..|...#WOA|| ",
+        "  |||===||||||.'.|||||| ",
+        "  |~:.'.:~|..|...#WOA|| ",
         "  |||@.@||||||)¡¡3||#|| ",
         "  |4y....5|22|...|222|| ",
-        "  |4y....5|..]...]...|| ",
-        "  |Ñññ...6|..]...]...|| ",
+        "  |4y.'..5|'.].'.]..'|| ",
+        "  |Ñññ...6|'.]...]..'|| ",
         "  ||||||]||22|...|222|| ",
         "  ....|6.6||||...|||||| ",
-        "  .p.p=...!.......!>>|  ",
+        "  .p.p=.'.!....'..!>>|  ",
         "  .p.p=...|qqyy..Ñ|>>|  ",
         "      ||||||||||||||||  ",
         "                        ",
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_light_param_palette" ],
       "terrain": { " ": "t_open_air", "¡": "t_door_metal_locked", "3": "t_afs_industrial_card_reader" },
       "furniture": {
         "1": "f_command_console_old",
@@ -91,7 +92,8 @@
         "ñ": { "item": "afs_old_food_storage", "chance": 80 },
         "Ñ": { "item": "afs_kitchenette" },
         "6": { "item": "afs_colonist_outfit", "chance": 20 }
-      }
+      },
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/shuttle_pad.json b/data/mods/Aftershock/maps/mapgen/shuttle_pad.json
index 61e8335f146f1..49209bdec81e5 100644
--- a/data/mods/Aftershock/maps/mapgen/shuttle_pad.json
+++ b/data/mods/Aftershock/maps/mapgen/shuttle_pad.json
@@ -31,13 +31,13 @@
         " ññññññññññññññññññññññññññññññññññññññññ°°°ñññ ",
         "                                                "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_habitat_exterior" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_habitat_exterior", "afs_light_param_palette" ],
       "terrain": { "ñ": "t_chainfence" },
       "furniture": { "&": "f_sealed_intermodal_crate", "e": "f_intermodal_crate_open" },
       "items": { "&": [ { "item": "afs_crate_civ_rand" } ] },
       "monster": { "ö": { "monster": "mon_skitterbot" } },
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 2, 22 ], "y": [ 2, 22 ], "pack_size": [ 1, 2 ], "chance": 50 } ],
-      "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 24, "y": 0 } ]
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 0 } ]
     }
   },
   {
diff --git a/data/mods/Aftershock/maps/mapgen/solar_array.json b/data/mods/Aftershock/maps/mapgen/solar_array.json
index 2f19c3e26f869..9a7c2b12cfc93 100644
--- a/data/mods/Aftershock/maps/mapgen/solar_array.json
+++ b/data/mods/Aftershock/maps/mapgen/solar_array.json
@@ -31,7 +31,13 @@
         " 1111111111111111111111©©©©©©  ©  ©©©©¢¢¢   ¢¢¢©",
         "                       ©©    ©©© ©©©  ¢¢¢¢ ¢¢  ©"
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_habitat_life_support" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_residential_furnishing",
+        "afs_habitat_life_support",
+        "afs_light_param_palette"
+      ],
       "terrain": { "1": "t_chainfence", "2": "t_chaingate_c", "b": "t_sidewalk" },
       "furniture": { "3": "f_server", "4": "f_drone_recharge_station" },
       "place_monster": [
@@ -40,7 +46,7 @@
         { "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 24, 29 ], "y": [ 6, 14 ], "pack_size": [ 1, 3 ], "chance": 50 }
       ],
       "place_nested": [
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 24, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 0 },
         {
           "chunks": [ [ "afs_solar_array_panels_lines", 50 ], [ "afs_solar_array_panels_circle", 50 ] ],
           "x": 0,
diff --git a/data/mods/Aftershock/maps/mapgen/stratoscomm_relay.json b/data/mods/Aftershock/maps/mapgen/stratoscomm_relay.json
index 7d039435f50c0..ae433b8137f79 100644
--- a/data/mods/Aftershock/maps/mapgen/stratoscomm_relay.json
+++ b/data/mods/Aftershock/maps/mapgen/stratoscomm_relay.json
@@ -12,7 +12,7 @@
         "                   .    ",
         "                    .   ",
         "                   ..   ",
-        "                  |,,|  ",
+        "                  |''|  ",
         "                 1|!!|  ",
         "  p p p   -----111|55|  ",
         "  p p p   -...----|66|  ",
@@ -31,9 +31,10 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_light_param_palette" ],
       "terrain": { "1": "t_dirtmound", "2": "t_bars", "5": "t_ramp_down_high", "6": "t_ramp_down_low" },
-      "furniture": { "4": "f_mil_comms_sat" }
+      "furniture": { "4": "f_mil_comms_sat" },
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
@@ -54,21 +55,21 @@
         "##################||||##",
         "##########|||||||||55|##",
         "##########|431=..<|66|##",
-        "##########|2.ö=!!||]]|##",
+        "##########|2'ö=!!||]]|##",
         "##########|2h.!..|l..|##",
-        "##########|4,.=..|l..|##",
+        "##########|4,.=..|l''|##",
         "##########||===..||]||##",
         "#########|||yhv.....A|##",
         "########||*|q.ö.hfh.P|##",
-        "########|~.+....hfh.c|##",
-        "########||&|+|+|...hk|##",
+        "########|~'+..'.hfh.c|##",
+        "########||&|+|+|.'.hk|##",
         "#########|||@|@|FoyyE|##",
         "###########|||||||||||##",
         "########################",
         "########################",
         "########################"
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_mech_furnishing", "afs_light_param_palette" ],
       "terrain": { "5": "t_ramp_up_high", "6": "t_ramp_up_low", "#": "t_rock" },
       "furniture": {
         "@": "f_sleep_pod",
@@ -81,7 +82,8 @@
         "F": "f_fridge"
       },
       "items": { "o": { "item": "afs_kitchenette", "chance": 100 }, "F": { "item": "afs_old_food_storage", "chance": 80 } },
-      "monster": { "ö": { "monster": "mon_skitterbot" } }
+      "monster": { "ö": { "monster": "mon_skitterbot" } },
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
diff --git a/data/mods/Aftershock/ter_fur_transform.json b/data/mods/Aftershock/ter_fur_transform.json
index 183105b3685e2..7b97c81cad677 100644
--- a/data/mods/Aftershock/ter_fur_transform.json
+++ b/data/mods/Aftershock/ter_fur_transform.json
@@ -153,5 +153,14 @@
         ]
       }
     ]
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "afs_map_lights_on",
+    "object": {
+      "mapgensize": [ 24, 24 ],
+      "place_ter_furn_transforms": [ { "transform": "afs_lights_on", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
+    }
   }
 ]