Tool name to object

data/json/items/melee/swords_and_blades.json

@@ -1001,7 +1001,7 @@
     "id": "shock_foil",
     "type": "TOOL",
     "copy-from": "fencing_foil_sharpened",
-    "name": "electrified foil",
+    "name": { "str": "electrified foil" },
     "description": "The modifications made to this fencing foil may not be sporting, but they might give you an edge in this final competition.  Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired through the electronic scoring circuit to the tip.  Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.",
     "ammo": "battery",
     "charges_per_use": 100,
@@ -1021,7 +1021,7 @@
     "type": "TOOL",
     "copy-from": "fencing_epee_sharpened",
     "looks_like": "fencing_epee",
-    "name": "electrified épée",
+    "name": { "str": "electrified épée" },
     "description": "The modifications made to this fencing épée may not be sporting, but they might give you an edge in this final competition.  Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired through the electronic scoring circuit to the tip.  Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.",
     "ammo": "battery",
     "charges_per_use": 100,
@@ -1041,7 +1041,7 @@
     "type": "TOOL",
     "copy-from": "fencing_sabre_sharpened",
     "looks_like": "fencing_sabre",
-    "name": "electrified saber",
+    "name": { "str": "electrified saber" },
     "description": "The modifications made to this fencing saber may not be sporting, but they might give you an edge in this final competition.  Extra effort has been made to insulate the grip and a high voltage stun gun has been attached to the guard, wired to the tip along the saber's groove.  Thrusting the sharpened tip into a foe and activating the momentary switch will deliver a painful electric shock.",
     "ammo": "battery",
     "charges_per_use": 100,

data/json/items/tool/deployable.json

@@ -66,7 +66,7 @@
   {
     "id": "cot",
     "type": "TOOL",
-    "name": "cot",
+    "name": { "str": "cot" },
     "description": "This is a military style fold up cot.  While it may not be quite as comfortable as a bed, it's better than slumming it on the ground.",
     "weight": "6164 g",
     "volume": "2 L",

data/json/items/tool/electronics.json

@@ -153,7 +153,7 @@
   {
     "id": "directional_antenna",
     "type": "TOOL",
-    "name": "directional antenna",
+    "name": { "str": "directional antenna" },
     "description": "This is an antenna designed to pick up signals better when pointed at the source.  You could use this with a radio to receive faint signals.",
     "weight": "454 g",
     "volume": "500 ml",
@@ -185,7 +185,7 @@
   {
     "id": "eink_tablet_pc",
     "type": "TOOL",
-    "name": "e-ink tablet PC",
+    "name": { "str": "e-ink tablet PC" },
     "description": "A tablet PC using an efficient color e-ink display.  Before the Cataclysm, these were nifty gadgets; now, it's an almost priceless resource.  Runs on conventional batteries.",
     "weight": "250 g",
     "volume": "250 ml",
@@ -218,7 +218,7 @@
     "id": "electrohack",
     "type": "TOOL",
     "category": "tools",
-    "name": "electrohack",
+    "name": { "str": "electrohack" },
     "description": "This device has many ports attached, allowing it to connect to almost any control panel or other electronic machine (but not computers).  With a little skill, it can be used to crack passwords and more.  It requires 25 charges of battery power per use.",
     "weight": "114 g",
     "volume": "500 ml",

data/json/items/tool/entry_tools.json

@@ -2,7 +2,7 @@
   {
     "id": "crowbar",
     "type": "TOOL",
-    "name": "crowbar",
+    "name": { "str": "crowbar" },
     "description": "This is a hefty prying tool.  Use it to open locked doors without destroying them or to lift manhole covers.  You could also wield it to bash some heads in.",
     "weight": "500 g",
     "volume": "1 L",

data/json/items/tool/explosives.json

@@ -106,7 +106,7 @@
     "id": "dynamite",
     "type": "TOOL",
     "category": "weapons",
-    "name": "dynamite",
+    "name": { "str": "dynamite" },
     "description": "These are several sticks of explosives with a fuse attached.  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",

data/json/items/tool/fire.json

@@ -2,7 +2,7 @@
   {
     "id": "crude_firestarter",
     "type": "TOOL",
-    "name": "electric firestarter",
+    "name": { "str": "electric firestarter" },
     "description": "This is a crudely made electric firestarter, which can function as an inefficient lighter.",
     "weight": "14 g",
     "volume": "250 ml",

data/json/items/tool/firefighting.json

@@ -4,7 +4,7 @@
     "id": "crash_axe",
     "symbol": ";",
     "color": "light_gray",
-    "name": "crash axe",
+    "name": { "str": "crash axe" },
     "looks_like": "hatchet",
     "//": "Same stats as a hatchet, except it has prying instead of hammering.",
     "description": "A short lightweight emergency tool with a quarter circular blade, a short pick opposite the blade and an insulated handle.  Used on airplanes to chop down or pry walls or cabinets to gain access in case of fire.",

data/json/items/tool/lighting.json

@@ -292,7 +292,7 @@
     "id": "glowstick_dead",
     "type": "TOOL",
     "category": "other",
-    "name": "dead glowstick",
+    "name": { "str": "dead glowstick" },
     "description": "This is a spent glowstick.  It is essentially trash.",
     "weight": "29 g",
     "volume": "250 ml",

data/json/items/tool/metalworking.json

@@ -102,7 +102,7 @@
   {
     "id": "crucible",
     "type": "TOOL",
-    "name": "crucible",
+    "name": { "str": "crucible" },
     "description": "This is a small metalworking crucible.  It's used in some metalworking fabrication recipes.",
     "weight": "1400 g",
     "volume": "2 L",
@@ -132,7 +132,7 @@
   {
     "id": "forge",
     "type": "TOOL",
-    "name": "electric forge",
+    "name": { "str": "electric forge" },
     "description": "This is a portable electric metalworking forge, powered by batteries.  Combined with the right tools, you could use this for metalworking.  With a little mechanical know-how, you could probably even convert it to run directly off a vehicle's power system.",
     "weight": "10000 g",
     "volume": "6 L",

data/json/items/tool/misc.json

@@ -46,7 +46,7 @@
   {
     "id": "cow_bell",
     "type": "TOOL",
-    "name": "cow bell",
+    "name": { "str": "cow bell" },
     "description": "A brass cow bell.  Potentially useful in so many ways.",
     "weight": "566 g",
     "volume": "1 L",

data/json/items/tool/pets.json

@@ -19,10 +19,10 @@
   {
     "id": "dog_whistle",
     "type": "TOOL",
-    "name": "dog whistle",
+    "name": { "str": "dog whistle" },
     "description": "This is a small whistle.  When used, it produces a high tone that causes nearby friendly dogs to either follow you closely and stop attacking, or start attacking enemies if they are currently docile.",
     "weight": "22 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 1000,
     "material": "aluminum",
     "symbol": ";",

data/json/items/tool/science.json

@@ -78,7 +78,7 @@
   {
     "id": "electrolysis_kit",
     "type": "TOOL",
-    "name": "electrolysis kit",
+    "name": { "str": "electrolysis kit" },
     "description": "A set of wiring and electrodes for applying a direct current, usually to a liquid.  Useful for crafting.  Load with a storage battery or 12V vehicle battery to use.",
     "weight": "250 g",
     "volume": "250 ml",
@@ -517,7 +517,7 @@
     "id": "microscope_dissecting",
     "type": "TOOL",
     "category": "tools",
-    "name": "dissecting microscope",
+    "name": { "str": "dissecting microscope" },
     "description": "This microscope has less magnification than a standard one.  It's also stereoscopic and produces a neat 3d image of the surface.  It was typically used for doing dissections and other fine detail work on small creatures.  It still works pretty well with an added light source, but what would you do with it?",
     "weight": "2200 g",
     "volume": "4000ml",
@@ -598,15 +598,15 @@
     "id": "gelbox",
     "type": "TOOL",
     "category": "tools",
-    "name": "electrophoresis tray",
+    "name": { "str": "electrophoresis tray" },
     "description": "This is a set of plastic trays, electrodes, and a power supply designed to create an electric voltage gradient through a liquid solution containing a solid gel.  Stuff like proteins and DNA would then get separated on the gel according to electrical charge and size.  Pretty useless now, for anything but salvage.",
     "weight": "1000 g",
     "volume": "5000ml",
     "price": 500,
     "to_hit": -5,
     "bashing": 2,
     "material": [ "plastic" ],
-    "looks_like": "geiger_OFF",
+    "looks_like": "geiger_off",
     "symbol": "N",
     "color": "light_blue"
   },

data/json/items/tool/shelters.json

@@ -2,7 +2,7 @@
   {
     "id": "damaged_shelter_kit",
     "type": "TOOL",
-    "name": "damaged shelter kit",
+    "name": { "str": "damaged shelter kit" },
     "description": "This is a small shelter, made of sticks and skins.  Use it to place.  This shelter has been damaged, and needs repairs.",
     "weight": "1360 g",
     "volume": "7500 ml",

data/json/items/tool/smoking.json

@@ -35,7 +35,7 @@
   {
     "id": "crackpipe",
     "type": "TOOL",
-    "name": "crack pipe",
+    "name": { "str": "crack pipe" },
     "description": "This is a fine glass tube with a bulb with a bowl on one end.  It's used to partake of certain illicit substances.",
     "weight": "242 g",
     "volume": "250 ml",

data/json/items/tool/tailoring.json

@@ -89,7 +89,7 @@
   {
     "id": "needle_curved",
     "type": "TOOL",
-    "name": "curved needle",
+    "name": { "str": "curved needle" },
     "description": "A curved sharp needle made of steel.  Its rounded shape allows it to make stitches that only pierce one side of the material.  While unsuitable for most tailoring projects, it's a necessity for stitching neoprene.",
     "weight": "85 g",
     "volume": "250 ml",

data/json/items/tool/toileteries.json

@@ -33,7 +33,7 @@
   {
     "id": "elec_hairtrimmer",
     "type": "TOOL",
-    "name": "electric hair trimmer",
+    "name": { "str": "electric hair trimmer" },
     "description": "This is a pocket-sized electric trimmer made for cutting hair.  You can use it to cut your hair if it's supplied with batteries.  It requires 10 batteries per use.",
     "weight": "138 g",
     "volume": "250 ml",

data/json/items/tool/traps.json

@@ -156,7 +156,7 @@
   {
     "id": "crossbow_trap",
     "type": "TOOL",
-    "name": "crossbow trap",
+    "name": { "str": "crossbow trap" },
     "description": "This is a simple tripwire, which is attached to the trigger of a loaded crossbow.  When pulled, the crossbow fires.  Only a single round can be used, after which the trap is disabled.",
     "weight": "1772 g",
     "volume": "1750 ml",

data/json/items/tool/workshop.json

@@ -229,7 +229,7 @@
   {
     "id": "elec_jackhammer",
     "type": "TOOL",
-    "name": "electric jackhammer",
+    "name": { "str": "electric jackhammer" },
     "description": "This is a construction tool for drilling through hard rock or other surfaces.  It runs on a cell compatible with UPS.  Use it to blast a hole in adjacent solid terrain.",
     "weight": "40000 g",
     "volume": "5 L",
@@ -380,7 +380,7 @@
   {
     "id": "kiln",
     "type": "TOOL",
-    "name": "electric kiln",
+    "name": { "str": "electric kiln" },
     "description": "This is a portable electric kiln, powered by batteries.  It is designed for firing bricks, but you could use it to fire anything made of clay.  With a little mechanical know-how, you could probably even convert it to run directly off a vehicle's power system.",
     "weight": "12000 g",
     "volume": "7500 ml",
@@ -627,7 +627,7 @@
   {
     "id": "polisher",
     "type": "TOOL",
-    "name": "electric polisher",
+    "name": { "str": "electric polisher" },
     "description": "An electric polisher which can be used to buff metal surfaces until they are reflective like a mirror.",
     "weight": "1000 g",
     "volume": "3500 ml",