--- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
+++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
@@ -75,20 +75,117 @@
     "dynamic_line": "Excellent.  What've you brought us?",
     "repeat_responses": {
       "for_item": [
-        "jerky",
-        "meat_smoked",
-        "fish_smoked",
-        "dry_veggy",
-        "dry_fruit",
+        "acorn_roasted",
+        "almond_roasted",
+        "apple_canned",
+        "apple_sugar",
+        "bacon",
+        "beer",
+        "belgian_ale",
+        "can_beans",
+        "can_chicken",
+        "can_chowder",
+        "can_clams",
+        "can_corn",
+        "can_herring",
+        "can_peaches",
+        "can_pineapple",
+        "can_salmon",
+        "can_sardine",
+        "can_spam",
+        "can_tuna",
+        "can_tomato",
+        "cheese_hard",
+        "chestnut_roasted",
+        "con_milk",
         "cooking_oil",
         "cooking_oil2",
         "cornmeal",
+        "dried_salad",
+        "dry_beans",
+        "dry_fish",
+        "dry_fruit",
+        "dry_meat",
+        "dry_mushroom",
+        "dry_lentils",
+        "dry_rice",
+        "dry_tofu",
+        "dry_veggy",
+        "edamame_roasted",
+        "european_pilsner",
+        "fish_canned",
+        "fish_pickled",
+        "fish_smoked",
         "flour",
+        "fruit_leather",
         "fruit_wine",
-        "beer",
-        "sugar",
+        "granola",
+        "hardtack",
+        "hazelnut_roasted",
+        "hb_beer",
+        "hickory_nut_roasted",
+        "india_pale_ale",
+        "jar_eggs_pickled",
+        "jar_pickles_pickled",
+        "jar_sauerkraut_pickled",
+        "jerky",
+        "kompot",
+        "mead",
+        "meat_canned",
+        "meat_pickled",
+        "meat_salted",
+        "meat_smoked",
+        "milk_evap",
+        "milk_powder",
+        "milk_UHT",
+        "mre_asianbeef_box",
+        "mre_bbqbeef_box",
+        "mre_beef_box",
+        "mre_beefstew_box",
+        "mre_beeftaco_box",
+        "mre_cheesetort_box",
+        "mre_chicken_box",
+        "mre_chickenburritobowl_box",
+        "mre_chickennoodle_box",
+        "mre_chickenpesto_box",
+        "mre_chilimac_box",
+        "mre_chilibeans_box",
+        "mre_hashbrownbacon_box",
+        "mre_hotdog_box",
+        "mre_lemontuna_box",
+        "mre_macaronimarinara_box",
+        "mre_maplesausage_box",
+        "mre_meatball_box",
+        "mre_mexicanchickenstew_box",
+        "mre_mushroomfettuccine_box",
+        "mre_pepperjackbeef_box",
+        "mre_ravioli_box",
+        "mre_southwestbeef_box",
+        "mre_spaghetti_box",
+        "mre_veggy_box",
+        "oatmeal",
+        "pale_ale",
+        "pecan_roasted",
+        "pemmican",
+        "pistachio_roasted",
+        "pork_beans",
+        "powder_eggs",
+        "ravioli",
+        "drink_rumcola",
         "salt",
-        "vinegar"
+        "sausage",
+        "soup_chicken",
+        "soup_dumplings",
+        "soup_tomato",
+        "soy_nuts",
+        "stout",
+        "sugar",
+        "veggy_canned",
+        "veggy_pickled",
+        "veggy_salted",
+        "vinegar",
+        "wine_barley",
+        "yeast"
       ],
       "response": { "text": "Delivering <topic_item>.", "topic": "TALK_DELIVER_ASK" }
     },
@@ -128,7 +225,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_FREE_MERCHANT_STOCKS_WHY",
-    "dynamic_line": "All three are easy to locally produce in significant quantities and are non-perishable.  We have a local farmer or two and a few hunter types that have been making attempts to provide us with the nutritious supplies.  We do always need more suppliers though.  This stuff is rather cheap in bulk, so I can pay a premium for any you have on you.  Canned food and other edibles are handled by the merchant in the front in trade.",
+    "dynamic_line": "All three are easy to locally produce in significant quantities and are non-perishable.  We have a local farmer or two and a few hunter types that have been making attempts to provide us with the nutritious supplies.  We do always need more suppliers though.  This stuff is rather cheap in bulk, so I can pay a premium for any you have on you.",
     "responses": [
       { "text": "Are you looking to buy anything else?", "topic": "TALK_FREE_MERCHANT_STOCKS_ALL" },
       { "text": "Very well… let's talk about something else.", "topic": "TALK_FREE_MERCHANT_STOCKS" }
@@ -142,7 +239,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_FREE_MERCHANT_STOCKS_ALL",
-    "dynamic_line": "I'm actually accepting a number of different foodstuffs: beer, sugar, flour, smoked meat, smoked fish, dried fruit and vegetables, cooking oil, preservatives like salt and vinegar; and as mentioned before, jerky, cornmeal, and fruit wine."
+    "dynamic_line": "I'm actually accepting a number of different foodstuffs: Basic cooking supplies like flour, sugar, yeast, cooking oils, powdered eggs, powdered milk; Any sort of preserved meat, fish, cheese, fruit, nut, or vegetable; preservation supplies like salt and vinegar; low alcohol content liquors like fruit wine and beer; and of course, any sort of pre-cataclysm factory-sealed foods you can get your hands on, such as canned ravioli, evaporated milk, or military MREs."
   },
   {
     "type": "talk_topic",