diff --git a/data/json/furniture_and_terrain/furniture_misc.json b/data/json/furniture_and_terrain/furniture_misc.json
new file mode 100644
index 0000000000000..88a385c692329
--- /dev/null
+++ b/data/json/furniture_and_terrain/furniture_misc.json
@@ -0,0 +1,122 @@
+[
+  {
+    "type": "furniture",
+    "id": "f_atm",
+    "looks_like": "t_atm",
+    "name": "ATM",
+    "description": "For your banking convenience, this Automated Teller Machine is fully capable of operating autonomously in the event of complete network failure.  You can deposit funds from cash cards and migrate all of your inflation-adjusted earnings to a single card.  This thing has seen better days; there's been a run on the bank, and this machine has the dents and cracks to prove it.",
+    "symbol": "&",
+    "bgcolor": "yellow",
+    "required_str": -1,
+    "move_cost_mod": -1,
+    "coverage": 55,
+    "flags": [ "TRANSPARENT", "NOITEM", "ALARMED", "REDUCE_SCENT", "PERMEABLE" ],
+    "examine_action": "atm",
+    "deconstruct": {
+      "items": [
+        { "item": "small_lcd_screen", "count": 1 },
+        { "item": "lc_steel_lump", "count": 77 },
+        { "item": "steel_chunk", "count": 302 },
+        { "item": "sheet_metal", "count": 8 },
+        { "item": "sheet_metal_small", "count": 40 },
+        { "item": "scrap", "count": 890 },
+        { "item": "RAM", "count": 2 },
+        { "item": "cable", "charges": 260 },
+        { "item": "e_scrap", "count": 60 },
+        { "item": "circuit", "count": 10 },
+        { "item": "power_supply", "count": 1 },
+        { "item": "amplifier", "count": 1 },
+        { "item": "plastic_chunk", "count": 96 },
+        { "item": "money_fifty", "count": [ 0, 299 ] },
+        { "item": "money_twenty", "count": [ 0, 299 ] },
+        { "item": "money_ten", "count": [ 0, 299 ] },
+        { "item": "money_five", "count": [ 0, 299 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 220,
+      "str_max": 800,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "small_lcd_screen", "count": 1 },
+        { "item": "lc_steel_lump", "count": 77 },
+        { "item": "steel_chunk", "count": [ 250, 300 ] },
+        { "item": "sheet_metal", "count": [ 2, 8 ] },
+        { "item": "sheet_metal_small", "count": [ 3, 40 ] },
+        { "item": "scrap", "count": [ 400, 890 ] },
+        { "item": "RAM", "count": [ 0, 2 ] },
+        { "item": "cable", "charges": [ 180, 260 ] },
+        { "item": "e_scrap", "count": [ 20, 60 ] },
+        { "item": "circuit", "count": [ 2, 10 ] },
+        { "item": "power_supply", "count": [ 0, 1 ] },
+        { "item": "amplifier", "count": [ 0, 1 ] },
+        { "item": "plastic_chunk", "count": [ 40, 96 ] },
+        { "item": "money_fifty", "count": [ 0, 299 ] },
+        { "item": "money_twenty", "count": [ 0, 299 ] },
+        { "item": "money_ten", "count": [ 0, 299 ] },
+        { "item": "money_five", "count": [ 0, 299 ] }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_atm_off",
+    "looks_like": "t_atm",
+    "//": "www.testlinkusa.com/ncr-5870",
+    "name": "ATM",
+    "description": "Designed to withdraw money from your bank account, this machine is completely dead now, both from having no more power, and having no internet connection to do any withdraws.  While you can deconstruct it, it's effectively just a big pile of metal.",
+    "symbol": "&",
+    "bgcolor": "yellow",
+    "required_str": -1,
+    "move_cost_mod": -1,
+    "coverage": 55,
+    "flags": [ "TRANSPARENT", "NOITEM", "ALARMED", "REDUCE_SCENT", "PERMEABLE" ],
+    "deconstruct": {
+      "items": [
+        { "item": "small_lcd_screen", "count": 1 },
+        { "item": "lc_steel_lump", "count": 77 },
+        { "item": "steel_chunk", "count": 302 },
+        { "item": "sheet_metal", "count": 8 },
+        { "item": "sheet_metal_small", "count": 40 },
+        { "item": "scrap", "count": 890 },
+        { "item": "RAM", "count": 2 },
+        { "item": "cable", "charges": 260 },
+        { "item": "e_scrap", "count": 60 },
+        { "item": "circuit", "count": 10 },
+        { "item": "power_supply", "count": 1 },
+        { "item": "amplifier", "count": 1 },
+        { "item": "plastic_chunk", "count": 96 },
+        { "item": "money_fifty", "count": [ 0, 299 ] },
+        { "item": "money_twenty", "count": [ 0, 299 ] },
+        { "item": "money_ten", "count": [ 0, 299 ] },
+        { "item": "money_five", "count": [ 0, 299 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 220,
+      "str_max": 800,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "small_lcd_screen", "count": 1 },
+        { "item": "lc_steel_lump", "count": 77 },
+        { "item": "steel_chunk", "count": [ 250, 300 ] },
+        { "item": "sheet_metal", "count": [ 2, 8 ] },
+        { "item": "sheet_metal_small", "count": [ 3, 40 ] },
+        { "item": "scrap", "count": [ 400, 890 ] },
+        { "item": "RAM", "count": [ 0, 2 ] },
+        { "item": "cable", "charges": [ 180, 260 ] },
+        { "item": "e_scrap", "count": [ 20, 60 ] },
+        { "item": "circuit", "count": [ 2, 10 ] },
+        { "item": "power_supply", "count": [ 0, 1 ] },
+        { "item": "amplifier", "count": [ 0, 1 ] },
+        { "item": "plastic_chunk", "count": [ 40, 96 ] },
+        { "item": "money_fifty", "count": [ 0, 299 ] },
+        { "item": "money_twenty", "count": [ 0, 299 ] },
+        { "item": "money_ten", "count": [ 0, 299 ] },
+        { "item": "money_five", "count": [ 0, 299 ] }
+      ]
+    }
+  }
+]
diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
index 9b6c660c265cf..648f2d7e9488d 100644
--- a/data/json/furniture_and_terrain/terrain-manufactured.json
+++ b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -252,40 +252,13 @@
       ]
     }
   },
-  {
-    "type": "terrain",
-    "id": "t_atm",
-    "name": "ATM",
-    "description": "For your banking convenience, this Automated Teller Machine is fully capable of operating autonomously in the event of complete network failure.  You can deposit funds from cash cards and migrate all of your inflation-adjusted earnings to a single card.  This thing has seen better days; there's been a run on the bank, and this machine has the dents and cracks to prove it.",
-    "symbol": "&",
-    "color": "magenta",
-    "move_cost": 0,
-    "coverage": 55,
-    "flags": [ "TRANSPARENT", "NOITEM", "ALARMED", "REDUCE_SCENT", "PERMEABLE" ],
-    "examine_action": "atm",
-    "bash": {
-      "str_min": 40,
-      "str_max": 210,
-      "sound": "metal screeching!",
-      "sound_fail": "clang!",
-      "ter_set": "t_floor",
-      "items": [
-        { "item": "steel_chunk", "count": [ 1, 3 ] },
-        { "item": "scrap", "count": [ 4, 8 ] },
-        { "item": "money_strap_twenty", "count": [ 1, 59 ] },
-        { "item": "money_strap_fifty", "count": [ 1, 39 ] },
-        { "item": "money_twenty", "count": [ 1, 99 ] },
-        { "item": "money_fifty", "count": [ 1, 99 ] }
-      ]
-    }
-  },
   {
     "type": "terrain",
     "id": "t_ticket_vendor",
     "name": "ticket vendor",
     "description": "A machine with a little screen and slots, intended to take your money and provide you with a ticket.",
     "symbol": "&",
-    "looks_like": "t_atm",
+    "looks_like": "f_atm",
     "color": "blue",
     "move_cost": 0,
     "coverage": 55,
diff --git a/data/json/mapgen/bank.json b/data/json/mapgen/bank.json
index d732bda404236..9dc6ee05fee3d 100644
--- a/data/json/mapgen/bank.json
+++ b/data/json/mapgen/bank.json
@@ -41,7 +41,6 @@
         "+": "t_door_c",
         "-": "t_window",
         ".": "t_floor",
-        "A": "t_atm",
         "G": "t_door_glass_c",
         "M": "t_door_metal_locked",
         "R": "t_wall_metal",
@@ -54,6 +53,7 @@
       "furniture": {
         "6": "f_console",
         "$": "f_safe_l",
+        "A": "f_atm_off",
         "C": "f_chair",
         "T": "f_table",
         "c": "f_counter",
@@ -167,7 +167,6 @@
         "+": "t_door_c",
         "-": "t_window",
         ".": "t_floor",
-        "A": "t_atm",
         "G": "t_door_glass_c",
         "M": "t_door_metal_locked",
         "R": "t_wall_metal",
@@ -183,6 +182,7 @@
         "x": "f_console_broken",
         "6": "f_console",
         "a": "f_armchair",
+        "A": "f_atm_off",
         "D": "f_sofa",
         "o": "f_bookcase",
         "e": "f_fridge",
diff --git a/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json b/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json
index ebdbe09bc0117..54d1e81117409 100644
--- a/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json
+++ b/data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json
@@ -111,10 +111,10 @@
         "=": "t_carpet_concrete_yellow",
         "_": "t_pavement",
         "[": "t_pavement",
-        "(": "t_pavement",
-        ")": "t_atm"
+        "(": "t_pavement"
       },
       "furniture": {
+        ")": "f_atm_off",
         "1": "f_rack",
         "2": "f_rack",
         "3": "f_rack",
diff --git a/data/json/mapgen/cs_internet_cafe.json b/data/json/mapgen/cs_internet_cafe.json
index b88913668686f..720663d653dff 100644
--- a/data/json/mapgen/cs_internet_cafe.json
+++ b/data/json/mapgen/cs_internet_cafe.json
@@ -44,10 +44,10 @@
         "g": "t_wall_glass_alarm",
         "G": "t_door_glass_c",
         "<": "t_stairs_up",
-        "4": "t_gutter_downspout",
-        "A": "t_atm"
+        "4": "t_gutter_downspout"
       },
       "furniture": {
+        "A": "f_atm_off",
         "P": "f_console_broken",
         "c": "f_displaycase",
         "C": "f_counter",
diff --git a/data/json/mapgen/cs_market_small.json b/data/json/mapgen/cs_market_small.json
index c52b450d06738..d2b882799f527 100644
--- a/data/json/mapgen/cs_market_small.json
+++ b/data/json/mapgen/cs_market_small.json
@@ -32,8 +32,15 @@
         "G        ,,,,,,        G"
       ],
       "palettes": [ "open_air_market_palette" ],
-      "terrain": { "Y": "t_tree", "A": "t_atm", "G": "t_region_groundcover_urban", "!": "t_region_groundcover_urban" },
-      "furniture": { "T": "f_table", "b": "f_bench", "g": "f_trashcan", "B": "f_bulletin", "!": [ "f_region_flower", "f_null" ] },
+      "terrain": { "Y": "t_tree", "G": "t_region_groundcover_urban", "!": "t_region_groundcover_urban" },
+      "furniture": {
+        "A": "f_atm_off",
+        "T": "f_table",
+        "b": "f_bench",
+        "g": "f_trashcan",
+        "B": "f_bulletin",
+        "!": [ "f_region_flower", "f_null" ]
+      },
       "items": { "g": { "item": "trash", "chance": 50, "repeat": [ 1, 4 ] }, "B": { "item": "bulletin_public", "chance": 75 } },
       "place_nested": [
         { "chunks": [ { "param": "topleft_market_variant_nests", "fallback": "market_meat" } ], "x": 1, "y": 1 },
diff --git a/data/json/mapgen/gambling_hall.json b/data/json/mapgen/gambling_hall.json
index 12284fd4fda01..c19243d288269 100644
--- a/data/json/mapgen/gambling_hall.json
+++ b/data/json/mapgen/gambling_hall.json
@@ -33,7 +33,6 @@
         "|||||||||||||||||ccccccc"
       ],
       "terrain": {
-        "&": "t_atm",
         "+": "t_door_glass_c",
         "-": "t_wall_glass",
         ".": "t_floor",
@@ -58,6 +57,7 @@
       },
       "toilets": { "U": {  } },
       "furniture": {
+        "&": "f_atm_off",
         "#": "f_chair",
         "C": "f_counter",
         "q": "f_counter",
@@ -242,7 +242,6 @@
         "P": "t_concrete",
         "9": "t_region_shrub_decorative",
         " ": "t_region_groundcover_urban",
-        "a": "t_atm",
         "b": [ "t_door_metal_c", "t_door_metal_elocked" ],
         "c": "t_door_metal_locked",
         "s": "t_sidewalk",
@@ -252,6 +251,7 @@
       },
       "toilets": { "U": {  } },
       "furniture": {
+        "a": "f_atm_off",
         "#": "f_chair",
         "&": "f_trashcan",
         "D": "f_dumpster",
diff --git a/data/json/mapgen/gas_stations/s_gas.json b/data/json/mapgen/gas_stations/s_gas.json
index 20b28d39f5038..b8b9e2beb4a06 100644
--- a/data/json/mapgen/gas_stations/s_gas.json
+++ b/data/json/mapgen/gas_stations/s_gas.json
@@ -33,7 +33,6 @@
       ],
       "place_furniture": [ { "furn": "f_gas_tank", "x": 2, "y": 3 }, { "furn": "f_diesel_tank", "x": 4, "y": 3 } ],
       "terrain": {
-        "&": "t_atm",
         "+": "t_chaingate_l",
         "-": "t_chainfence_h",
         ".": "t_pavement",
@@ -42,7 +41,7 @@
         "|": "t_chainfence_v"
       },
       "gaspumps": { "G": { "fuel": "gasoline" }, "D": { "fuel": "diesel" } },
-      "furniture": { "9": "f_aut_gas_console" },
+      "furniture": { "9": "f_aut_gas_console", "&": "f_atm_off" },
       "signs": { "P": { "signage": "Danger!  Do not smoke!  Risk of explosion!" } },
       "vendingmachines": { "1": { "item_group": "vending_drink", "lootable": true }, "2": { "item_group": "vending_food", "lootable": true } },
       "place_liquids": [
@@ -96,13 +95,13 @@
         "x": "t_wall_glass",
         ":": "t_pavement_y",
         "*": "t_tree",
-        "A": "t_atm",
         "Á": "t_concrete",
         "]": "t_concrete",
         ".": "t_thconc_floor",
         "4": "t_gutter_downspout"
       },
       "furniture": {
+        "A": "f_atm_off",
         "&": "f_trashcan",
         "{": "f_glass_fridge",
         "1": [ "f_indoor_plant", "f_indoor_plant_y" ],
diff --git a/data/json/mapgen/homeimprovement_superstore_new.json b/data/json/mapgen/homeimprovement_superstore_new.json
index f63368500c56d..27e321bf34624 100644
--- a/data/json/mapgen/homeimprovement_superstore_new.json
+++ b/data/json/mapgen/homeimprovement_superstore_new.json
@@ -58,10 +58,10 @@
       "R": "t_linoleum_white",
       "w": "t_linoleum_white",
       "<": "t_stairs_up",
-      "$": "t_atm",
       "?": "t_railing"
     },
     "furniture": {
+      "$": "f_atm_off",
       "x": "f_console_broken",
       "V": "f_vending_c",
       "h": "f_chair",
diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_commercial.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_commercial.json
index 58593f49585e4..d061e219debcb 100644
--- a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_commercial.json
+++ b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_commercial.json
@@ -129,7 +129,8 @@
         "2   1"
       ],
       "palettes": [ "lab_common_palette" ],
-      "terrain": { "2": "t_atm", "1": "t_slot_machine" },
+      "terrain": { "1": "t_slot_machine" },
+      "furniture": { "2": "f_atm_off" },
       "items": {
         "s": [ { "item": "beauty", "chance": 30, "repeat": [ 1, 2 ] } ],
         "q": [ { "item": "dollar_food", "chance": 30, "repeat": [ 1, 2 ] } ],
diff --git a/data/json/mapgen/laundromat.json b/data/json/mapgen/laundromat.json
index 13f4e31a30971..2c5af8b9a8d0a 100644
--- a/data/json/mapgen/laundromat.json
+++ b/data/json/mapgen/laundromat.json
@@ -37,7 +37,6 @@
         "+": "t_door_c",
         ".": "t_linoleum_white",
         "=": "t_wall_glass",
-        "A": "t_atm",
         "[": "t_door_glass_c",
         "_": "t_pavement",
         "-": "t_pavement_y",
@@ -52,6 +51,7 @@
         "4": "t_gutter_downspout"
       },
       "furniture": {
+        "A": "f_atm_off",
         "#": "f_counter",
         "%": [ "f_dumpster", "f_recycle_bin" ],
         "&": "f_trashcan",
diff --git a/data/json/mapgen/mall/mall_ground.json b/data/json/mapgen/mall/mall_ground.json
index be4831889f835..5cd6c3d2aad3d 100644
--- a/data/json/mapgen/mall/mall_ground.json
+++ b/data/json/mapgen/mall/mall_ground.json
@@ -1679,7 +1679,6 @@
       "palettes": [ "mall_palette_2" ],
       "terrain": {
         "3": "t_slot_machine",
-        "Δ": "t_atm",
         "R": "t_carpet_yellow",
         "(": "t_carpet_yellow",
         ")": "t_carpet_yellow",
@@ -1727,6 +1726,7 @@
         "{": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" }
       },
       "furniture": {
+        "Δ": "f_atm_off",
         "%": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "*": "f_trashcan",
         ":": "f_rack_wood",
@@ -1885,11 +1885,11 @@
         "Á": "t_carpet_concrete_yellow",
         "É": "t_carpet_concrete_yellow",
         "Ő": "t_carpet_concrete_yellow",
-        "Δ": "t_atm",
         "1": "t_linoleum_white_no_roof"
       },
       "sealed_item": { "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" } },
       "furniture": {
+        "Δ": "f_atm_off",
         "%": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "*": "f_trashcan",
         "!": "f_counter",
diff --git a/data/json/mapgen/megastore.json b/data/json/mapgen/megastore.json
index 3d08387e620db..a7b7a1cb227a1 100644
--- a/data/json/mapgen/megastore.json
+++ b/data/json/mapgen/megastore.json
@@ -18,11 +18,11 @@
       "<": "t_stairs_up",
       ">": "t_stairs_down",
       "%": "t_gates_mech_control",
-      "@": "t_atm",
       "I": "t_support_l",
       "Y": "t_switchgear_s"
     },
     "furniture": {
+      "@": "f_atm_off",
       "k": "f_rack",
       "K": "f_rack",
       "r": "f_rack",
diff --git a/data/json/mapgen/nested/skyscraper_nested.json b/data/json/mapgen/nested/skyscraper_nested.json
index 8112bada9f6d3..ba58c097c6cc2 100644
--- a/data/json/mapgen/nested/skyscraper_nested.json
+++ b/data/json/mapgen/nested/skyscraper_nested.json
@@ -493,13 +493,13 @@
         "-": "t_wall_w",
         "|": "t_wall_w",
         "#": "t_brick_wall",
-        "A": "t_atm",
         "s": "t_sidewalk",
         "d": "t_region_groundcover_forest",
         "G": "t_door_glass_c",
         "H": "t_wall_glass"
       },
       "furniture": {
+        "A": "f_atm_off",
         "^": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "$": "f_counter",
         "c": "f_counter",
@@ -587,13 +587,13 @@
         "-": "t_wall_w",
         "|": "t_wall_w",
         "#": "t_brick_wall",
-        "A": "t_atm",
         "s": "t_sidewalk",
         "d": "t_region_groundcover_forest",
         "G": "t_door_glass_c",
         "H": "t_wall_glass"
       },
       "furniture": {
+        "A": "f_atm_off",
         "^": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "$": "f_counter",
         "c": "f_counter",
diff --git a/data/json/mapgen/nested/strip_mall_nested.json b/data/json/mapgen/nested/strip_mall_nested.json
index cde697b5365b6..06b713bb1dce8 100644
--- a/data/json/mapgen/nested/strip_mall_nested.json
+++ b/data/json/mapgen/nested/strip_mall_nested.json
@@ -159,7 +159,6 @@
         "|": "t_brick_wall",
         "X": "t_door_metal_pickable",
         "#": "t_brick_wall",
-        "!": "t_atm",
         "L": "t_door_locked",
         "D": "t_door_c",
         "W": { "param": "laundromat_wall_type", "fallback": "t_wall" },
@@ -185,6 +184,7 @@
         "&": "t_linoleum_white"
       },
       "furniture": {
+        "!": "f_atm_off",
         ".": "f_null",
         "#": "f_sign",
         "$": "f_counter",
diff --git a/data/json/mapgen/post_office.json b/data/json/mapgen/post_office.json
index b19d2848c2baa..805642c56470a 100644
--- a/data/json/mapgen/post_office.json
+++ b/data/json/mapgen/post_office.json
@@ -47,10 +47,10 @@
         "s": "t_sidewalk",
         "w": "t_window_domestic",
         "|": "t_wall_w",
-        "3": "t_atm",
         "4": "t_gutter_downspout"
       },
       "furniture": {
+        "3": "f_atm_off",
         "#": "f_rack_wood",
         "@": "f_rack",
         "c": "f_counter",
diff --git a/data/json/mapgen/s_grocery.json b/data/json/mapgen/s_grocery.json
index 280c3772903ec..c706384e42374 100644
--- a/data/json/mapgen/s_grocery.json
+++ b/data/json/mapgen/s_grocery.json
@@ -38,7 +38,6 @@
         "+": "t_door_c",
         "-": "t_wall_w",
         "=": "t_wall_glass",
-        "A": "t_atm",
         "C": "t_thconc_floor",
         "I": "t_door_locked_interior",
         "L": "t_door_locked",
@@ -56,6 +55,7 @@
         "|": "t_wall_w"
       },
       "furniture": {
+        "A": "f_atm_off",
         "#": "f_counter",
         "7": "f_bookcase",
         "C": "f_crate_c",
@@ -326,7 +326,6 @@
         "+": "t_door_boarded",
         "-": "t_wall_w",
         "=": "t_wall_glass",
-        "A": "t_atm",
         "C": "t_thconc_floor",
         "I": "t_door_boarded",
         "L": "t_door_boarded",
@@ -345,6 +344,7 @@
         "Ю": "t_concrete"
       },
       "furniture": {
+        "A": "f_atm_off",
         "#": "f_counter",
         "7": "f_bookcase",
         "C": "f_crate_c",
diff --git a/data/json/mapgen/zoo.json b/data/json/mapgen/zoo.json
index 2248be87a72ec..192fa4d009f05 100644
--- a/data/json/mapgen/zoo.json
+++ b/data/json/mapgen/zoo.json
@@ -110,7 +110,6 @@
       ],
       "toilets": { "t": {  } },
       "terrain": {
-        "a": "t_atm",
         "b": "t_region_groundcover_urban",
         "c": "t_floor",
         "d": "t_thconc_floor",
@@ -173,6 +172,7 @@
         "_": "t_thconc_floor_no_roof"
       },
       "furniture": {
+        "a": "f_atm_off",
         "b": "f_boulder_small",
         "c": "f_counter",
         "d": "f_desk",
diff --git a/data/json/mapgen_palettes/farm_supply_palette.json b/data/json/mapgen_palettes/farm_supply_palette.json
index 4ad6057e483e9..cceba57071211 100644
--- a/data/json/mapgen_palettes/farm_supply_palette.json
+++ b/data/json/mapgen_palettes/farm_supply_palette.json
@@ -28,10 +28,10 @@
       "W": "t_window",
       "X": "t_window_bars",
       "|": "t_concrete_wall",
-      "O": "t_flat_roof",
-      "m": "t_atm"
+      "O": "t_flat_roof"
     },
     "furniture": {
+      "m": "f_atm_off",
       "b": "f_bench",
       "B": "f_bench",
       "V": "f_vending_c",
diff --git a/data/json/mapgen_palettes/gunstore.json b/data/json/mapgen_palettes/gunstore.json
index ce338dffb19ab..07f51c7fcea43 100644
--- a/data/json/mapgen_palettes/gunstore.json
+++ b/data/json/mapgen_palettes/gunstore.json
@@ -73,11 +73,11 @@
       "<": "t_stairs_up",
       ";": "t_gutter_downspout",
       "W": "t_strconc_wall",
-      "$": "t_atm",
       "Z": "t_bars",
       "I": { "param": "interior_wall_type", "fallback": "t_brick_wall" }
     },
     "furniture": {
+      "$": "f_atm_off",
       "C": "f_counter",
       "R": "f_counter",
       "3": "f_counter",
diff --git a/data/json/mapgen_palettes/lab_surface_palette.json b/data/json/mapgen_palettes/lab_surface_palette.json
index bc61914259197..b859def38cb29 100644
--- a/data/json/mapgen_palettes/lab_surface_palette.json
+++ b/data/json/mapgen_palettes/lab_surface_palette.json
@@ -27,13 +27,13 @@
       "]": "t_sidewalk",
       "*": "t_region_shrub_decorative",
       "?": [ "t_region_shrub_decorative", "t_region_tree_shade", "t_tree_dead_warped" ],
-      "A": "t_atm",
       "<": "t_stairs_up",
       ">": "t_stairs_down",
       "e": "t_elevator",
       "@": "t_elevator_control_off"
     },
     "furniture": {
+      "A": "f_atm_off",
       "&": "f_trashcan",
       "{": "f_glass_fridge",
       "1": [ "f_indoor_plant", "f_indoor_plant_y" ],
diff --git a/data/json/mapgen_palettes/movie_theater_palette.json b/data/json/mapgen_palettes/movie_theater_palette.json
index dd45976a07f25..1bca70b754eeb 100644
--- a/data/json/mapgen_palettes/movie_theater_palette.json
+++ b/data/json/mapgen_palettes/movie_theater_palette.json
@@ -3,6 +3,7 @@
     "type": "palette",
     "id": "movie_theater_palette.json",
     "furniture": {
+      "a": "f_atm_off",
       "T": "f_counter",
       "f": "f_counter",
       "&": "f_toilet",
@@ -49,7 +50,6 @@
       "^": "t_door_glass_c",
       "D": "t_door_metal_pickable",
       "d": "t_door_locked",
-      "a": "t_atm",
       "w": "t_window",
       "-": "t_railing_h",
       "R": "t_railing_h",
diff --git a/data/json/mapgen_palettes/private_resort.json b/data/json/mapgen_palettes/private_resort.json
index c05a0acccf7a6..b3468020ee08d 100644
--- a/data/json/mapgen_palettes/private_resort.json
+++ b/data/json/mapgen_palettes/private_resort.json
@@ -66,6 +66,7 @@
     "id": "p_resort_palette_main_floor",
     "palettes": [ "p_resort_palette_main" ],
     "furniture": {
+      "A": "f_atm_off",
       "d": "f_dishwasher",
       "{": "f_cupboard",
       "g": "f_dumpster",
@@ -109,7 +110,6 @@
       "n": "t_carpet_green",
       "q": "t_window_bars",
       "Q": "t_window_stained_red",
-      "A": "t_atm",
       "@": "t_slot_machine",
       "9": "t_carpet_red",
       "C": "t_carpet_red",
diff --git a/data/json/mapgen_palettes/stadium_palette.json b/data/json/mapgen_palettes/stadium_palette.json
index b27f1ba552dc6..fd160dde5febf 100644
--- a/data/json/mapgen_palettes/stadium_palette.json
+++ b/data/json/mapgen_palettes/stadium_palette.json
@@ -73,7 +73,6 @@
       "R": "t_concrete_railing",
       "!": "t_ticket_vendor",
       "i": "t_ticket_machine",
-      "$": "t_atm",
       "-": "t_gate_metal_c",
       "<": "t_stairs_up",
       ">": "t_stairs_down",
@@ -83,6 +82,7 @@
     },
     "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
     "furniture": {
+      "$": "f_atm_off",
       "z": "f_water_heater_family",
       "b": "f_metal_bench",
       "B": "f_bench",
diff --git a/data/json/mapgen_palettes/subway.json b/data/json/mapgen_palettes/subway.json
index a6c5441c67c2f..6f01219ea5bb3 100644
--- a/data/json/mapgen_palettes/subway.json
+++ b/data/json/mapgen_palettes/subway.json
@@ -52,11 +52,10 @@
       "~": "t_laminated_glass",
       "z": "t_fence_metal",
       "Z": "t_gate_metal_c",
-      "A": "t_atm",
       "T": "t_ticket_vendor",
       "s": "t_ticket_machine"
     },
-    "furniture": { "&": "f_trashcan", "b": "f_bench", "Q": "f_desk", "c": "f_chair", "N": "f_rack" },
+    "furniture": { "A": "f_atm_off", "&": "f_trashcan", "b": "f_bench", "Q": "f_desk", "c": "f_chair", "N": "f_rack" },
     "signs": { "M": { "signage": "Subway Map: <city> stop" } },
     "items": {
       "N": { "item": "tools_construction", "chance": 90, "repeat": 3 },
diff --git a/data/json/obsoletion_and_migration_0.I/obsolete_furniture.json b/data/json/obsoletion_and_migration_0.I/obsolete_furniture.json
index 2662811117fc4..c1933637a21a7 100644
--- a/data/json/obsoletion_and_migration_0.I/obsolete_furniture.json
+++ b/data/json/obsoletion_and_migration_0.I/obsolete_furniture.json
@@ -87,5 +87,10 @@
     "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN", "GROWTH_SEEDLING" ],
     "bash": { "str_min": 6, "str_max": 10, "sound": "crunch.", "sound_fail": "whish." },
     "plant_data": { "transform": "f_mutant_tree_sapling", "base": "f_null" }
+  },
+  {
+    "type": "ter_furn_migration",
+    "from_ter": "t_atm",
+    "to_furn": "f_atm_off"
   }
 ]
diff --git a/data/mods/Aftershock/maps/mapgen/general_store.json b/data/mods/Aftershock/maps/mapgen/general_store.json
index 173b9fc0cf3e0..0e65e7fb08042 100644
--- a/data/mods/Aftershock/maps/mapgen/general_store.json
+++ b/data/mods/Aftershock/maps/mapgen/general_store.json
@@ -32,9 +32,10 @@
         "                        "
       ],
       "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing" ],
-      "terrain": { "1": "t_door_metal_locked", "5": "t_atm" },
+      "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": {
+        "5": "f_atm",
         "â": "f_bookcase",
         "á": "f_display_fridge",
         "ä": "f_rack",
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 1be96a83e810f..458f92c2a9988 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
@@ -37,8 +37,7 @@
         "afs_habitat_residential_furnishing",
         "afs_habblock_1_paramter_palette"
       ],
-      "terrain": { "3": "t_atm" },
-      "furniture": { "1": "f_washer", "2": "f_dryer" },
+      "furniture": { "1": "f_washer", "2": "f_dryer", "3": "f_atm" },
       "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true } },
       "place_nested": [
         { "chunks": [ { "param": "variant", "fallback": "afs_habblock_1_slot1_cafe_a1" } ], "x": 0, "y": 0 },
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 349b2c278ace4..f13a52a4a7531 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
@@ -37,8 +37,8 @@
         "afs_habitat_residential_furnishing",
         "afs_habblock_3_paramter_palette"
       ],
-      "terrain": { "5": "t_atm" },
       "furniture": {
+        "5": "f_atm",
         "1": "f_arcade_machine",
         "3": "f_washer",
         "4": "f_dryer",
diff --git a/data/mods/Aftershock/maps/mapgen/port_augustmoon/port_augustmoon_main.json b/data/mods/Aftershock/maps/mapgen/port_augustmoon/port_augustmoon_main.json
index 33bc1eb71923f..55d2e409e6c05 100644
--- a/data/mods/Aftershock/maps/mapgen/port_augustmoon/port_augustmoon_main.json
+++ b/data/mods/Aftershock/maps/mapgen/port_augustmoon/port_augustmoon_main.json
@@ -76,7 +76,6 @@
         "=": "t_afs_augustmoon_diamond_glass",
         "w": "t_carpet_metal_red",
         "|": "t_afs_augustmoon_hull_wall",
-        "ò": "t_atm",
         "1": "t_underbrush",
         "2": "t_nanofab_body",
         "3": "t_nanofab",
@@ -84,6 +83,7 @@
         "6": "t_elevator"
       },
       "furniture": {
+        "ò": "f_atm",
         "0": "f_cryo_pod",
         "4": "f_mil_comms_sat",
         "7": "f_autodoc",
diff --git a/data/mods/Aftershock/maps/mapgen/s_gas.json b/data/mods/Aftershock/maps/mapgen/s_gas.json
index e3da815305915..3293b36bdc5e8 100644
--- a/data/mods/Aftershock/maps/mapgen/s_gas.json
+++ b/data/mods/Aftershock/maps/mapgen/s_gas.json
@@ -37,8 +37,7 @@
         { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 0, 2 ], "repeat": [ 8, 10 ] },
         { "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 0, 4 ], "repeat": [ 8, 2 ] }
       ],
-      "terrain": { "T": "t_atm" },
-      "furniture": { "V": "f_vending_reinforced", "k": "f_rack" },
+      "furniture": { "V": "f_vending_reinforced", "k": "f_rack", "T": "f_atm" },
       "toilets": { "&": {  } },
       "gaspumps": { "G": {  } },
       "items": {
diff --git a/data/mods/No_Hope/mapgen_palettes/other_palettes.json b/data/mods/No_Hope/mapgen_palettes/other_palettes.json
index bb1f5d9a50830..e801aef1457ef 100644
--- a/data/mods/No_Hope/mapgen_palettes/other_palettes.json
+++ b/data/mods/No_Hope/mapgen_palettes/other_palettes.json
@@ -932,10 +932,10 @@
       "<": "t_stairs_up",
       ";": "t_gutter_downspout",
       "W": "t_strconc_wall",
-      "$": "t_atm",
       "Z": "t_bars"
     },
     "furniture": {
+      "$": "f_atm_off",
       "C": "f_counter",
       "3": "f_counter",
       "R": "f_counter",
diff --git a/lang/string_extractor/parser.py b/lang/string_extractor/parser.py
index db2099f258c3a..55fa013f3171e 100644
--- a/lang/string_extractor/parser.py
+++ b/lang/string_extractor/parser.py
@@ -241,6 +241,7 @@ def dummy_parser(json, origin):
     "temperature_removal_blacklist": dummy_parser,
     "ter_furn_transform": parse_ter_furn_transform,
     "terrain": parse_terrain,
+    "ter_furn_migration": dummy_parser,
     "trait_blacklist": dummy_parser,
     "trait_group": dummy_parser,
     "trait_migration": dummy_parser,
@@ -263,5 +264,5 @@ def dummy_parser(json, origin):
     "weapon_category": parse_weapon_category,
     "weather_type": parse_weather_type,
     "wheel": parse_generic,
-    "widget": parse_widget
+    "widget": parse_widget,
 }