Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

data/json/items/comestibles/veggy_dishes.json

@@ -23,7 +23,6 @@
     "calories": 280,
     "spoils_in": "5 days",
     "description": "A roasted root from a cattail plant.  Its fibrous outer core is charred black, you can remove it and chew on the dry inside.",
-    "milling": { "into": "flour", "conversion_rate": 7.5 },
     "fun": -1,
     "delete": { "flags": [ "RAW" ] },
     "//": "The flag below implies that part of root got burned and has to be removed",

data/json/items/generic.json

@@ -2725,6 +2725,15 @@
     "volume": "5 ml",
     "to_hit": -3
   },
+  {
+    "type": "GENERIC",
+    "//": "Item for meteorologist mission.",
+    "id": "module_meteorologist",
+    "name": { "str": "drone memory bank" },
+    "description": "Allows for storage and recovery of information.  Found in meteorologist drone.",
+    "copy-from": "robot_module_abstract",
+    "flags": [ "TRADER_AVOID" ]
+  },
   {
     "id": "gasdiscount_silver",
     "type": "TOOL",

data/json/items/gun/223.json

@@ -537,7 +537,7 @@
     "looks_like": "ar15",
     "type": "GUN",
     "//": "This could use a better name, I just wanted to differentiate it from assault rifles, as it also has a burst mode",
-    "name": { "str": "NATO assault rifle with burst" },
+    "name": { "str": "NATO assault rifle with burst", "str_pl": "NATO assault rifles with burst" },
     "description": "An assault rifle used by a NATO member state.  Unlike other assault rifles, this one has a burst fire mode in addition to semi-automatic and fully-automatic modes.  As per NATO's STANAG agreement, it is chambered in 5.56x45mm.",
     "variants": [
       {

data/json/mapgen/bike_shop.json

@@ -33,7 +33,7 @@
         "                        "
       ],
       "palettes": [ "bike_shop" ],
-      "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "&": { "item": "trash", "chance": 70 },
         "@": { "item": "trash", "chance": 90 },
@@ -158,7 +158,7 @@
         "l": { "item": "jackets", "chance": 60 },
         "r": { "item": "bikeshop_tools", "chance": 80, "repeat": [ 1, 4 ] }
       },
-      "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "place_vehicles": [
         { "vehicle": "bikeshop", "x": 6, "y": 7, "chance": 60, "status": 0, "rotation": 270 },
         { "vehicle": "bikeshop", "x": 21, "y": 7, "chance": 90, "rotation": 270 },

data/json/mapgen/bus_station.json

@@ -92,7 +92,7 @@
         { "vehicle": "buses", "x": 35, "y": [ 6, 7 ], "chance": 35, "status": 0, "rotation": 360 },
         { "vehicle": "buses", "x": 35, "y": [ 16, 17 ], "chance": 35, "status": 0, "rotation": 360 }
       ],
-      "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 } },
       "toilets": { "T": {  } }
     }
   },

data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json

@@ -59,7 +59,7 @@
         ")": "f_exercise",
         "}": [ "f_ergometer", "f_ergometer_mechanical" ]
       },
-      "vendingmachines": { "[": { "item_group": "vending_drink" }, "(": { "item_group": "vending_food" } },
+      "vendingmachines": { "[": { "item_group": "vending_drink", "lootable": true }, "(": { "item_group": "vending_food", "lootable": true } },
       "set": [
         { "point": "trap", "id": "tr_rollmat", "x": [ 9, 11 ], "y": 11 },
         { "point": "trap", "id": "tr_rollmat", "x": [ 9, 11 ], "y": 12 }
@@ -128,7 +128,7 @@
         "m": "f_glass_fridge",
         "0": "f_table"
       },
-      "vendingmachines": { "[": { "item_group": "vending_drink" }, "(": { "item_group": "vending_food" } },
+      "vendingmachines": { "[": { "item_group": "vending_drink", "lootable": true }, "(": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "1": [ { "item": "beauty", "chance": 30, "repeat": [ 1, 2 ] } ],
         "2": [ { "item": "vitamin_shop", "chance": 30, "repeat": [ 1, 2 ] } ],

data/json/mapgen/field_football.json

@@ -186,7 +186,7 @@
         "                                                                                                                        "
       ],
       "palettes": [ "field_football" ],
-      "vendingmachines": { "V": { "item_group": "vending_drink" } },
+      "vendingmachines": { "V": { "item_group": "vending_drink", "lootable": true } },
       "toilets": { ";": {  } },
       "set": [
         { "point": "terrain", "id": "t_dirt", "x": [ 0, 2 ], "y": [ 0, 23 ], "repeat": [ 18, 24 ] },

data/json/mapgen/garage_gas.json

@@ -72,7 +72,10 @@
       },
       "gaspumps": { "&": {  } },
       "toilets": { "t": {  } },
-      "place_vendingmachines": [ { "item_group": "vending_food", "x": 31, "y": 6 }, { "item_group": "vending_drink", "x": 32, "y": 6 } ],
+      "place_vendingmachines": [
+        { "item_group": "vending_food", "x": 31, "y": 6, "lootable": true },
+        { "item_group": "vending_drink", "x": 32, "y": 6, "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 ] },

data/json/mapgen/helipad.json

@@ -115,7 +115,7 @@
         "H": { "item": "SUS_spice_collection", "chance": 75 },
         "&": { "item": "SUS_toilet", "chance": 50 }
       },
-      "vendingmachines": { "1": { "item_group": "vending_drink" }, "2": { "item_group": "vending_food" } },
+      "vendingmachines": { "1": { "item_group": "vending_drink", "lootable": true }, "2": { "item_group": "vending_food", "lootable": true } },
       "place_monsters": [ { "monster": "GROUP_MIL_STRONG", "x": 36, "y": 15 }, { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 30, "density": 2 } ],
       "monster": { "T": { "monster": "mon_turret_rifle" } },
       "place_vehicles": [

data/json/mapgen/homeless_shelter.json

@@ -102,7 +102,7 @@
       "F": { "item": "file_room", "chance": 70, "repeat": [ 1, 3 ] },
       "m": { "item": "drugs_heal_simple", "chance": 70, "repeat": [ 1, 4 ] }
     },
-    "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 } }
   },
   {
     "type": "mapgen",

data/json/mapgen/hospital.json

@@ -87,7 +87,7 @@
       "palettes": [ "hospital" ],
       "terrain": { "5": "t_floor", "H": "t_floor", "X": "t_door_metal_locked" },
       "furniture": { "H": "f_locker" },
-      "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "computers": {
         "5": {
           "name": "Medical Supply Access",

data/json/mapgen/hotel_tower.json

@@ -577,7 +577,7 @@
         { "point": "trap", "id": "tr_rollmat", "x": [ 56, 61 ], "y": 19, "repeat": [ 2, 4 ] }
       ],
       "terrain": { "=": "t_door_locked_interior", ".": "t_thconc_floor", "|": "t_concrete_wall", "-": "t_concrete_wall" },
-      "vendingmachines": { "U": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "U": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "items": { "l": { "item": "cleaning", "chance": 60 } },
       "item": { "r": { "item": "towel", "chance": 2, "amount": [ 1, 2 ] } },
       "toilets": { "&": {  } },

data/json/mapgen/junkyard.json

@@ -34,7 +34,7 @@
       ],
       "palettes": [ "junkyard_palette" ],
       "place_toilets": [ { "x": 12, "y": 13 } ],
-      "vendingmachines": { "K": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "K": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "place_loot": [ { "item": "television", "x": 17, "y": 9, "chance": 100 } ],
       "place_items": [
         { "chance": 25, "item": "cubical_office", "x": [ 18, 19 ], "y": 12 },

data/json/mapgen/mall/mall_basement.json

@@ -56,7 +56,7 @@
         "F": "t_linoleum_gray"
       },
       "furniture": { "{": "f_bench", "}": "f_bench", "Y": "f_trashcan" },
-      "vendingmachines": { "(": { "item_group": "vending_drink" }, ")": { "item_group": "vending_food" } },
+      "vendingmachines": { "(": { "item_group": "vending_drink", "lootable": true }, ")": { "item_group": "vending_food", "lootable": true } },
       "place_monsters": [ { "monster": "GROUP_MALL", "x": [ 72, 95 ], "y": [ 8, 23 ], "density": 0.4 } ]
     }
   },
@@ -168,7 +168,7 @@
         ")": "t_linoleum_gray"
       },
       "furniture": { "{": "f_bench", "}": "f_bench", "Y": "f_trashcan" },
-      "vendingmachines": { "(": { "item_group": "vending_drink" }, ")": { "item_group": "vending_food" } },
+      "vendingmachines": { "(": { "item_group": "vending_drink", "lootable": true }, ")": { "item_group": "vending_food", "lootable": true } },
       "place_monsters": [ { "monster": "GROUP_MALL", "x": [ 24, 47 ], "y": [ 10, 23 ], "density": 0.3 } ]
     }
   }

data/json/mapgen/mall/mall_ground.json

@@ -138,7 +138,10 @@
         "F": "t_linoleum_gray"
       },
       "furniture": { "%": [ "f_indoor_plant", "f_indoor_plant_y" ], "*": "f_trashcan" },
-      "place_vendingmachines": [ { "item_group": "vending_food", "x": 99, "y": 6 }, { "item_group": "vending_drink", "x": 100, "y": 6 } ],
+      "place_vendingmachines": [
+        { "item_group": "vending_food", "x": 99, "y": 6, "lootable": true },
+        { "item_group": "vending_drink", "x": 100, "y": 6, "lootable": true }
+      ],
       "items": {
         "d": [
           { "item": "jackets", "chance": 40 },
@@ -528,7 +531,10 @@
         "A": "t_linoleum_white",
         "!": "t_linoleum_white"
       },
-      "place_vendingmachines": [ { "item_group": "vending_drink", "x": 74, "y": 17 }, { "item_group": "vending_food", "x": 74, "y": 18 } ],
+      "place_vendingmachines": [
+        { "item_group": "vending_drink", "x": 74, "y": 17, "lootable": true },
+        { "item_group": "vending_food", "x": 74, "y": 18, "lootable": true }
+      ],
       "sealed_item": {
         "1": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" },
         "{": { "item": { "item": "seed_rose" }, "furniture": "f_planter_harvest" }
@@ -1357,7 +1363,10 @@
         { "item": "mattress", "x": [ 13, 15 ], "y": 20, "chance": 90, "repeat": [ 2, 6 ] },
         { "item": "down_mattress", "x": [ 13, 15 ], "y": 22, "chance": 70, "repeat": [ 2, 6 ] }
       ],
-      "place_vendingmachines": [ { "item_group": "vending_drink", "x": 4, "y": 12 }, { "item_group": "vending_food", "x": 4, "y": 13 } ],
+      "place_vendingmachines": [
+        { "item_group": "vending_drink", "x": 4, "y": 12, "lootable": true },
+        { "item_group": "vending_food", "x": 4, "y": 13, "lootable": true }
+      ],
       "items": {
         "d": [
           { "item": "jackets", "chance": 40 },

data/json/mapgen/marina.json

@@ -170,7 +170,10 @@
         "T": [ "f_table" ]
       },
       "toilets": { "&": {  } },
-      "place_vendingmachines": [ { "item_group": "vending_food", "x": 13, "y": 59 }, { "item_group": "vending_drink", "x": 13, "y": 60 } ],
+      "place_vendingmachines": [
+        { "item_group": "vending_food", "x": 13, "y": 59, "lootable": true },
+        { "item_group": "vending_drink", "x": 13, "y": 60, "lootable": true }
+      ],
       "items": {
         "f": { "item": "fridge", "chance": 70, "repeat": [ 1, 3 ] },
         "e": { "item": "novels", "chance": 70, "repeat": [ 2, 4 ] },

data/json/mapgen/motel.json

@@ -220,9 +220,9 @@
         "Y": "f_rack_coat"
       },
       "place_vendingmachines": [
-        { "item_group": "vending_food", "x": 18, "y": 6 },
-        { "item_group": "vending_food", "x": 18, "y": 7 },
-        { "item_group": "vending_drink", "x": 18, "y": 9 }
+        { "item_group": "vending_food", "x": 18, "y": 6, "lootable": true },
+        { "item_group": "vending_food", "x": 18, "y": 7, "lootable": true },
+        { "item_group": "vending_drink", "x": 18, "y": 9, "lootable": true }
       ],
       "toilets": { ";": {  } },
       "items": { "Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] } },
@@ -906,7 +906,7 @@
         "G": "f_oven",
         "0": "f_dive_block"
       },
-      "place_vendingmachines": [ { "x": 18, "y": 6 }, { "x": 18, "y": 7 }, { "x": 18, "y": 9 } ],
+      "place_vendingmachines": [ { "x": 18, "y": 6, "lootable": true }, { "x": 18, "y": 7, "lootable": true }, { "x": 18, "y": 9, "lootable": true } ],
       "toilets": { ";": {  } },
       "set": [
         { "point": "terrain", "id": "t_dirt", "x": 0, "y": [ 0, 23 ], "repeat": [ 5, 10 ] },

data/json/mapgen/movie_theater.json

@@ -87,7 +87,7 @@
       "palettes": [ "movie_theater_palette.json" ],
       "terrain": { "#": "t_thconc_floor", "H": "t_thconc_floor", "y": "t_thconc_floor" },
       "toilets": { "&": {  } },
-      "vendingmachines": { "v": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "&": { "item": "alcohol", "chance": 10 },
         "T": { "item": "snacks", "chance": 5 },

data/json/mapgen/musicstore.json

@@ -70,7 +70,7 @@
         "7": "f_speaker_cabinet",
         "r": "f_rack"
       },
-      "vendingmachines": { "1": { "item_group": "vending_drink" }, "2": { "item_group": "vending_food" } },
+      "vendingmachines": { "1": { "item_group": "vending_drink", "lootable": true }, "2": { "item_group": "vending_food", "lootable": true } },
       "toilets": { "T": {  } },
       "place_loot": [
         { "group": "mussto_stringinst", "x": [ 5, 10 ], "y": 10, "chance": 70, "repeat": [ 1, 3 ] },

data/json/mapgen/nested/npc_nested_spawns.json

@@ -4,5 +4,11 @@
     "method": "json",
     "nested_mapgen_id": "NPC_lighthouse_man_spawn",
     "object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "NPC_lighthouse_man", "x": 0, "y": 0 } ] }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "NPC_meteorologist_spawn",
+    "object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "NPC_meteorologist", "x": 0, "y": 0 } ] }
   }
 ]

data/json/mapgen/nested/retail_nested.json

@@ -1083,7 +1083,7 @@
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ]
       },
-      "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ],
         "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ]
@@ -1114,7 +1114,7 @@
         "F": "f_vending_c",
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ]
       },
-      "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ]
       }
@@ -1144,7 +1144,7 @@
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "?": "f_console_broken"
       },
-      "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ],
         "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ]
@@ -1213,7 +1213,7 @@
         "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ],
         "?": "f_console_broken"
       },
-      "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ],
         "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ]
@@ -1246,7 +1246,7 @@
         "y": [ "f_indoor_plant", "f_indoor_plant_y" ],
         "z": [ [ "f_cardboard_box", 5 ], "f_crate_c" ]
       },
-      "vendingmachines": { "D": { "item_group": "vending_drink" }, "F": { "item_group": "vending_food" } },
+      "vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "C": [ { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] } ],
         "G": [ { "item": "jackets", "chance": 30, "repeat": [ 0, 1 ] }, { "item": "bags", "chance": 30, "repeat": [ 0, 1 ] } ]

data/json/mapgen/office_cubical.json

@@ -57,7 +57,7 @@
         "t": "f_table",
         "x": "f_console_broken"
       },
-      "vendingmachines": { "V": {  } },
+      "vendingmachines": { "V": { "lootable": true } },
       "toilets": { "T": {  } },
       "place_loot": [
         { "group": "dining", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 20, "repeat": [ 1, 2 ] },
@@ -194,7 +194,7 @@
         "t": "f_table",
         "x": "f_console_broken"
       },
-      "vendingmachines": { "V": {  } },
+      "vendingmachines": { "V": { "lootable": true } },
       "toilets": { "T": {  } },
       "items": {
         "o": { "item": "novels", "chance": 70 },

data/json/mapgen/office_tower_2.json

@@ -111,7 +111,7 @@
         "X": "f_crate_c",
         "l": "f_locker"
       },
-      "place_vendingmachines": [ { "x": 17, "y": 21 }, { "x": 17, "y": 23 } ],
+      "place_vendingmachines": [ { "x": 17, "y": 21, "lootable": true }, { "x": 17, "y": 23, "lootable": true } ],
       "toilets": { ";": {  } },
       "place_items": [
         { "item": "office_mess", "x": [ 8, 23 ], "y": [ 4, 10 ], "chance": 100, "repeat": [ 20, 70 ] },
@@ -219,7 +219,7 @@
         "X": "f_crate_c",
         "l": "f_locker"
       },
-      "place_vendingmachines": [ { "x": 17, "y": 21 }, { "x": 17, "y": 23 } ],
+      "place_vendingmachines": [ { "x": 17, "y": 21, "lootable": true }, { "x": 17, "y": 23, "lootable": true } ],
       "toilets": { ";": {  } },
       "place_items": [
         { "item": "office_mess", "x": [ 8, 23 ], "y": [ 4, 10 ], "chance": 100, "repeat": [ 20, 70 ] },

data/json/mapgen/park.json

@@ -593,7 +593,7 @@
         "'''u'''''''''''''''u''''"
       ],
       "palettes": [ "park_scenic_palette" ],
-      "vendingmachines": { "v": { "item_group": "vending_drink" } },
+      "vendingmachines": { "v": { "item_group": "vending_drink", "lootable": true } },
       "items": { "X": [ { "item": "trash", "chance": 75, "repeat": [ 2, 7 ] }, { "item": "vending_drink_items", "chance": 25 } ] },
       "monsters": {
         "'": { "monster": "GROUP_PARK_SCENIC", "chance": 200 },

data/json/mapgen/pharmacy.json

@@ -213,7 +213,7 @@
         "x": "f_glass_cabinet"
       },
       "toilets": { "T": {  } },
-      "vendingmachines": { "l": { "item_group": "vending_drink" }, "m": { "item_group": "vending_food" } },
+      "vendingmachines": { "l": { "item_group": "vending_drink", "lootable": true }, "m": { "item_group": "vending_food", "lootable": true } },
       "items": {
         "#": [ { "item": "snacks", "chance": 10 } ],
         "f": { "item": "fridgesnacks", "chance": 60, "repeat": [ 1, 12 ] },

data/json/mapgen/railroad/railroad_station.json

@@ -121,10 +121,10 @@
         { "monster": "GROUP_ZOMBIE", "x": [ 49, 70 ], "y": [ 73, 94 ], "repeat": [ 0, 1 ], "density": 1 }
       ],
       "vendingmachines": {
-        "6": { "item_group": "vending_drink" },
-        "7": { "item_group": "vending_food" },
-        "8": { "item_group": "vending_drink" },
-        "9": { "item_group": "vending_food" }
+        "6": { "item_group": "vending_drink", "lootable": true },
+        "7": { "item_group": "vending_food", "lootable": true },
+        "8": { "item_group": "vending_drink", "lootable": true },
+        "9": { "item_group": "vending_food", "lootable": true }
       },
       "place_vehicles": [
         { "vehicle": "train_electrical_loco1300", "x": 5, "y": 90, "chance": 5, "rotation": 90, "status": -1 },