Coolthulhu fix null tool

data/json/bionics.json

@@ -242,7 +242,7 @@
         "occupied_bodyparts": [
             [ "EYES", 2 ]
         ],
-        "description": "Much of the material in your inner eye has been removed and replaced with an array of high-powered, auto-focusing lenses.  You can now see much farther and more clearer than before, any vision problems you might have had are now gone."
+        "description": "Much of the material in your inner eye has been removed and replaced with an array of high-powered, auto-focusing lenses.  You can now see much farther and more clearly than before, any vision problems you might have had are now gone."
     },{
         "type": "bionic",
         "id": "bio_targeting",

data/json/items/archery.json

@@ -88,7 +88,7 @@
       "name" : "unfletched fire-hardened wooden arrow",
       "symbol" : "=",
       "color" : "green",
-      "description" : "A simple arrow shaft that has had a point carved into it and then fire-hardened.  Needs fletching to be worth firing from a bow.",
+      "description" : "A simple arrow shaft that has had a point carved into it and then fire-hardened.  It needs fletching to be worth firing from a bow.",
       "material" : "wood",
       "volume" : 1,
       "weight" : 42,
@@ -352,7 +352,7 @@
       "name" : "unfletched sharpened metal arrow",
       "symbol" : "=",
       "color" : "green",
-      "description" : "This metal shaft has been carefully sharpened so that it has a crude point at the end.  Needs fletching to be worth firing from a bow.",
+      "description" : "This metal shaft has been carefully sharpened so that it has a crude point at the end.  It needs fletching to be worth firing from a bow.",
       "material" : "steel",
       "volume" : 1,
       "weight" : 55,

data/json/items/armor.json

@@ -6617,7 +6617,7 @@
         "color" : "brown",
         "covers" : ["TORSO"],
         "symbol" : "[",
-        "description" : "A large leather quiver trimmed with metal, worn on the back, that can hold 60 arrows.\nHistorically used by horse archers, rather than foot archers, but neither of THEM had to fight zombies.  Activate to store arrows.",
+        "description" : "A large leather quiver trimmed with metal, worn on the back, that can hold 60 arrows.  Historically used by horse archers, rather than foot archers, but neither of THEM had to fight zombies.  Activate to store arrows.",
         "price" : 8800,
         "material" : ["leather", "steel"],
         "volume" : 6,

data/json/items/comestibles.json

@@ -8444,6 +8444,7 @@
         "material" : "flesh",
         "volume" : 2,
         "charges" : 1,
+        "stack_size" : 2,
         "fun" : 2
     },
     {
@@ -8463,8 +8464,9 @@
         "description" : "This mushy pile of vegetable matter was boiled and canned in an earlier life.  Better eat it before it oozes through your fingers.",
         "price" : 250,
         "material" : "veggy",
-        "volume" : 1,
+        "volume" : 2,
         "charges" : 1,
+        "stack_size" : 2,
         "fun" : 0
     },
     {
@@ -8484,8 +8486,9 @@
         "description" : "This sodden mass of preserved fruit was boiled and canned in an earlier life.  Bland, mushy and losing color.",
         "price" : 220,
         "material" : "fruit",
-        "volume" : 1,
+        "volume" : 2,
         "charges" : 1,
+        "stack_size" : 2,
         "fun" : 1
     },
     {
@@ -8505,8 +8508,9 @@
         "description" : "Low-sodium preserved human meat.  It was boiled and canned.  Contains most of the nutrition, but little of the savor of cooked meat.",
         "price" : 0,
         "material" : "hflesh",
-        "volume" : 1,
+        "volume" : 2,
         "charges" : 1,
+        "stack_size" : 2,
         "fun" : 2
     },
     {
@@ -8870,6 +8874,7 @@
         "material" : "veggy",
         "volume" : 1,
         "charges" : 1,
+        "stack_size" : 4,
         "fun" : -2
     },
     {
@@ -11480,8 +11485,9 @@
         "description" : "Canned tomato.  A staple in many pantries, and useful for many recipes.",
         "price" : 350,
         "material" : "veggy",
-        "volume" : 1,
+        "volume" : 2,
         "charges" : 1,
+        "stack_size" : 2,
         "fun" : 0
     },
     {

data/json/items/tools.json

@@ -775,9 +775,8 @@
     "color": "light_blue",
     "name": "active glowstick",
     "description": "This is an active glowstick and is producing light.  It will last for a few hours before burning out.",
-    "price": 0,
     "material": "plastic",
-    "flags": "LIGHT_8",
+    "flags": [ "LIGHT_8", "TRADER_AVOID" ],
     "weight": 29,
     "volume": 1,
     "to_hit": -1,
@@ -832,9 +831,8 @@
     "color": "white",
     "name": "active flare",
     "description": "This burning magnesium flare is producing light.  It will last for about a half hour before burning out.",
-    "price": 0,
     "material": ["paper", "plastic"],
-    "flags": ["FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING"],
+    "flags": [ "FIRE", "LIGHT_240", "CHARGEDIM", "FLAMING", "TRADER_AVOID" ],
     "weight": 128,
     "volume": 1,
     "bashing": 2,
@@ -4818,7 +4816,7 @@
     "color" : "red",
     "symbol" : "/",
     "material" : ["wood", "nomex"],
-    "flags": ["FIRE", "LIGHT_310", "CHARGEDIM", "FLAMING", "DURABLE_MELEE"],
+    "flags": [ "FIRE", "LIGHT_310", "CHARGEDIM", "FLAMING", "DURABLE_MELEE", "TRADER_AVOID" ],
     "techniques" : ["WBLOCK_1"],
     "volume" : 8,
     "bashing" : 18,
@@ -6904,7 +6902,7 @@
     "color": "brown",
     "name": "lit charcoal kiln",
     "description": "A kiln full of wood that has been lit; better drop it!",
-    "flags": ["LIGHT_8"],
+    "flags": [ "LIGHT_8", "TRADER_AVOID" ],
     "price": 100,
     "material": ["steel", "wood"],
     "weight": 15142,