Tool name to object, volume to string and add volume

data/json/items/tool/cooking.json

@@ -220,7 +220,7 @@
   {
     "id": "dehydrator",
     "type": "TOOL",
-    "name": "food dehydrator",
+    "name": { "str": "food dehydrator" },
     "description": "This is a portable electric food dehydrator.  It's powered by batteries, and could be invaluable in preserving food.",
     "weight": "4200 g",
     "volume": "4500 ml",
@@ -312,7 +312,7 @@
     "id": "food_processor",
     "type": "TOOL",
     "category": "tools",
-    "name": "food processor",
+    "name": { "str": "food processor" },
     "description": "This is a kitchen appliance capable of slicing, chopping, shredding, grinding, pureeing and mixing.",
     "weight": "3000 g",
     "volume": "2 L",

data/json/items/tool/deployable.json

@@ -88,7 +88,7 @@
   {
     "id": "folding_bicycle",
     "type": "TOOL",
-    "name": "folding bicycle",
+    "name": { "str": "folding bicycle" },
     "description": "This is a bicycle folded into a relatively portable package.",
     "weight": "9071 g",
     "volume": "21500 ml",
@@ -200,7 +200,7 @@
   {
     "id": "fiber_mat",
     "type": "TOOL",
-    "name": "fiber mat",
+    "name": { "str": "fiber mat" },
     "description": "A large mat woven from fibrous material that can be used instead of a picnic blanket, but it's more valuable as a butchery appliance.  Too thin to be used as a comfortable sleeping place.  It's rolled and ready for carrying.",
     "weight": "1000 g",
     "volume": "2500 ml",
@@ -215,7 +215,7 @@
   {
     "id": "churn",
     "type": "TOOL",
-    "name": "folded butter churn",
+    "name": { "str": "folded butter churn" },
     "description": "A large wooden container used to turn raw milk into butter and buttermilk.  This model uses a foot crank and holds three gallons of raw milk.",
     "weight": "6464 g",
     "volume": "11356 ml",

data/json/items/tool/explosives.json

@@ -271,7 +271,7 @@
     "id": "fertilizer_bomb",
     "type": "TOOL",
     "category": "weapons",
-    "name": "fertilizer bomb",
+    "name": { "str": "fertilizer bomb" },
     "description": "This is a volatile homemade explosive.  Use this item to light the fuse.  You will, of course, need a lighter or matches in your inventory to do this.  Shortly after lighting the fuse, this item will explode, so get away!",
     "weight": "1133 g",
     "volume": "750 ml",
@@ -324,10 +324,10 @@
   {
     "id": "firecracker",
     "type": "TOOL",
-    "name": "firecracker",
+    "name": { "str": "firecracker" },
     "description": "A solitary firecracker with a short fuse.  Use this item to light the fuse.  Of course, you will need a lighter or some matches to do so.  Shortly after you light the fuse it will explode, so throw it quickly!",
     "weight": "3 g",
-    "volume": 0,
+    "volume": "25 ml",
     "price": 4,
     "to_hit": -3,
     "bashing": 1,
@@ -391,7 +391,7 @@
     "id": "flashbang",
     "type": "TOOL",
     "category": "weapons",
-    "name": "flashbang",
+    "name": { "str": "flashbang" },
     "description": "This is a military police style flashbang.  Use this item to pull the pin and light the fuse.  You will then have five turns before it detonates with intense light and sound, blinding, deafening and disorienting anyone nearby.",
     "weight": "236 g",
     "volume": "250 ml",
@@ -440,7 +440,7 @@
   {
     "id": "fragment_bomb",
     "type": "TOOL",
-    "name": "fragment bomb",
+    "name": { "str": "fragment bomb" },
     "description": "A crude and bulky improvised bomb.  Made from a container, an explosive surrounded by small pieces of metal and a fuse.  Use this item to light the fuse.  You will then have five turns before it explodes; throwing it would be a good idea.",
     "category": "weapons",
     "weight": "470 g",

data/json/items/tool/fire.json

@@ -33,7 +33,7 @@
   {
     "id": "fire_drill",
     "type": "TOOL",
-    "name": "fire drill",
+    "name": { "str": "fire drill" },
     "description": "This fire drill is a simple item for starting fires; it is made from two pieces of wood and some string.  Since it is constructed out of simple materials, it's slow and rather difficult to get a fire started using this tool.",
     "weight": "240 g",
     "volume": "250 ml",
@@ -192,7 +192,7 @@
   {
     "id": "tinderbox",
     "type": "TOOL",
-    "name": "ember carrier",
+    "name": { "str": "ember carrier" },
     "description": "This is a small container for holding tinder, with holes punched in it to provide a controlled airflow.  It can nurture a smoldering ember for a long time, to start fires without modern tools.",
     "weight": "500 g",
     "volume": "500 ml",

data/json/items/tool/firefighting.json

@@ -41,7 +41,7 @@
   {
     "id": "fire_ax",
     "type": "TOOL",
-    "name": "fire axe",
+    "name": { "str": "fire axe" },
     "description": "This is a large, two-handed pickhead axe normally used by firefighters.  It makes a powerful melee weapon, but is a bit slow to recover between swings.",
     "weight": "2520 g",
     "volume": "2 L",

data/json/items/tool/lighting.json

@@ -325,7 +325,7 @@
   {
     "id": "handflare",
     "type": "TOOL",
-    "name": "flare",
+    "name": { "str": "flare" },
     "description": "This is a slow-burning magnesium flare.  Use it to strike the striker and light it.  It will produce a bright light for about a half hour.",
     "material": [ "plastic", "powder" ],
     "symbol": ";",

data/json/items/tool/med.json

@@ -93,7 +93,7 @@
   {
     "id": "smoxygen_tank",
     "type": "TOOL",
-    "name": "emergency oxygen pack",
+    "name": { "str": "emergency oxygen pack" },
     "description": "This is a small tank of compressed medical oxygen with a folding regulator and mask.  Commonly used in emergency situations, it provides immediate relief for asthma attacks or smoke inhalation, and can provide a brief burst of energy.",
     "weight": "1134 g",
     "volume": "750 ml",

data/json/items/tool/metalworking.json

@@ -153,7 +153,7 @@
     "id": "kiln_done",
     "type": "TOOL",
     "category": "tools",
-    "name": "finished charcoal kiln",
+    "name": { "str": "finished charcoal kiln" },
     "description": "A charcoal kiln that has finished burning.  Disassemble it to retrieve the charcoal and kiln.",
     "weight": "8142 g",
     "volume": "10 L",
@@ -167,7 +167,7 @@
     "id": "kiln_full",
     "type": "TOOL",
     "category": "tools",
-    "name": "filled charcoal kiln",
+    "name": { "str": "filled charcoal kiln" },
     "description": "A kiln filled with wood which will become charcoal after a slow period of burning.",
     "weight": "15142 g",
     "volume": "10 L",

data/json/items/tool/misc.json

@@ -61,7 +61,7 @@
   {
     "id": "e_tool",
     "type": "TOOL",
-    "name": "entrenching tool",
+    "name": { "str": "entrenching tool" },
     "description": "This is a stout collapsible spade.  It's commonly used by military forces and favored by hikers for digging.",
     "weight": "628 g",
     "volume": "1 L",
@@ -78,7 +78,7 @@
   {
     "id": "etched_skull",
     "type": "TOOL",
-    "name": "etched human skull",
+    "name": { "str": "etched human skull" },
     "description": "This is a human skull with strange etchings covering it.",
     "weight": "311 g",
     "volume": "750 ml",
@@ -92,7 +92,7 @@
     "id": "flamable_arrow",
     "type": "TOOL",
     "category": "ammo",
-    "name": "flammable arrow",
+    "name": { "str": "flammable arrow" },
     "description": "This arrow has a rag soaked in a flammable liquid wrapped around the shaft near the head.  You need to light it before shooting.",
     "weight": "150 g",
     "volume": "250 ml",
@@ -109,7 +109,7 @@
   {
     "id": "fur_rollmat",
     "type": "TOOL",
-    "name": "fur rollmat",
+    "name": { "str": "fur rollmat" },
     "description": "This is a bedroll made of pelts which can be rolled up for transport.  It insulates you from the floor, making it easier to sleep.  Use it to unroll and place on the ground.",
     "weight": "1800 g",
     "volume": "3 L",

data/json/items/tool/raincatchers.json

@@ -23,7 +23,7 @@
   {
     "id": "funnel",
     "type": "TOOL",
-    "name": "funnel",
+    "name": { "str": "funnel" },
     "description": "This is a funnel used to collect rainwater.  Use it outside and place a container beneath it to collect water when it rains.",
     "weight": "606 g",
     "volume": "500 ml",

data/json/items/tool/workshop.json

@@ -709,7 +709,7 @@
   {
     "id": "small_repairkit",
     "type": "TOOL",
-    "name": "firearm repair kit",
+    "name": { "str": "firearm repair kit" },
     "description": "This is a portable toolkit made to repair damaged firearms.  Powered by standard batteries, it is a vital tool for long-term firearms maintenance.  It requires 100 charges of battery power per use.",
     "weight": "2420 g",
     "volume": "1500 ml",
@@ -854,7 +854,7 @@
   {
     "id": "toolset_extended",
     "type": "TOOL",
-    "name": "extended toolset",
+    "name": { "str": "extended toolset" },
     "description": "Your toolset, protruding from your hands.  It can slice, dice, and make everything nice.",
     "symbol": "#",
     "color": "white",

data/json/items/tool_armor.json

@@ -1621,7 +1621,7 @@
     "id": "folding_poncho",
     "symbol": ",",
     "color": "yellow",
-    "name": "folded poncho",
+    "name": { "str": "folded poncho" },
     "description": "A folded lightweight plastic rain poncho with a hood.  Use it to unfold for use.",
     "price": 5000,
     "material": "plastic",
@@ -1657,7 +1657,7 @@
     "repairs_like": "sheet",
     "symbol": ",",
     "color": "light_gray",
-    "name": "folded emergency blanket",
+    "name": { "str": "folded emergency blanket" },
     "description": "A folded blanket made of space-age materials that covers your most important body parts.  Use it to unfold for use.",
     "price": 425,
     "material": "plastic",