From e20f07c10fcdec6a7f3f697d63919a384aa6ad3b Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Fri, 13 Sep 2024 08:58:01 +0200
Subject: [PATCH] Kill vending machines vol 2 (#18)

* Replace manually placed vending machines with vendingmachines syntax

* Lint

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 data/json/mapgen/Metalworker.json             |  6 +--
 .../mapgen/airport/s_airport_private.json     |  6 +--
 data/json/mapgen/arcade.json                  | 15 ++-----
 data/json/mapgen/boxing.json                  |  2 +-
 data/json/mapgen/cs_internet_cafe.json        | 15 +------
 data/json/mapgen/cs_tire_shop.json            | 12 +++---
 .../fortified_scrap_yard.json                 |  6 +--
 data/json/mapgen/gambling_hall.json           | 16 +++++---
 data/json/mapgen/garage_gas.json              |  9 ++--
 data/json/mapgen/gym.json                     |  4 +-
 .../homeimprovement_superstore_new.json       |  3 +-
 data/json/mapgen/lan_center.json              | 13 +++---
 data/json/mapgen/laundromat.json              |  9 ++--
 data/json/mapgen/motel.json                   |  2 +-
 data/json/mapgen/nested/retail_nested.json    | 10 -----
 data/json/mapgen/office_small.json            |  2 +-
 data/json/mapgen/police_station.json          | 10 ++---
 data/json/mapgen/pool.json                    | 10 +++--
 data/json/mapgen/post_office.json             |  2 +-
 data/json/mapgen/s_coffee.json                |  2 +-
 data/json/mapgen/s_icecream.json              |  6 +--
 data/json/mapgen/s_lightindustry.json         | 10 ++---
 data/json/mapgen/s_lightindustry_scen.json    | 10 ++---
 data/json/mapgen/smallscrapyard.json          | 41 +++++++++----------
 data/json/mapgen/storage_units_small.json     |  2 +-
 data/json/mapgen/store/s_camping.json         |  6 +--
 data/json/mapgen/store/s_cardealer.json       |  3 +-
 data/json/mapgen_palettes/church_retreat.json |  2 +-
 .../mapgen_palettes/farm_supply_palette.json  |  2 +-
 .../mapgen_palettes/hotel_tower_palette.json  |  2 -
 .../mapgen_palettes/junkyard_palette.json     |  5 +--
 data/json/mapgen_palettes/karting_l.json      |  2 -
 .../lab/lab_modular_palette.json              | 19 +++------
 data/json/mapgen_palettes/mall_palette.json   |  2 +-
 .../movie_theater_palette.json                |  3 +-
 data/json/mapgen_palettes/park_palette.json   |  2 +-
 data/json/mapgen_palettes/refugee_center.json |  2 +-
 .../mapgen_palettes/steel_mill_palette.json   |  2 -
 .../mapgen_palettes/textile_mill_museum.json  |  2 -
 data/mods/Aftershock/maps/crashing_ship.json  |  3 +-
 data/mods/Aftershock/maps/mapgen/s_gas.json   | 20 ++++++---
 data/mods/Backrooms/palettes.json             |  3 +-
 data/mods/DinoMod/mapgen/zoo.json             | 32 ++++++---------
 .../skyscraper_lab_palette.json               | 11 +++--
 .../mapgen_palettes/necropolis_palettes.json  |  6 +--
 .../mapgen_palettes/other_palettes.json       |  5 +--
 46 files changed, 143 insertions(+), 214 deletions(-)

diff --git a/data/json/mapgen/Metalworker.json b/data/json/mapgen/Metalworker.json
index 9bc5c99a69ebf..a927a92907779 100644
--- a/data/json/mapgen/Metalworker.json
+++ b/data/json/mapgen/Metalworker.json
@@ -14,7 +14,7 @@
         "_8__________+..kh..N|_8_",
         "_8__________-b.kk.||||8_",
         "_8________s_|b....|.t|8_",
-        "_8__|=====%||N....+.S|8_",
+        "_8__|=====%||n....+.S|8_",
         "_8__|.....sLLR...|||||8_",
         "_8__|..............q|<8_",
         "_8__|..........Q...Y|_8_",
@@ -63,7 +63,6 @@
         "L": "f_locker",
         "R": "f_trashcan",
         "Y": "f_forge_rock",
-        "N": "f_vending_c",
         "Q": "f_rack",
         "q": "f_crate_c",
         "U": "f_dumpster",
@@ -72,11 +71,10 @@
         "b": "f_bench"
       },
       "toilets": { "t": {  } },
+      "vendingmachines": { "N": { "item_group": "vending_drink", "lootable": true }, "n": { "item_group": "vending_food", "lootable": true } },
       "place_items": [
         { "item": "car_misc", "x": [ 15, 15 ], "y": [ 3, 5 ], "chance": 70, "repeat": [ 2, 10 ] },
         { "item": "car_misc", "x": [ 16, 16 ], "y": [ 5, 5 ], "chance": 70 },
-        { "item": "vending_food_items", "x": [ 19, 19 ], "y": [ 4, 4 ], "chance": 70, "repeat": [ 4, 12 ] },
-        { "item": "vending_drink_items", "x": [ 13, 13 ], "y": [ 7, 7 ], "chance": 70, "repeat": [ 4, 12 ] },
         { "item": "softdrugs", "x": [ 19, 20 ], "y": [ 6, 7 ], "chance": 20, "repeat": [ 2, 4 ] },
         { "item": "trash", "x": [ 13, 13 ], "y": [ 8, 8 ], "chance": 70 },
         { "item": "trash", "x": [ 3, 3 ], "y": [ 15, 16 ], "chance": 70 },
diff --git a/data/json/mapgen/airport/s_airport_private.json b/data/json/mapgen/airport/s_airport_private.json
index 1d91467dd6049..b8095d8aac897 100644
--- a/data/json/mapgen/airport/s_airport_private.json
+++ b/data/json/mapgen/airport/s_airport_private.json
@@ -12,7 +12,7 @@
         "s______________________s#~d~~~+ ;;;E;;E; ##++##ss_______s+;;<;#s|QQQQQ|...____________________..",
         "s______________________s#~d~~~# d;;h;;h; #   l#.s_______s#I;;j#s|QQQQQ|..a&_______a..a&_______a.",
         "sbbbbbb__________bbbbbbs#~e~~m# d;;h;;h;p# ;; o.s_______s#I;;j#s|QQQQQ|..aa======aa..aa======aa.",
-        "s______________________s#~e~~m# d;;h;;h;p# ;; #.sqq_____s###+##s||QQQ||..a&~~~~~~~a^.a&~~~~~~~a^",
+        "s______________________s#~e~~m# d;;h;;h;P# ;; #.sqq_____s###+##s||QQQ||..a&~~~~~~~a^.a&~~~~~~~a^",
         "s______________________s#~d~mm# d;;h;;h;   ;; #.sqq_____s^#;;;#s3|||||...a~~~~~~~fa..a~~~~~~~~a.",
         "s______________________s#~ddddedd;;h;;h;;;;;; #.sqq_____s.#jjj#s3........a~~~~~~~fa..a~~~~~~~~a.",
         "s______________________s#~~~~~# ;;;;;;;;;;;;; o.sss_____s.#####s3..|||...a~~~~~~~~a..a~~~~~~~~a.",
@@ -85,11 +85,11 @@
         "l": "f_trashcan",
         "E": "f_trashcan",
         "m": "f_crate_c",
-        "p": "f_vending_c",
         "t": "f_locker",
         "u": "f_indoor_plant"
       },
       "gaspumps": { "1": {  } },
+      "vendingmachines": { "p": { "item_group": "vending_drink", "lootable": true }, "P": { "item_group": "vending_food", "lootable": true } },
       "place_loot": [
         { "group": "road", "chance": 50, "repeat": 4, "x": [ 1, 22 ], "y": [ 1, 19 ] },
         { "group": "allclothes", "chance": 80, "repeat": [ 10 ], "x": 29, "y": [ 5, 6 ] },
@@ -108,8 +108,6 @@
         { "group": "bar_trash", "chance": 50, "repeat": 5, "x": 35, "y": 3 },
         { "group": "bar_trash", "chance": 50, "repeat": 5, "x": 39, "y": 11 },
         { "group": "office", "chance": 50, "repeat": 5, "x": 33, "y": [ 10, 14 ] },
-        { "group": "vending_food", "chance": 80, "repeat": 1, "x": 40, "y": 5 },
-        { "group": "vending_drink", "chance": 80, "repeat": 1, "x": 40, "y": 6 },
         { "group": "road", "chance": 50, "repeat": 10, "x": [ 75, 80 ], "y": [ 7, 20 ] },
         { "group": "road", "chance": 50, "repeat": 10, "x": [ 87, 92 ], "y": [ 7, 20 ] },
         { "group": "avgas_barrel", "chance": 50, "repeat": 5, "x": [ 75, 80 ], "y": [ 7, 20 ] },
diff --git a/data/json/mapgen/arcade.json b/data/json/mapgen/arcade.json
index a80b00ab0e0fb..c798cd0241455 100644
--- a/data/json/mapgen/arcade.json
+++ b/data/json/mapgen/arcade.json
@@ -20,7 +20,7 @@
         ".ssssssssssssssssssssss.",
         ".ssssssssssssssssssssss.",
         ".ssssssssssssssssssssss.",
-        ".ssssssssssssssssssllss.",
+        ".sssssssssssssssssslmss.",
         ".|---++-OOO-++----|---|.",
         ".|F               |S %|.",
         ".|F               |-+-|.",
@@ -52,19 +52,10 @@
         "4": "t_gutter_downspout",
         "|": "t_wall_r"
       },
-      "furniture": {
-        "#": "f_counter",
-        "F": "f_arcade_machine",
-        "S": "f_sink",
-        "B": "f_stool",
-        "T": "f_locker",
-        "l": "f_vending_c",
-        "x": "f_pinball_machine"
-      },
+      "furniture": { "#": "f_counter", "F": "f_arcade_machine", "S": "f_sink", "B": "f_stool", "T": "f_locker", "x": "f_pinball_machine" },
       "toilets": { "%": {  } },
+      "vendingmachines": { "l": { "item_group": "vending_drink", "lootable": true }, "m": { "item_group": "vending_food", "lootable": true } },
       "place_items": [
-        { "item": "vending_drink", "x": 19, "y": 8, "chance": 75 },
-        { "item": "vending_food", "x": 20, "y": 8, "chance": 75 },
         { "item": "arcade_prizes", "x": 21, "y": [ 14, 18 ], "chance": 95 },
         { "item": "cash_register_random", "x": 18, "y": [ 14, 17 ], "chance": 100 }
       ],
diff --git a/data/json/mapgen/boxing.json b/data/json/mapgen/boxing.json
index 5b48e9699f3c0..da2ae9aa894b2 100644
--- a/data/json/mapgen/boxing.json
+++ b/data/json/mapgen/boxing.json
@@ -63,13 +63,13 @@
         "i": "f_sink",
         "L": "f_locker",
         "S": "f_shower",
-        "V": "f_vending_c",
         "X": "f_rack",
         "Z": "f_bookcase",
         "^": "f_indoor_plant",
         "f": "f_trashcan"
       },
       "toilets": { "T": {  } },
+      "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true } },
       "place_items": [
         { "item": "boxing_clothes", "x": [ 3, 11 ], "y": [ 18, 18 ], "chance": 80, "repeat": [ 3, 5 ] },
         { "item": "boxing_clothes", "x": [ 3, 11 ], "y": [ 18, 18 ], "chance": 40, "repeat": [ 1, 2 ] },
diff --git a/data/json/mapgen/cs_internet_cafe.json b/data/json/mapgen/cs_internet_cafe.json
index 720663d653dff..647fc694b88cf 100644
--- a/data/json/mapgen/cs_internet_cafe.json
+++ b/data/json/mapgen/cs_internet_cafe.json
@@ -53,28 +53,17 @@
         "C": "f_counter",
         "t": "f_toilet",
         "h": "f_chair",
-        "V": "f_vending_c",
         "S": "f_sink",
         "L": "f_locker"
       },
       "toilets": { "t": { "//": "no values needed here" } },
+      "vendingmachines": { "V": { "item_group": "ic_merch_vending", "lootable": true } },
       "items": {
         "c": { "item": "ic_merch", "chance": 20 },
         "C": { "item": "cash_register_random", "chance": 100 },
-        "V": { "item": "ic_merch_vending", "chance": 100 },
         "L": { "item": "cleaning", "chance": 100 }
       },
-      "add": [ { "item": "mop", "x": [ 11, 12 ], "y": [ 17, 20 ], "chance": 2 } ],
-      "place_items": [
-        { "item": "ic_merch_vending", "x": 3, "y": 7, "chance": 90 },
-        { "item": "ic_merch_vending", "x": 3, "y": 7, "chance": 90 },
-        { "item": "ic_merch_vending", "x": 3, "y": 7, "chance": 90 },
-        { "item": "ic_merch_vending", "x": 3, "y": 7, "chance": 90 },
-        { "item": "ic_merch_vending", "x": 3, "y": 8, "chance": 90 },
-        { "item": "ic_merch_vending", "x": 3, "y": 8, "chance": 90 },
-        { "item": "ic_merch_vending", "x": 3, "y": 8, "chance": 90 },
-        { "item": "ic_merch_vending", "x": 3, "y": 8, "chance": 90 }
-      ]
+      "add": [ { "item": "mop", "x": [ 11, 12 ], "y": [ 17, 20 ], "chance": 2 } ]
     }
   },
   {
diff --git a/data/json/mapgen/cs_tire_shop.json b/data/json/mapgen/cs_tire_shop.json
index 901e0a829188f..9ddba814e56e9 100644
--- a/data/json/mapgen/cs_tire_shop.json
+++ b/data/json/mapgen/cs_tire_shop.json
@@ -60,12 +60,14 @@
         "S": "f_sink",
         "r": "f_rack",
         "m": "f_manual_tire_changer",
-        "v": "f_vending_c",
-        "V": "f_vending_c",
         "t": "f_table",
         "u": "f_dumpster",
         "x": "f_recycle_bin"
       },
+      "vendingmachines": {
+        "V": { "item_group": "vending_food_items", "lootable": true },
+        "v": { "item_group": "vending_drink_items", "lootable": true }
+      },
       "place_vehicles": [ { "vehicle": "oa_vg_ts_vehicles", "x": 15, "y": 10, "rotation": 270, "chance": 50, "fuel": 10 } ],
       "items": {
         "h": { "item": "oa_discarded_news", "chance": 15, "repeat": [ 2, 8 ] },
@@ -75,11 +77,7 @@
         "A": { "item": "tools_tire", "chance": 100, "repeat": [ 3, 7 ] },
         "C": { "item": "oa_ig_ts_crates", "chance": 50 }
       },
-      "place_loot": [
-        { "group": "vending_food_items", "chance": 60, "repeat": [ 3, 12 ], "x": 13, "y": 18 },
-        { "group": "vending_drink_items", "chance": 60, "repeat": [ 3, 12 ], "x": 14, "y": 18 },
-        { "group": "cash_register_random", "x": 6, "y": 18 }
-      ],
+      "place_loot": [ { "group": "cash_register_random", "x": 6, "y": 18 } ],
       "add": [ { "item": "microwave", "x": 16, "y": 18, "chance": 2 }, { "item": "coffeemaker", "x": 16, "y": 19, "chance": 2 } ],
       "toilets": { "T": {  } },
       "place_signs": [ { "signage": "Discount Tires", "x": 22, "y": 1 } ]
diff --git a/data/json/mapgen/fortified_scrap_yard/fortified_scrap_yard.json b/data/json/mapgen/fortified_scrap_yard/fortified_scrap_yard.json
index 51bf5ce2facd8..0dadff1defe47 100644
--- a/data/json/mapgen/fortified_scrap_yard/fortified_scrap_yard.json
+++ b/data/json/mapgen/fortified_scrap_yard/fortified_scrap_yard.json
@@ -77,7 +77,7 @@
         "9": "f_console_broken",
         "B": "f_bathtub",
         "D": "f_dumpster",
-        "V": "f_vending_o",
+        "V": [ "f_vending_o", "f_vending_c_off" ],
         "a": "f_counter",
         "d": "f_chair",
         "H": "f_chair",
@@ -90,9 +90,9 @@
         "l": "f_locker",
         "o": "f_oven",
         "r": "f_rack",
-        "v": "f_vending_c",
+        "v": [ "f_vending_o", "f_vending_c_off" ],
         "w": "f_wreckage",
-        "{": "f_vending_o",
+        "{": [ "f_vending_o", "f_vending_c_off" ],
         "^": "f_desk",
         "(": "f_makeshift_bed",
         "T": "f_toilet",
diff --git a/data/json/mapgen/gambling_hall.json b/data/json/mapgen/gambling_hall.json
index c19243d288269..437b2953271d4 100644
--- a/data/json/mapgen/gambling_hall.json
+++ b/data/json/mapgen/gambling_hall.json
@@ -12,7 +12,7 @@
         "|||||||||.......||----||",
         "|#.....^||-+-+-||#t##t#|",
         "|..............v|#t##t#|",
-        "|#.pp..........v|......|",
+        "|#.pp..........V|......|",
         "|..pp...66.....&|#t..#t|",
         "|..pp...66......|#t..#t|",
         "|....................#t|",
@@ -72,13 +72,15 @@
         "p": "f_pool_table",
         "r": "f_rack",
         "t": "f_table",
-        "v": "f_vending_c",
         "{": "f_locker",
         "S": "f_sink"
       },
+      "vendingmachines": {
+        "v": { "item_group": "vending_drink_items", "lootable": true },
+        "V": { "item_group": "vending_food_items", "lootable": true }
+      },
       "place_items": [
         { "chance": 15, "item": "bags", "x": 5, "y": 9 },
-        { "chance": 65, "item": "vending_drink_items", "x": 15, "y": 5 },
         { "chance": 45, "item": "dining", "x": 22, "y": 7 },
         { "chance": 45, "item": "dining", "x": 18, "y": 4 },
         { "chance": 55, "item": "fridge", "x": [ 21, 22 ], "y": 20 },
@@ -96,7 +98,6 @@
         { "chance": 65, "item": "cannedfood", "x": 14, "y": 19 },
         { "chance": 65, "item": "cannedfood", "x": 13, "y": 19 },
         { "chance": 65, "item": "kitchen", "x": [ 19, 20 ], "y": 17 },
-        { "chance": 65, "item": "vending_food_items", "x": 15, "y": 4 },
         { "chance": 25, "item": "trash_cart", "x": 1, "y": 17 },
         { "chance": 25, "item": "trash_cart", "x": 8, "y": 15 },
         { "chance": 25, "item": "trash_cart", "x": 13, "y": 13 },
@@ -209,7 +210,7 @@
         "    |+-+|               ",
         "    -...-  9999999999   ",
         "  |||...||||||||||||||| ",
-        "  |a....{{.#t#....#.&^| ",
+        "  |a....{}.#t#....#.&^| ",
         "  |^..................| ",
         "  |a.......#t#...ppp..| ",
         "  |&.............ppp..| ",
@@ -259,9 +260,12 @@
         "l": "f_locker",
         "p": "f_pool_table",
         "t": "f_table",
-        "{": "f_vending_c",
         "S": "f_sink"
       },
+      "vendingmachines": {
+        "{": { "item_group": "vending_drink_items", "lootable": true },
+        "}": { "item_group": "vending_food_items", "lootable": true }
+      },
       "place_items": [
         { "chance": 45, "item": "cubical_office", "x": 18, "y": 21 },
         { "chance": 45, "item": "jackets", "x": 18, "y": 20 },
diff --git a/data/json/mapgen/garage_gas.json b/data/json/mapgen/garage_gas.json
index 7b83b8dedc0d9..44fb723d4fefb 100644
--- a/data/json/mapgen/garage_gas.json
+++ b/data/json/mapgen/garage_gas.json
@@ -13,7 +13,7 @@
         "ss__________________________________________________________s...........",
         "ss_________________________________________________________ss...........",
         "ss_____________________ssssssssssssss__________s__________sss...........",
-        "ss___________|________ssssssssssssllse________sss________esssss.........",
+        "ss___________|________sssssssssssslLse________sss________esssss.........",
         "ss___________&________sss|-www-www-|--========---========---|sssss......",
         "ss___________|________ssswrrrr rrrr| e                   e  |ssssss.....",
         "ss___________s________sssw         [           |           r|---|ss.....",
@@ -50,6 +50,7 @@
         "_": "t_pavement",
         "e": "t_gates_mech_control",
         "l": "t_sidewalk",
+        "L": "t_sidewalk",
         "s": "t_sidewalk",
         "&": "t_sidewalk",
         "D": "t_sidewalk",
@@ -63,7 +64,6 @@
         "c": "f_counter",
         "h": "f_chair",
         "k": "f_desk",
-        "l": "f_vending_c",
         "o": "f_bookcase",
         "r": "f_rack",
         "z": "f_crate_c",
@@ -71,10 +71,7 @@
       },
       "gaspumps": { "&": {  } },
       "toilets": { "t": {  } },
-      "place_vendingmachines": [
-        { "item_group": "vending_food", "x": 31, "y": 6, "lootable": true },
-        { "item_group": "vending_drink", "x": 32, "y": 6, "lootable": true }
-      ],
+      "vendingmachines": { "L": { "item_group": "vending_drink", "lootable": true }, "l": { "item_group": "vending_food", "lootable": true } },
       "place_loot": [
         { "group": "magazines", "x": 26, "y": 10, "chance": 80, "repeat": [ 4, 12 ] },
         { "group": "magazines", "x": 26, "y": 13, "chance": 80, "repeat": [ 4, 12 ] },
diff --git a/data/json/mapgen/gym.json b/data/json/mapgen/gym.json
index c38a28b122f9b..789c4654d25c1 100644
--- a/data/json/mapgen/gym.json
+++ b/data/json/mapgen/gym.json
@@ -181,7 +181,6 @@
         "!": [ "f_ergometer", "f_ergometer_mechanical" ],
         "{": "f_bigmirror",
         "#": "f_counter",
-        "H": "f_vending_c",
         "&": "f_counter",
         "*": "f_shower",
         "@": [ "f_treadmill", "f_treadmill_mechanical" ],
@@ -192,12 +191,13 @@
         "T": "f_toilet",
         "t": "f_sink"
       },
+      "vendingmachines": { "H": { "item_group": "vending_drink", "lootable": true } },
       "place_monster": [
         { "group": "GROUP_SEARCH_FITNESS", "x": [ 0, 23 ], "y": [ 0, 15 ], "chance": 75, "repeat": [ 3, 8 ] },
         { "group": "GROUP_MAPGEN_POOL", "x": [ 12, 19 ], "y": [ 18, 21 ], "chance": 75, "repeat": [ 2, 5 ] }
       ],
       "toilets": { "T": {  } },
-      "items": { "O": { "item": "gym", "chance": 80 }, "H": { "item": "vending_drink", "chance": 75, "repeat": [ 4, 8 ] } },
+      "items": { "O": { "item": "gym", "chance": 80 } },
       "place_loot": [ { "group": "cash_register_random", "x": [ 17, 19 ], "y": 2 } ]
     }
   },
diff --git a/data/json/mapgen/homeimprovement_superstore_new.json b/data/json/mapgen/homeimprovement_superstore_new.json
index 27e321bf34624..59c5396a3a0fd 100644
--- a/data/json/mapgen/homeimprovement_superstore_new.json
+++ b/data/json/mapgen/homeimprovement_superstore_new.json
@@ -63,7 +63,6 @@
     "furniture": {
       "$": "f_atm_off",
       "x": "f_console_broken",
-      "V": "f_vending_c",
       "h": "f_chair",
       "C": "f_chair",
       "T": "f_table",
@@ -206,7 +205,6 @@
         "d": { "item": "office", "chance": 45, "repeat": [ 1, 2 ] },
         "D": { "item": "hardware_trash", "chance": 40, "repeat": [ 1, 3 ] },
         "Q": { "item": "bed", "chance": 65, "repeat": [ 1, 2 ] },
-        "V": { "item": "vending_drink_home_impr", "chance": 85, "repeat": [ 5, 12 ] },
         "1": { "item": "paint", "chance": 80, "repeat": [ 1, 8 ] },
         "2": { "item": "rug", "chance": 80, "repeat": [ 1, 8 ] },
         "3": [
@@ -234,6 +232,7 @@
           { "item": "hardware_clothing", "chance": 55, "repeat": [ 1, 8 ] }
         ]
       },
+      "vendingmachines": { "V": { "item_group": "vending_drink_home_impr", "lootable": true } },
       "place_monster": [
         { "group": "GROUP_CIVILIAN", "x": [ 24, 45 ], "y": [ 2, 23 ], "repeat": [ 1, 3 ] },
         { "group": "GROUP_CIVILIAN", "x": [ 24, 45 ], "y": [ 24, 47 ], "repeat": [ 1, 3 ] },
diff --git a/data/json/mapgen/lan_center.json b/data/json/mapgen/lan_center.json
index 0b2b6e80ae3e1..d54594391f7bc 100644
--- a/data/json/mapgen/lan_center.json
+++ b/data/json/mapgen/lan_center.json
@@ -53,8 +53,6 @@
         "C": "f_counter",
         "H": "f_armchair",
         "c": "f_chair",
-        "v": "f_vending_c",
-        "W": "f_vending_c",
         "Y": "f_rack_coat",
         "{": "f_fridge",
         "I": "f_desk",
@@ -66,15 +64,17 @@
         "@": "f_sofa"
       },
       "toilets": { "T": {  } },
+      "vendingmachines": {
+        "v": { "item_group": "vending_drink_items", "lootable": true },
+        "W": { "item_group": "vending_food_items", "lootable": true }
+      },
       "items": {
         "Y": { "item": "coat_rack", "chance": 40, "repeat": 2 },
         "I": { "item": "office", "chance": 30 },
         "S": { "item": "office_paper", "chance": 30 },
         "R": { "item": "softdrugs", "chance": 30 },
         "U": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] },
-        "{": { "item": "fridge", "chance": 20, "repeat": [ 2, 4 ] },
-        "v": { "item": "vending_drink_items", "chance": 20, "repeat": [ 2, 4 ] },
-        "W": { "item": "vending_food_items", "chance": 20, "repeat": [ 2, 4 ] }
+        "{": { "item": "fridge", "chance": 20, "repeat": [ 2, 4 ] }
       }
     }
   },
@@ -185,13 +185,12 @@
         "f": "f_fridge",
         "Y": "f_rack_coat",
         "t": "f_toilet",
-        "v": "f_vending_c",
         "{": "f_glass_fridge"
       },
+      "vendingmachines": { "v": { "item_group": "vending_drink_items", "lootable": true } },
       "items": { "Y": { "item": "coat_rack", "chance": 40, "repeat": 2 } },
       "place_items": [
         { "chance": 45, "item": "fridge", "x": 20, "y": 20 },
-        { "chance": 50, "item": "vending_food_items", "x": 14, "y": 20 },
         { "chance": 15, "repeat": [ 1, 3 ], "item": "trash", "x": 19, "y": 15 },
         { "chance": 50, "item": "vending_drink_items", "x": 15, "y": 20 },
         { "chance": 50, "item": "vending_drink_items", "x": 16, "y": 20 }
diff --git a/data/json/mapgen/laundromat.json b/data/json/mapgen/laundromat.json
index 2c5af8b9a8d0a..83051ca988223 100644
--- a/data/json/mapgen/laundromat.json
+++ b/data/json/mapgen/laundromat.json
@@ -28,7 +28,7 @@
         "s|6................+lT|s",
         "s|6...rrrrrrrr.....||||s",
         "s|V...rrrrrrrr.....|lS|s",
-        "s|V................+lT|s",
+        "s|v................+lT|s",
         "s|||||||||||||++|||||||s",
         "ssssssssssssssssssssssss"
       ],
@@ -61,7 +61,6 @@
         "D": "f_dryer",
         "S": "f_sink",
         "T": "f_toilet",
-        "V": "f_vending_c",
         "W": "f_washer",
         "^": "f_indoor_plant",
         "c": "f_chair",
@@ -72,6 +71,7 @@
         "L": "f_standing_tank"
       },
       "toilets": { "T": {  } },
+      "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true }, "v": { "item_group": "vending_food", "lootable": true } },
       "place_items": [
         { "item": "trash", "x": 19, "y": 6, "chance": 80 },
         { "item": "behindcounter", "x": 4, "y": 8, "chance": 60 },
@@ -84,8 +84,6 @@
         { "item": "snacks", "x": [ 10, 11 ], "y": 8, "chance": 60, "repeat": [ 1, 2 ] },
         { "item": "laundromat_containers", "x": [ 9, 12 ], "y": 15, "chance": 60, "repeat": [ 1, 2 ] },
         { "item": "laundromat_bleach", "x": [ 6, 12 ], "y": [ 19, 20 ], "chance": 30, "repeat": [ 4, 8 ] },
-        { "item": "vending_drink", "x": 2, "y": 20, "chance": 75 },
-        { "item": "vending_food", "x": 2, "y": 21, "chance": 75 },
         { "item": "cash_register_random", "x": 5, "y": [ 6, 8 ], "chance": 100 }
       ],
       "place_vehicles": [
@@ -199,7 +197,6 @@
         "B": "f_stool",
         "D": "f_dryer",
         "S": "f_sink",
-        "V": "f_vending_c",
         "W": "f_washer",
         "^": "f_indoor_plant",
         "c": "f_chair",
@@ -208,13 +205,13 @@
         "H": "f_birdbath"
       },
       "toilets": { "T": {  } },
+      "vendingmachines": { "V": { "lootable": true } },
       "items": {
         "W": { "item": "laundry", "chance": 40, "repeat": [ 2, 3 ] },
         "D": { "item": "laundry", "chance": 25, "repeat": [ 1, 2 ] },
         "r": { "item": "laundromat_bleach", "chance": 30, "repeat": [ 4, 8 ] },
         "b": { "item": "magazines", "chance": 30, "repeat": [ 1, 2 ] },
         "}": { "item": "novels", "chance": 30, "repeat": [ 1, 2 ] },
-        "V": { "item": "vending_drink", "chance": 75, "repeat": [ 4, 8 ] },
         "%": { "item": "trash", "chance": 80 },
         "#": { "item": "behindcounter", "chance": 20 }
       },
diff --git a/data/json/mapgen/motel.json b/data/json/mapgen/motel.json
index e93c520f74ad6..68420212e0741 100644
--- a/data/json/mapgen/motel.json
+++ b/data/json/mapgen/motel.json
@@ -759,7 +759,7 @@
     "furniture": {
       "d": "f_dumpster",
       "r": "f_chair",
-      "V": "f_vending_o",
+      "V": [ "f_vending_o", "f_vending_c_off" ],
       "s": "f_sofa",
       "t": "f_table",
       "D": "f_dresser",
diff --git a/data/json/mapgen/nested/retail_nested.json b/data/json/mapgen/nested/retail_nested.json
index 739e2ebce4fe1..5dfe1ed92a0ba 100644
--- a/data/json/mapgen/nested/retail_nested.json
+++ b/data/json/mapgen/nested/retail_nested.json
@@ -1157,8 +1157,6 @@
         "b": "f_bench",
         "d": "f_filing_cabinet",
         "L": "f_shredder",
-        "D": "f_vending_c",
-        "F": "f_vending_c",
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ]
       },
@@ -1189,8 +1187,6 @@
         "G": "f_locker",
         "b": "f_bench",
         "d": "f_filing_cabinet",
-        "D": "f_vending_c",
-        "F": "f_vending_c",
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ]
       },
       "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
@@ -1218,8 +1214,6 @@
         "C": "f_rack",
         "G": "f_sofa",
         "d": "f_filing_cabinet",
-        "D": "f_vending_c",
-        "F": "f_vending_c",
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "?": "f_console_broken"
       },
@@ -1286,8 +1280,6 @@
         "b": "f_bench",
         "d": "f_filing_cabinet",
         "L": "f_shredder",
-        "D": "f_vending_c",
-        "F": "f_vending_c",
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ],
         "?": "f_console_broken"
@@ -1320,8 +1312,6 @@
         "C": "f_rack",
         "G": "f_locker",
         "d": "f_filing_cabinet",
-        "D": "f_vending_c",
-        "F": "f_vending_c",
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ]
       },
diff --git a/data/json/mapgen/office_small.json b/data/json/mapgen/office_small.json
index 4de59879a8e7e..b475ea59d2759 100644
--- a/data/json/mapgen/office_small.json
+++ b/data/json/mapgen/office_small.json
@@ -71,10 +71,10 @@
         "k": "f_dumpster",
         "s": "f_sofa",
         "t": "f_table",
-        "v": "f_vending_o",
         "{": "f_locker"
       },
       "toilets": { "T": {  } },
+      "vendingmachines": { "v": { "lootable": true } },
       "place_items": [
         { "item": "office", "x": 12, "y": 19, "chance": 50 },
         { "item": "office", "x": 8, "y": 17, "chance": 50 },
diff --git a/data/json/mapgen/police_station.json b/data/json/mapgen/police_station.json
index 454c5404adb5d..c931fc238c9c0 100644
--- a/data/json/mapgen/police_station.json
+++ b/data/json/mapgen/police_station.json
@@ -220,11 +220,13 @@
         "t": "f_trashcan",
         "d": "f_desk",
         "F": "f_filing_cabinet",
-        "D": "f_vending_c",
-        "U": "f_vending_c",
         "b": "f_bench",
         "/": "f_flagpole"
       },
+      "vendingmachines": {
+        "D": { "item_group": "vending_food_items", "lootable": true },
+        "U": { "item_group": "vending_drink_items", "lootable": true }
+      },
       "items": {
         "N": { "item": "bulletin_police", "chance": 50, "repeat": [ 1, 3 ] },
         ".": { "item": "badge_deputy", "chance": 5 },
@@ -236,9 +238,7 @@
         "}": { "item": "police_armory_any_assaultrifle", "chance": 90 },
         "[": { "item": "police_armory_any_pistol", "chance": 95 },
         "]": { "item": "police_armory_any_shotgun", "chance": 85 },
-        "L": { "item": "cop_evidence", "chance": 60 },
-        "D": { "item": "vending_food_items", "chance": 70, "repeat": [ 4, 12 ] },
-        "U": { "item": "vending_drink_items", "chance": 70, "repeat": [ 4, 12 ] }
+        "L": { "item": "cop_evidence", "chance": 60 }
       },
       "item": { "/": { "item": "american_flag" } },
       "toilets": { "&": {  } },
diff --git a/data/json/mapgen/pool.json b/data/json/mapgen/pool.json
index d75f5881f4d4d..aaf20de59a6c3 100644
--- a/data/json/mapgen/pool.json
+++ b/data/json/mapgen/pool.json
@@ -121,17 +121,19 @@
   {
     "method": "json",
     "object": {
-      "furniture": { "#": "f_bench", "&": "f_toilet", "S": "f_sink", "t": "f_trashcan", "v": "f_vending_c", "{": "f_locker" },
+      "furniture": { "#": "f_bench", "&": "f_toilet", "S": "f_sink", "t": "f_trashcan", "{": "f_locker" },
+      "vendingmachines": {
+        "v": { "item_group": "vending_food_items", "lootable": true },
+        "V": { "item_group": "vending_drink_items", "lootable": true }
+      },
       "place_items": [
         { "chance": 20, "repeat": 2, "item": "clothing_male", "x": 18, "y": 6 },
         { "chance": 20, "repeat": 2, "item": "clothing_male", "x": 19, "y": 6 },
         { "chance": 20, "repeat": 2, "item": "clothing_male", "x": 20, "y": 6 },
         { "chance": 25, "item": "male_underwear", "x": 21, "y": 6 },
         { "chance": 25, "item": "male_underwear", "x": 17, "y": 6 },
-        { "chance": 75, "repeat": 2, "item": "vending_drink_items", "x": 13, "y": 6 },
         { "chance": 25, "item": "female_underwear", "x": 6, "y": 6 },
         { "chance": 25, "item": "female_underwear", "x": 3, "y": 6 },
-        { "chance": 75, "repeat": 2, "item": "vending_food_items", "x": 10, "y": 6 },
         { "chance": 15, "item": "shoes", "x": 18, "y": 8 },
         { "chance": 15, "item": "shoes", "x": 6, "y": 8 },
         { "chance": 15, "item": "shoes", "x": 4, "y": 8 },
@@ -151,7 +153,7 @@
         " |&|&|StS|ffff|StS|&|&| ",
         " |+|+|fff+ffff+fff|+|+| ",
         " |fffffff|ffff|fffffff| ",
-        " |{{{{{ff|vffv|ff{{{{{| ",
+        " |{{{{{ff|vffV|ff{{{{{| ",
         " |||||||+||rr||+||||||| ",
         " -.####..........####4- ",
         " -....................- ",
diff --git a/data/json/mapgen/post_office.json b/data/json/mapgen/post_office.json
index 805642c56470a..a01b95b7bf392 100644
--- a/data/json/mapgen/post_office.json
+++ b/data/json/mapgen/post_office.json
@@ -70,12 +70,12 @@
         "f": "f_filing_cabinet",
         "K": "f_stool",
         "t": "f_table",
-        "v": "f_vending_c",
         "{": "f_locker",
         "/": "f_flagpole"
       },
       "vehicles": { "Á": { "vehicle": "parking_garage", "chance": 33, "rotation": 90 } },
       "toilets": { "T": {  } },
+      "vendingmachines": { "v": { "item_group": "vending_drink_items", "lootable": true } },
       "item": { "#": { "item": "greeting_card", "repeat": [ 10, 30 ] }, "/": { "item": "american_flag", "chance": 100 } },
       "items": {
         "X": [ { "item": "antique", "chance": 50 }, { "item": "art", "chance": 50 }, { "item": "jewelry_safe", "chance": 10 } ],
diff --git a/data/json/mapgen/s_coffee.json b/data/json/mapgen/s_coffee.json
index 3ef73e3f92386..7d880b5f3a5e3 100644
--- a/data/json/mapgen/s_coffee.json
+++ b/data/json/mapgen/s_coffee.json
@@ -347,7 +347,6 @@
         "o": "f_oven",
         "r": "f_rack",
         "t": "f_table",
-        "v": "f_vending_o",
         "{": [ "f_heavy_duty_fridge", "f_heavy_duty_freezer" ],
         "x": "f_counter"
       },
@@ -369,6 +368,7 @@
         "<": "t_ladder_up",
         "|": "t_wall_b"
       },
+      "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true } },
       "place_items": [
         { "chance": 80, "repeat": [ 1, 8 ], "item": "coffee_freezer", "x": [ 3, 4 ], "y": 4 },
         { "chance": 70, "repeat": [ 1, 8 ], "item": "coffee_display_2", "x": 7, "y": 13 },
diff --git a/data/json/mapgen/s_icecream.json b/data/json/mapgen/s_icecream.json
index 43d62a93a4896..dffe2af0af7df 100644
--- a/data/json/mapgen/s_icecream.json
+++ b/data/json/mapgen/s_icecream.json
@@ -20,7 +20,7 @@
         "  d__________________d  ",
         "  |w'||||___##__##___d  ",
         "  |cc-j.+___tt__tt__v|  ",
-        "  |..c..+___##__##__v|  ",
+        "  |..c..+___##__##__V|  ",
         "  |e.c..||||||||||||||  ",
         "  |..-..-T&-j{{{c&ccc|  ",
         "  |..-..g.c-.........|  ",
@@ -68,13 +68,11 @@
         "m": "f_table",
         "o": "f_oven",
         "t": "f_table",
-        "v": "f_vending_c",
         "{": "f_freezer"
       },
       "toilets": { "T": {  } },
+      "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true }, "v": { "item_group": "vending_food", "lootable": true } },
       "place_items": [
-        { "item": "vending_drink", "x": 20, "y": 13, "chance": 75, "repeat": [ 1, 4 ] },
-        { "item": "vending_food", "x": 20, "y": 12, "chance": 75, "repeat": [ 1, 4 ] },
         { "item": "clothing_work_gloves", "x": 20, "y": 20, "chance": 35 },
         { "item": "oven", "x": 12, "y": 17, "chance": 45 },
         { "item": "coffee_dishes", "x": 20, "y": 15, "chance": 25 },
diff --git a/data/json/mapgen/s_lightindustry.json b/data/json/mapgen/s_lightindustry.json
index 3902a7533442b..a1f4d5d694649 100644
--- a/data/json/mapgen/s_lightindustry.json
+++ b/data/json/mapgen/s_lightindustry.json
@@ -18,7 +18,7 @@
         "#!}}!:  h    h :!!!H#;;#U~~~~~~~U#~~~~d~~~~#ppp#",
         "#!!!!:         :NN!H#M;#U~~~~~~~U#dd&dd~~~~:;q;o",
         "#L!!!:r  hrh   )    ##+##ddddd&d##~~~~~~K~~:;;;#",
-        "#L!!L:rh  r   r:    zz #~~~~~~~~~#~~~~~~9~~:;;M#",
+        "#L!!L:rh  r   r:    zX #~~~~~~~~~#~~~~~~9~~:;;M#",
         "###)##B  P#P hr:       +~~`````~~~~~45~~5~~);;p#",
         "+             u#  B    #~~`~~~`~~~~~~~~~~~~:;qpo",
         "#::):#::):#::):#))#::):#~~`~~~`~~~~~52~~~~~#;;p#",
@@ -74,7 +74,7 @@
         "#r   -rrP-  u#hro=====w#CC~~~~`~~~`~~~o hhhh --#",
         "#--  -----  u# r#=====w#~~~~~~`~~~`~~~#       P#",
         "#rr  -rrP-  u#+##======+~~~~~~`````~~~+      hro",
-        "#Ph  - h -  B# zz======#~~~~~~~~~57~~~#       r#",
+        "#Ph  - h -  B# zX======#~~~~~~~~~57~~~#       r#",
         "or           +     #####d&d#~~~~~31~~~#B P ##+##",
         "#rh          +     #Y;j#Q~Q#~~~~~~~~~5##+# #B r#",
         "###+##P  #######   +;;k#Q~Q#~52~~~~~~2#;;# # hr#",
@@ -165,7 +165,6 @@
         "L": "f_bookcase",
         "w": "f_sofa",
         "H": "f_sofa",
-        "z": "f_vending_c",
         "Y": "f_trashcan",
         "y": "f_trashcan",
         "B": "f_trashcan",
@@ -179,6 +178,7 @@
         "C": "f_crate_c"
       },
       "toilets": { "j": {  } },
+      "vendingmachines": { "z": { "item_group": "vending_drink", "lootable": true }, "X": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "y": { "item": "trash", "chance": 30, "repeat": [ 2, 3 ] },
         "B": { "item": "trash", "chance": 30, "repeat": [ 2, 3 ] },
@@ -201,10 +201,6 @@
         "~": { "item": "vehicle_scrapped", "chance": 3 }
       },
       "place_loot": [
-        { "group": "vending_food", "chance": 80, "x": 15, "y": 64 },
-        { "group": "vending_drink", "chance": 80, "x": 16, "y": 64 },
-        { "group": "vending_food", "chance": 80, "x": 20, "y": 8 },
-        { "group": "vending_drink", "chance": 80, "x": 21, "y": 8 },
         { "group": "bar_trash", "chance": 50, "repeat": 2, "x": 11, "y": 70 },
         { "group": "tools_blacksmith", "chance": 60, "repeat": 4, "x": 26, "y": [ 68, 70 ] },
         { "group": "tools_mechanic", "chance": 60, "repeat": 2, "x": 26, "y": [ 66, 67 ] },
diff --git a/data/json/mapgen/s_lightindustry_scen.json b/data/json/mapgen/s_lightindustry_scen.json
index 03e2d6c71d0a9..22899a21a2be0 100644
--- a/data/json/mapgen/s_lightindustry_scen.json
+++ b/data/json/mapgen/s_lightindustry_scen.json
@@ -18,7 +18,7 @@
         "#!}}!:  h    h :!!!H#;;#U~~~~~~~U#~~~~d~~~~#ppp#",
         "#!!!!:         :NN!H#M;#U~~~~~~~U#dd&dd~~~~:;q;o",
         "#L!!!:r  hrh   )    ##+##ddddd&d##~~~~~~K~~:;;;#",
-        "#L!!L:rh  r   r:    zz #~~~~~~~~~#~~~~~~9~~:;;M#",
+        "#L!!L:rh  r   r:    zX #~~~~~~~~~#~~~~~~9~~:;;M#",
         "###)##B  P#P hr:       +~~`````~~~~~45~~5~~);;p#",
         "+             u#  B    #~~`~~~`~~~~~~~~~~~~:;qpo",
         "#::):#::):#::):#))#::):#~~`~~~`~~~~~52~~~~~#;;p#",
@@ -74,7 +74,7 @@
         "#r   -rrP-  u#hro=====w#CC~~~~`~~~`~~~o hhhh --#",
         "#--  -----  u# r#=====w#~~~~~~`~~~`~~~#       P#",
         "#rr  -rrP-  u#+##======+~~~~~~`````~~~+      hro",
-        "#Ph  - h -  B# zz======#~~~~~~~~~57~~~#       r#",
+        "#Ph  - h -  B# Xz======#~~~~~~~~~57~~~#       r#",
         "or           +     #####d&d#~~~~~31~~~#B P ##+##",
         "#rh          +     #Y;j#Q~Q#~~~~~~~~~5##+# #B r#",
         "###+##P  #######   +;;k#Q~Q#~52~~~~~~2#;;# # hr#",
@@ -165,7 +165,6 @@
         "L": "f_bookcase",
         "w": "f_sofa",
         "H": "f_sofa",
-        "z": "f_vending_c",
         "Y": "f_trashcan",
         "y": "f_trashcan",
         "B": "f_trashcan",
@@ -178,6 +177,7 @@
         "K": "f_beverly_shear",
         "C": "f_crate_c"
       },
+      "vendingmachines": { "z": { "item_group": "vending_drink", "lootable": true }, "X": { "item_group": "vending_food", "lootable": true } },
       "toilets": { "j": {  } },
       "items": {
         "y": { "item": "trash", "chance": 30, "repeat": [ 2, 3 ] },
@@ -201,10 +201,6 @@
         "~": { "item": "vehicle_scrapped", "chance": 3 }
       },
       "place_loot": [
-        { "group": "vending_food", "chance": 80, "x": 15, "y": 64 },
-        { "group": "vending_drink", "chance": 80, "x": 16, "y": 64 },
-        { "group": "vending_food", "chance": 80, "x": 20, "y": 8 },
-        { "group": "vending_drink", "chance": 80, "x": 21, "y": 8 },
         { "group": "bar_trash", "chance": 50, "repeat": 2, "x": 11, "y": 70 },
         { "group": "tools_blacksmith", "chance": 60, "repeat": 4, "x": 26, "y": [ 68, 70 ] },
         { "group": "tools_mechanic", "chance": 60, "repeat": 2, "x": 26, "y": [ 66, 67 ] },
diff --git a/data/json/mapgen/smallscrapyard.json b/data/json/mapgen/smallscrapyard.json
index 9162ebdb54c5f..9b81da07bd919 100644
--- a/data/json/mapgen/smallscrapyard.json
+++ b/data/json/mapgen/smallscrapyard.json
@@ -12,22 +12,22 @@
         "|           #          |",
         "|     ##  # ##  ##  a  |",
         "|    #b  # Ww  B#W#    |",
-        "|   bWw##&#Ww#{##wb#e  |",
-        "| #9#wO{###wwa #ow#B   |",
-        "|   #fwd##{vW# # w{#r  |",
+        "|   bWw##&#Ww#v##wb#e  |",
+        "| #9#wOv###wwa #ow#B   |",
+        "|   #fwd##vvW# # wv#r  |",
         "|   lwWB# #Ww#   W# e  |",
-        "|    W|  { ##D    9#   |",
+        "|    W|  v ##D    9#   |",
         "|    #    # ###  # #   |",
         "|            #    #    |",
         "|                      |",
         "|      o    #          |",
         "|     #     #      #   |",
         "|   9gw    ##  # wW  # |",
-        "|   #wf##{#wW&  dWv#l  |",
+        "|   #wf##v#wW&  dWv#l  |",
         "|# #Bww9  #Ww# #oww#   |",
         "|    |wb##DwW B##w|#a  |",
-        "|   #Ww    wwa { vw# # |",
-        "|  {  ro# #ww#     b#  |",
+        "|   #Ww    wwa v vw# # |",
+        "|  v  ro# #ww#     b#  |",
         "|   ## # # wW#  # ## # |",
         "|    #      #    # #   |",
         "||||||||||||||||||||||||"
@@ -60,9 +60,8 @@
         "l": "f_locker",
         "o": "f_oven",
         "r": "f_rack",
-        "v": "f_vending_o",
-        "w": "f_wreckage",
-        "{": "f_vending_o"
+        "v": [ "f_vending_o", "f_vending_c_off" ],
+        "w": "f_wreckage"
       },
       "place_items": [
         { "chance": 25, "item": "trash", "x": 11, "y": 20 },
@@ -152,18 +151,18 @@
         "|  -_a__-          uuu |",
         "|  -____-          uu  |",
         "|  -____b           u  |",
-        "|  -vv__-          uuu |",
+        "|  -vX__-          uuu |",
         "|  ---b--          uu7u|",
         "|                   uu |",
         "|                  u u |",
         "|      o    #          |",
         "|     #     #      #   |",
         "|   9gw    ##  # wW  # |",
-        "|   #wh##{#wW&  DWV#l  |",
+        "|   #wh##V#wW&  DWV#l  |",
         "|# #Bww9  #Ww# #oww#   |",
         "|    dwe##iwW B##wd#f  |",
-        "|   #Ww    wwf { Vw# # |",
-        "|  {  ro# #ww#     e#  |",
+        "|   #Ww    wwf V Vw# # |",
+        "|  V  ro# #ww#     e#  |",
         "|   ## # # wW#  # ## # |",
         "|    #      #    # #   |",
         "||||||||||||||||||||||||"
@@ -193,7 +192,7 @@
         "9": "f_console_broken",
         "B": "f_bathtub",
         "D": "f_dumpster",
-        "V": "f_vending_o",
+        "V": [ "f_vending_o", "f_vending_c_off" ],
         "a": "f_counter",
         "d": "f_chair",
         "H": "f_chair",
@@ -205,10 +204,9 @@
         "l": "f_locker",
         "o": "f_oven",
         "r": "f_rack",
-        "v": "f_vending_c",
-        "w": "f_wreckage",
-        "{": "f_vending_o"
+        "w": "f_wreckage"
       },
+      "vendingmachines": { "X": { "item_group": "vending_drink", "lootable": true }, "v": { "item_group": "vending_food", "lootable": true } },
       "place_items": [
         { "chance": 100, "item": "cash_register_random", "x": 5, "y": [ 4, 6 ] },
         { "chance": 25, "item": "vending_food", "x": 4, "y": 9 },
@@ -248,7 +246,7 @@
         " |....#..............^| ",
         " |.#.............#t#.R| ",
         " |...{Ww........^#WW..| ",
-        " |.S.#ww&#......v#Ww#.| ",
+        " |.S.#ww&#......V#Ww#.| ",
         " |..d#wW#........#ww#.| ",
         " |..#^Ww##......#&wW.S| ",
         " |....#f.........#....| ",
@@ -257,7 +255,7 @@
         " |^..#................| ",
         " |#...WW#..#.Ww......#| ",
         " |...&ww....Sww#....##| ",
-        " |...#WW#...#Wwv#....#| ",
+        " |...#WW#...#WwV#....#| ",
         " |.#.#Ww#...bwW#.... V| ",
         " |....wWH..#^Ww&... rs| ",
         " |#{...#......#..  D.1  ",
@@ -281,14 +279,13 @@
         "H": "f_armchair",
         "R": "f_rubble_rock",
         "S": "f_sink",
-        "V": "f_vending_o",
+        "V": [ "f_vending_o", "f_vending_c_off" ],
         "^": "f_rubble",
         "b": "f_bed",
         "d": "f_desk",
         "f": "f_fridge",
         "r": "f_rubble",
         "t": "f_trashcan",
-        "v": "f_vending_o",
         "w": "f_wreckage",
         "{": "f_bigmirror_b"
       },
diff --git a/data/json/mapgen/storage_units_small.json b/data/json/mapgen/storage_units_small.json
index cabceb9c45362..e1623136b2934 100644
--- a/data/json/mapgen/storage_units_small.json
+++ b/data/json/mapgen/storage_units_small.json
@@ -52,7 +52,7 @@
         "b": "f_bed",
         "r": "f_rubble",
         "t": "f_table",
-        "{": "f_vending_o",
+        "{": [ "f_vending_o", "f_vending_c_off" ],
         "M": [ "f_crate_c", "f_cardboard_box" ]
       },
       "place_loot": [ { "item": "television", "x": 3, "y": 6, "chance": 75 }, { "item": "stepladder", "x": 5, "y": 19, "chance": 100 } ],
diff --git a/data/json/mapgen/store/s_camping.json b/data/json/mapgen/store/s_camping.json
index e47d78b2a390c..42fcad2d060cc 100644
--- a/data/json/mapgen/store/s_camping.json
+++ b/data/json/mapgen/store/s_camping.json
@@ -21,7 +21,7 @@
         ".# ss ss   y#____www_g..",
         ".c          c____xvw_g..",
         ".#          c__K_www_g..",
-        ".#  ssssss y#________g..",
+        ".#  ssssss Y#________g..",
         ".#  ||||||b|#;_K__jjj#..",
         ".#  |ooo===q###hh#####..",
         ".#|b|ooo===q#mm__illlg..",
@@ -79,10 +79,10 @@
         "w": "f_canvas_wall",
         "x": "f_canvas_door",
         "M": "f_displaycase",
-        "y": "f_vending_c",
         "z": "f_trashcan",
         "A": "f_sink"
       },
+      "vendingmachines": { "y": { "item_group": "vending_drink", "lootable": true }, "Y": { "item_group": "vending_food", "lootable": true } },
       "toilets": { "B": {  } },
       "place_loot": [
         { "group": "cannedfood", "chance": 50, "repeat": 10, "x": [ 3, 3 ], "y": [ 4, 10 ] },
@@ -98,8 +98,6 @@
         { "group": "kitchen_nonfood", "chance": 50, "repeat": 4, "x": [ 6, 7 ], "y": 12 },
         { "group": "book_survival", "chance": 50, "repeat": 2, "x": 10, "y": 7 },
         { "group": "tools_hunting", "chance": 50, "repeat": 2, "x": 10, "y": 7 },
-        { "group": "vending_food_items", "chance": 80, "repeat": 2, "x": 11, "y": 15 },
-        { "group": "vending_drink", "chance": 80, "repeat": 1, "x": 11, "y": 12 },
         { "group": "trash", "chance": 50, "repeat": 5, "x": 11, "y": 2 },
         { "group": "trash", "chance": 50, "repeat": 5, "x": [ 18, 20 ], "y": [ 18, 19 ] },
         { "group": "camping", "chance": 60, "repeat": 4, "x": [ 5, 6 ], "y": 17 },
diff --git a/data/json/mapgen/store/s_cardealer.json b/data/json/mapgen/store/s_cardealer.json
index d2bcb59e54bc7..c5cb1a3e6baea 100644
--- a/data/json/mapgen/store/s_cardealer.json
+++ b/data/json/mapgen/store/s_cardealer.json
@@ -48,7 +48,8 @@
         "n": "t_floor",
         ";": "t_gutter_downspout"
       },
-      "furniture": { "j": "f_sink", "k": "f_table", "l": "f_chair", "m": "f_locker", "n": "f_vending_c" },
+      "furniture": { "j": "f_sink", "k": "f_table", "l": "f_chair", "m": "f_locker" },
+      "vendingmachines": { "n": { "lootable": true } },
       "toilets": { "i": {  } },
       "place_loot": [
         { "group": "office", "chance": 50, "repeat": [ 5 ], "x": [ 7, 7 ], "y": [ 22, 22 ] },
diff --git a/data/json/mapgen_palettes/church_retreat.json b/data/json/mapgen_palettes/church_retreat.json
index 31437460b6b7f..a4e4710269a61 100644
--- a/data/json/mapgen_palettes/church_retreat.json
+++ b/data/json/mapgen_palettes/church_retreat.json
@@ -40,7 +40,6 @@
       "a": "f_trashcan",
       "^": [ "f_indoor_plant", "f_indoor_plant_y" ],
       "c": "f_cupboard",
-      "$": "f_vending_o",
       "D": "f_dumpster",
       "R": "f_recycle_bin",
       "e": "f_fridge",
@@ -73,6 +72,7 @@
         [ "f_boulder_large", 1 ]
       ]
     },
+    "vendingmachines": { "$": { "lootable": true } },
     "sealed_item": { "o": { "item": { "item": "seed_potato_raw" }, "furniture": "f_plant_seedling", "chance": 100 } },
     "toilets": { "T": {  } },
     "item": {
diff --git a/data/json/mapgen_palettes/farm_supply_palette.json b/data/json/mapgen_palettes/farm_supply_palette.json
index cceba57071211..c5ac8418fae0c 100644
--- a/data/json/mapgen_palettes/farm_supply_palette.json
+++ b/data/json/mapgen_palettes/farm_supply_palette.json
@@ -34,7 +34,6 @@
       "m": "f_atm_off",
       "b": "f_bench",
       "B": "f_bench",
-      "V": "f_vending_c",
       "C": "f_chair",
       "^": [ "f_indoor_plant", "f_indoor_plant_y" ],
       "c": "f_counter",
@@ -87,6 +86,7 @@
       "g": "f_trashcan",
       "z": "f_safe_l"
     },
+    "vendingmachines": { "V": { "lootable": true } },
     "toilets": { "T": {  } }
   },
   {
diff --git a/data/json/mapgen_palettes/hotel_tower_palette.json b/data/json/mapgen_palettes/hotel_tower_palette.json
index f874f8801b919..baf7ebbfc7874 100644
--- a/data/json/mapgen_palettes/hotel_tower_palette.json
+++ b/data/json/mapgen_palettes/hotel_tower_palette.json
@@ -23,8 +23,6 @@
       "e": "f_fridge",
       "l": "f_locker",
       "W": "f_washer",
-      "F": "f_vending_c",
-      "U": "f_vending_c",
       "D": "f_desk",
       "x": "f_console_broken"
     },
diff --git a/data/json/mapgen_palettes/junkyard_palette.json b/data/json/mapgen_palettes/junkyard_palette.json
index 850f72c3f0ff7..2eea1fd1700ed 100644
--- a/data/json/mapgen_palettes/junkyard_palette.json
+++ b/data/json/mapgen_palettes/junkyard_palette.json
@@ -42,10 +42,9 @@
       "b": "f_sink",
       "I": "f_desk",
       "n": "f_table",
-      "p": "f_table",
-      "F": "f_vending_c",
-      "K": "f_vending_c"
+      "p": "f_table"
     },
+    "vendingmachines": { "F": { "item_group": "vending_drink", "lootable": true }, "K": { "item_group": "vending_food", "lootable": true } },
     "items": { "_": { "item": "trash_junkyard", "chance": 3, "repeat": 2 } }
   }
 ]
diff --git a/data/json/mapgen_palettes/karting_l.json b/data/json/mapgen_palettes/karting_l.json
index 56c70d2e5266c..8cc44893fb2b1 100644
--- a/data/json/mapgen_palettes/karting_l.json
+++ b/data/json/mapgen_palettes/karting_l.json
@@ -54,8 +54,6 @@
       "n": "f_sink",
       "c": [ [ "f_crate_c", 2 ], "f_crate_o" ],
       "C": [ [ "f_crate_c", 2 ], "f_crate_o" ],
-      "j": "f_vending_c",
-      "V": "f_vending_c",
       "7": "f_filing_cabinet",
       "S": "f_utility_shelf",
       "x": "f_utility_shelf",
diff --git a/data/json/mapgen_palettes/lab/lab_modular_palette.json b/data/json/mapgen_palettes/lab/lab_modular_palette.json
index 2d475b5a612ec..ac87ca182f9d1 100644
--- a/data/json/mapgen_palettes/lab/lab_modular_palette.json
+++ b/data/json/mapgen_palettes/lab/lab_modular_palette.json
@@ -280,16 +280,10 @@
       "ʭ": "f_ladder",
       "5": "f_water_purifier",
       "6": "f_machinery_heavy",
-      "Ö": "f_machinery_light",
-      "3": "f_vending_c",
-      "4": "f_vending_c"
-    },
-    "items": {
-      "3": { "item": "vending_food", "chance": 90 },
-      "4": { "item": "vending_drink", "chance": 90 },
-      "Q": { "item": "gas_charging_rack", "chance": 30 },
-      "J": [ { "item": "mechanics", "chance": 30 } ]
+      "Ö": "f_machinery_light"
     },
+    "items": { "Q": { "item": "gas_charging_rack", "chance": 30 }, "J": [ { "item": "mechanics", "chance": 30 } ] },
+    "vendingmachines": { "3": { "item_group": "vending_drink", "lootable": true }, "4": { "item_group": "vending_food", "lootable": true } },
     "sealed_item": { "]": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" } }
   },
   {
@@ -315,18 +309,15 @@
       "ʭ": "f_ladder",
       "ʉ": "f_sandbag_wall",
       "ʋ": "f_sandbag_half",
-      "5": "f_target",
-      "3": "f_vending_c",
-      "4": "f_vending_c"
+      "5": "f_target"
     },
+    "vendingmachines": { "3": { "item_group": "vending_drink", "lootable": true }, "4": { "item_group": "vending_food", "lootable": true } },
     "monster": {
       "0": { "monster": "mon_turret_rifle", "spawn_data": { "ammo": [ { "ammo_id": "556", "qty": [ 30, 90 ] } ] } },
       "ɜ": { "monster": "mon_turret_rifle", "spawn_data": { "ammo": [ { "ammo_id": "556", "qty": [ 30, 90 ] } ] } },
       "ɛ": { "monster": "mon_turret_rifle", "spawn_data": { "ammo": [ { "ammo_id": "556", "qty": [ 30, 90 ] } ] } }
     },
     "items": {
-      "3": { "item": "vending_food", "chance": 90 },
-      "4": { "item": "vending_drink", "chance": 90 },
       "P": { "item": "lab_files_security", "chance": 50 },
       "U": [
         { "item": "home_hw", "chance": 10, "repeat": [ 1, 2 ] },
diff --git a/data/json/mapgen_palettes/mall_palette.json b/data/json/mapgen_palettes/mall_palette.json
index ba12ea8bcf1d8..e13a4df838e40 100644
--- a/data/json/mapgen_palettes/mall_palette.json
+++ b/data/json/mapgen_palettes/mall_palette.json
@@ -45,7 +45,6 @@
       "n": "f_dishwasher",
       "r": "f_wood_keg",
       "s": "f_metal_butcher_rack",
-      "u": [ "f_vending_c", "f_vending_reinforced" ],
       "v": "f_gun_safe_el",
       "w": "f_safe_l",
       "Я": "f_flower_tulip",
@@ -60,6 +59,7 @@
       "?": "f_console_broken",
       "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ]
     },
+    "vendingmachines": { "u": { "lootable": true } },
     "terrain": {
       "ɔ": "t_pavement_y",
       "Г": "t_sidewalk",
diff --git a/data/json/mapgen_palettes/movie_theater_palette.json b/data/json/mapgen_palettes/movie_theater_palette.json
index 1bca70b754eeb..1446507d418a6 100644
--- a/data/json/mapgen_palettes/movie_theater_palette.json
+++ b/data/json/mapgen_palettes/movie_theater_palette.json
@@ -27,11 +27,10 @@
       "@": "f_sofa",
       "o": "f_oven",
       "r": "f_rack",
-      "F": "f_vending_c",
-      "v": "f_vending_c",
       "Z": "f_console_broken",
       "N": "f_bulletin"
     },
+    "vendingmachines": { "F": { "item_group": "vending_drink", "lootable": true }, "v": { "item_group": "vending_food", "lootable": true } },
     "terrain": {
       "$": "t_carpet_green",
       "#": "t_carpet_purple",
diff --git a/data/json/mapgen_palettes/park_palette.json b/data/json/mapgen_palettes/park_palette.json
index 8ef431b6fa4a2..f0947ecf0920a 100644
--- a/data/json/mapgen_palettes/park_palette.json
+++ b/data/json/mapgen_palettes/park_palette.json
@@ -54,11 +54,11 @@
       "i": "f_region_water_plant",
       "L": "f_table",
       "T": "f_table",
-      "v": "f_vending_c",
       "X": "f_trashcan",
       "Y": "f_brazier",
       "5": "f_sink"
     },
+    "vendingmachines": { "v": { "lootable": true } },
     "toilets": { "x": {  } },
     "item": { "g": { "item": "sandbox_kit", "chance": 5 } },
     "items": {
diff --git a/data/json/mapgen_palettes/refugee_center.json b/data/json/mapgen_palettes/refugee_center.json
index 5ab158dad68d1..c80e983ef7bbb 100644
--- a/data/json/mapgen_palettes/refugee_center.json
+++ b/data/json/mapgen_palettes/refugee_center.json
@@ -46,7 +46,6 @@
       "h": "f_chair",
       "i": "f_filing_cabinet",
       "k": "f_desk",
-      "l": "f_vending_c",
       "n": "f_slab",
       "o": "f_bookcase",
       "p": "f_cardboard_fort",
@@ -59,6 +58,7 @@
       "}": "f_rubble",
       "~": "f_shower"
     },
+    "vendingmachines": { "l": { "lootable": true } },
     "toilets": { "t": {  } }
   },
   {
diff --git a/data/json/mapgen_palettes/steel_mill_palette.json b/data/json/mapgen_palettes/steel_mill_palette.json
index 644666871f275..1a957b264b939 100644
--- a/data/json/mapgen_palettes/steel_mill_palette.json
+++ b/data/json/mapgen_palettes/steel_mill_palette.json
@@ -67,8 +67,6 @@
       "w": "f_water_purifier",
       "U": "f_home_furnace",
       "f": "f_fridge",
-      "D": "f_vending_c",
-      "V": "f_vending_c",
       "7": "f_filing_cabinet"
     },
     "items": {
diff --git a/data/json/mapgen_palettes/textile_mill_museum.json b/data/json/mapgen_palettes/textile_mill_museum.json
index 6505bb72bb3eb..a29a5f18621d1 100644
--- a/data/json/mapgen_palettes/textile_mill_museum.json
+++ b/data/json/mapgen_palettes/textile_mill_museum.json
@@ -36,8 +36,6 @@
       "h": "f_chair",
       "c": [ [ "f_crate_c", 2 ], "f_crate_o" ],
       "C": [ [ "f_crate_c", 2 ], "f_crate_o" ],
-      "D": "f_vending_c",
-      "V": "f_vending_c",
       "y": "f_trashcan",
       "d": "f_desk",
       "i": "f_indoor_plant_y",
diff --git a/data/mods/Aftershock/maps/crashing_ship.json b/data/mods/Aftershock/maps/crashing_ship.json
index 2e9c8296b8bea..2be0186c216a9 100644
--- a/data/mods/Aftershock/maps/crashing_ship.json
+++ b/data/mods/Aftershock/maps/crashing_ship.json
@@ -109,7 +109,6 @@
         "w": "f_workbench",
         "S": "f_sink",
         "t": "f_table",
-        "V": "f_vending_reinforced",
         "C": "f_crate_c",
         "1": "f_arcfurnace_empty",
         "2": "f_hydraulic_press",
@@ -154,6 +153,7 @@
         "p": "t_foamcrete_floor_seal",
         "z": "t_escape_pod_floor"
       },
+      "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true } },
       "place_zones": [ { "type": "ZONE_START_POINT", "faction": "your_followers", "x": 19, "y": 14 } ],
       "mapping": {
         "e": { "items": [ { "item": "afs_ballistic_armory", "chance": 20 } ] },
@@ -189,7 +189,6 @@
         "E": { "items": [ { "item": "afs_tools_space_emergency", "chance": 100 } ] },
         "w": { "items": [ { "item": "office_mess", "chance": 75 } ] },
         "t": { "items": [ { "item": "afs_mess_hall", "chance": 80 } ] },
-        "V": { "items": [ { "item": "afs_vending_false_meals", "chance": 100 } ] },
         "H": { "items": [ { "item": "afs_exosuit_worker", "chance": 75 } ] },
         "h": { "items": [ { "item": "afs_exosuit_light_worker", "chance": 75 } ] }
       },
diff --git a/data/mods/Aftershock/maps/mapgen/s_gas.json b/data/mods/Aftershock/maps/mapgen/s_gas.json
index 3293b36bdc5e8..86c4cdbbf76f5 100644
--- a/data/mods/Aftershock/maps/mapgen/s_gas.json
+++ b/data/mods/Aftershock/maps/mapgen/s_gas.json
@@ -37,7 +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 ] }
       ],
-      "furniture": { "V": "f_vending_reinforced", "k": "f_rack", "T": "f_atm" },
+      "furniture": { "k": "f_rack", "T": "f_atm" },
       "toilets": { "&": {  } },
       "gaspumps": { "G": {  } },
       "items": {
@@ -45,16 +45,26 @@
         "k": { "item": "snacks", "chance": 33, "repeat": [ 1, 2 ] }
       },
       "place_loot": [
-        { "item": "plut_cell", "x": 11, "y": 9, "chance": 80 },
-        { "item": "plut_cell", "x": 11, "y": 9, "chance": 20, "repeat": [ 0, 1 ] },
-        { "item": "plut_cell", "x": 11, "y": 9, "chance": 3, "repeat": [ 2, 5 ] },
         { "group": "behindcounter", "x": 9, "y": [ 14, 16 ], "chance": 80, "repeat": [ 0, 2 ] },
         { "group": "road", "x": [ 15, 18 ], "y": 12, "chance": 33, "repeat": [ 0, 1 ] },
         { "group": "magazines", "x": 9, "y": [ 14, 16 ], "chance": 90 },
         { "group": "softdrugs", "x": [ 15, 18 ], "y": [ 19, 20 ], "chance": 80, "repeat": [ 0, 2 ] }
       ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.1 } ],
-      "vendingmachines": { "ñ": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true } }
+      "vendingmachines": {
+        "ñ": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true },
+        "V": { "item_group": "plut_cell_vending", "reinforced": true, "powered": true }
+      }
     }
+  },
+  {
+    "type": "item_group",
+    "id": "plut_cell_vending",
+    "subtype": "collection",
+    "items": [
+      { "item": "plut_cell", "prob": 80 },
+      { "item": "plut_cell", "prob": 20, "count": [ 0, 1 ] },
+      { "item": "plut_cell", "prob": 3, "count": [ 2, 5 ] }
+    ]
   }
 ]
diff --git a/data/mods/Backrooms/palettes.json b/data/mods/Backrooms/palettes.json
index 9c1b7a87cdc60..5f3dcfe23044a 100644
--- a/data/mods/Backrooms/palettes.json
+++ b/data/mods/Backrooms/palettes.json
@@ -57,7 +57,6 @@
       "l": [ "f_watercooler" ],
       "m": [ "f_rack_coat" ],
       "n": [ "f_trashcan" ],
-      "p": [ "f_vending_reinforced" ],
       "r": [ [ "f_null", 5 ], [ "f_shredder", 10 ] ],
       "s": [ [ "f_null", 5 ], [ "f_server", 10 ] ],
       "t": [ "f_bookcase" ],
@@ -81,12 +80,12 @@
       "i": [ { "item": "backrooms_master_filing", "chance": 85 } ],
       "m": [ { "item": "backrooms_master_coat_rack", "chance": 65 } ],
       "n": [ { "item": "backrooms_master_trash", "chance": 40 } ],
-      "p": [ { "item": "backrooms_master_vending", "chance": 95 } ],
       "t": [ { "item": "backrooms_master_bookshelf", "chance": 80 } ],
       "x": [ { "item": "backrooms_master_rubble", "chance": 80 } ],
       "y": [ { "item": "backrooms_master_rubble", "chance": 80 } ],
       "A": [ { "item": "backrooms_master_cardboard", "chance": 50 } ]
     },
+    "vendingmachines": { "p": { "item_group": "backrooms_master_vending", "reinforced": true, "powered": true } },
     "nested": {
       "!": { "chunks": [ [ "null", 10 ], [ "mx_backroom_micro_common", 20 ], [ "mx_backroom_micro_storage", 4 ] ] },
       "@": { "chunks": [ [ "mx_backroom_micro_storage", 20 ] ] },
diff --git a/data/mods/DinoMod/mapgen/zoo.json b/data/mods/DinoMod/mapgen/zoo.json
index 23e5561b5d2ff..118ff6cd79592 100644
--- a/data/mods/DinoMod/mapgen/zoo.json
+++ b/data/mods/DinoMod/mapgen/zoo.json
@@ -52,7 +52,7 @@
       "rows": [
         "----------------------ss",
         "-__________________|vsss",
-        "-__________________|vsss",
+        "-__________________|Vsss",
         "-__|||||||||||||||||ssss",
         "-__|...{{..........wssss",
         "-__|...............wssss",
@@ -105,21 +105,19 @@
         "f": "f_dahlia",
         "h": "f_hay",
         "i": "f_indoor_plant",
-        "v": "f_vending_c",
         "{": "f_rack"
       },
+      "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true }, "v": { "item_group": "vending_food", "lootable": true } },
       "place_item": [ { "item": "rock", "repeat": 1, "x": 9, "y": 15 }, { "item": "pine_bough", "repeat": 1, "x": 9, "y": 21 } ],
       "place_items": [
         { "chance": 55, "item": "toy_store", "x": 12, "y": [ 6, 7 ] },
-        { "chance": 75, "item": "vending_food", "x": 20, "y": 2 },
         { "chance": 55, "item": "trash", "x": 13, "y": 15 },
         { "chance": 55, "item": "trash", "x": 13, "y": 10 },
         { "chance": 55, "item": "snacks", "x": 10, "y": 11 },
         { "chance": 55, "item": "snacks", "x": [ 7, 8 ], "y": 4 },
         { "chance": 55, "item": "candy_shop", "x": 10, "y": [ 6, 7 ] },
         { "chance": 75, "item": "shirts", "x": 10, "y": 12 },
-        { "chance": 75, "item": "shirts", "x": 4, "y": 11 },
-        { "chance": 75, "item": "vending_drink", "x": 20, "y": 1 }
+        { "chance": 75, "item": "shirts", "x": 4, "y": 11 }
       ],
       "place_monster": [
         { "monster": "mon_velociraptor", "x": 8, "y": 16 },
@@ -139,7 +137,7 @@
       "rows": [
         "----------------------ss",
         "-__________________|vsss",
-        "-__________________|vsss",
+        "-__________________|Vsss",
         "-__|||||||||||||||||ssss",
         "-__|...{{..........wssss",
         "-__|...............wssss",
@@ -191,20 +189,18 @@
         "f": "f_dahlia",
         "h": "f_hay",
         "i": "f_indoor_plant",
-        "v": "f_vending_c",
         "{": "f_rack"
       },
+      "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true }, "v": { "item_group": "vending_food", "lootable": true } },
       "place_items": [
         { "chance": 55, "item": "toy_store", "x": 12, "y": [ 6, 7 ] },
-        { "chance": 75, "item": "vending_food", "x": 20, "y": 2 },
         { "chance": 55, "item": "trash", "x": 13, "y": 15 },
         { "chance": 55, "item": "trash", "x": 13, "y": 10 },
         { "chance": 55, "item": "snacks", "x": 10, "y": 11 },
         { "chance": 55, "item": "snacks", "x": [ 7, 8 ], "y": 4 },
         { "chance": 55, "item": "candy_shop", "x": 10, "y": [ 6, 7 ] },
         { "chance": 75, "item": "shirts", "x": 10, "y": 12 },
-        { "chance": 75, "item": "shirts", "x": 4, "y": 11 },
-        { "chance": 75, "item": "vending_drink", "x": 20, "y": 1 }
+        { "chance": 75, "item": "shirts", "x": 4, "y": 11 }
       ],
       "place_item": [
         { "item": "rock", "repeat": 1, "x": 9, "y": 15 },
@@ -355,7 +351,7 @@
       "rows": [
         "..----------------------",
         "...#||||||||{..|dc_ddd_|",
-        "...#|&|&|HT|{..+d+dd_dd|",
+        "...#|&|&|HT|}..+d+dd_dd|",
         "....|a|a|ff|...bcc_ddud|",
         "...#|fffffC|...bsddd__d|",
         "...#|fffffS|...bssd____|",
@@ -416,9 +412,9 @@
         "T": "f_trashcan",
         "e": "f_chamomile",
         "h": "f_dandelion",
-        "t": "f_trashcan",
-        "{": "f_vending_c"
+        "t": "f_trashcan"
       },
+      "vendingmachines": { "{": { "item_group": "vending_drink", "lootable": true }, "}": { "item_group": "vending_food", "lootable": true } },
       "place_item": [
         { "item": "stick", "repeat": 1, "x": 19, "y": 1 },
         { "item": "stick", "repeat": 1, "x": 20, "y": 4 },
@@ -428,8 +424,6 @@
         { "item": "stick", "repeat": 1, "x": 6, "y": 15 }
       ],
       "place_items": [
-        { "chance": 55, "item": "vending_drink", "x": 12, "y": 2 },
-        { "chance": 65, "item": "vending_food", "x": 12, "y": 1 },
         { "chance": 55, "item": "trash", "x": 8, "y": 19 },
         { "chance": 55, "item": "trash", "x": 12, "y": 6 },
         { "chance": 55, "item": "trash", "x": 10, "y": 2 }
@@ -460,7 +454,7 @@
       "rows": [
         "..----------------------",
         "...#||||||||{..|dc_ddd_|",
-        "...#|&|&|HT|{..+d+dd_dd|",
+        "...#|&|&|HT|}..+d+dd_dd|",
         "....|a|a|ff|...bcc_ddud|",
         "...#|fffffC|...bsddd__d|",
         "...#|fffffS|...bssd____|",
@@ -520,12 +514,10 @@
         "T": "f_trashcan",
         "e": "f_chamomile",
         "h": "f_dandelion",
-        "t": "f_trashcan",
-        "{": "f_vending_c"
+        "t": "f_trashcan"
       },
+      "vendingmachines": { "{": { "item_group": "vending_drink", "lootable": true }, "}": { "item_group": "vending_food", "lootable": true } },
       "place_items": [
-        { "chance": 55, "item": "vending_drink", "x": 12, "y": 2 },
-        { "chance": 65, "item": "vending_food", "x": 12, "y": 1 },
         { "chance": 55, "item": "trash", "x": 8, "y": 19 },
         { "chance": 55, "item": "trash", "x": 12, "y": 6 },
         { "chance": 55, "item": "trash", "x": 10, "y": 2 }
diff --git a/data/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json b/data/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json
index 849f38d1c12bf..38aa61cb354d2 100644
--- a/data/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json
+++ b/data/mods/MindOverMatter/mapgen_palettes/skyscraper_lab_palette.json
@@ -67,9 +67,7 @@
       "x": "f_console_broken",
       "X": "f_generator_broken",
       "y": "f_locker",
-      "Y": "f_rack_coat",
-      "Đ": "f_vending_c",
-      "Ƒ": "f_vending_c"
+      "Y": "f_rack_coat"
     },
     "items": {
       "d": [ { "item": "SUS_office_desk", "chance": 50 }, { "item": "homebooks", "chance": 2 } ],
@@ -83,7 +81,12 @@
       "F": { "item": "SUS_office_filing_cabinet", "chance": 70 },
       ".": { "item": "office_mess", "chance": 1 }
     },
-    "vendingmachines": { "8": { "item_group": "vending_drink" }, "9": { "item_group": "vending_food" } },
+    "vendingmachines": {
+      "8": { "item_group": "vending_drink", "lootable": true },
+      "9": { "item_group": "vending_food", "lootable": true },
+      "Đ": { "item_group": "vending_drink", "lootable": true },
+      "Ƒ": { "item_group": "vending_food", "lootable": true }
+    },
     "toilets": { "T": {  } }
   },
   {
diff --git a/data/mods/No_Hope/mapgen_palettes/necropolis_palettes.json b/data/mods/No_Hope/mapgen_palettes/necropolis_palettes.json
index 93f3fa60a99f6..a1b07f6294adb 100644
--- a/data/mods/No_Hope/mapgen_palettes/necropolis_palettes.json
+++ b/data/mods/No_Hope/mapgen_palettes/necropolis_palettes.json
@@ -30,7 +30,6 @@
       "h": "f_chair",
       "j": "f_washer",
       "k": "f_desk",
-      "l": "f_vending_c",
       "n": "f_table",
       "o": "f_bookcase",
       "p": "f_pool_table",
@@ -41,6 +40,7 @@
       "t": "f_toilet",
       "u": "f_barricade_road"
     },
+    "vendingmachines": { "l": { "lootable": true } },
     "terrain": {
       "!": "t_bars",
       "#": "t_region_shrub",
@@ -241,13 +241,13 @@
       "h": "f_chair",
       "j": "f_exercise",
       "k": "f_desk",
-      "l": "f_vending_c",
       "n": "f_table",
       "o": "f_bookcase",
       "r": "f_rack",
       "t": "f_toilet",
       "z": "f_crate_c"
     },
+    "vendingmachines": { "l": { "lootable": true } },
     "terrain": {
       " ": "t_metal_floor",
       "!": "t_bars",
@@ -359,7 +359,6 @@
       "h": "f_chair",
       "j": "f_exercise",
       "k": "f_desk",
-      "l": "f_vending_c",
       "n": "f_table",
       "o": "f_bookcase",
       "r": "f_rack",
@@ -368,6 +367,7 @@
       "~": "f_shower",
       "X": "f_rubble"
     },
+    "vendingmachines": { "l": { "lootable": true } },
     "terrain": {
       " ": "t_metal_floor",
       "!": "t_bars",
diff --git a/data/mods/No_Hope/mapgen_palettes/other_palettes.json b/data/mods/No_Hope/mapgen_palettes/other_palettes.json
index e801aef1457ef..af5fa141e01aa 100644
--- a/data/mods/No_Hope/mapgen_palettes/other_palettes.json
+++ b/data/mods/No_Hope/mapgen_palettes/other_palettes.json
@@ -171,10 +171,9 @@
       "<": "t_ladder_up",
       "4": "t_gutter_downspout"
     },
+    "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
     "furniture": {
       "c": "f_counter",
-      "D": "f_vending_c",
-      "F": "f_vending_c",
       "S": "f_sink",
       "T": "f_toilet",
       "h": "f_chair",
@@ -216,8 +215,6 @@
       "e": "f_fridge",
       "l": "f_locker",
       "W": "f_washer",
-      "F": "f_vending_c",
-      "U": "f_vending_c",
       "D": "f_desk",
       "x": "f_console_broken"
     },