Tool name to object

data/json/items/melee/bludgeons.json

@@ -526,8 +526,7 @@
     "id": "l-stick_on",
     "copy-from": "l-stick",
     "type": "TOOL",
-    "name": "L-stick (on)",
-    "name_plural": "L-sticks (on)",
+    "name": { "str": "L-stick (on)", "str_pl": "L-sticks (on)" },
     "description": "Produced by the Light corporation, this stylish staff not only functions as a light source, but doubles as a light-weight weapon, due to the superalloy materials it is made of.  Due to proprietary efficiency improvements over standard light sources, the L-stick or light stick as it is commonly called, batteries last longer than other light sources.  The staff is glowing brightly, which is slowly draining the batteries.",
     "material": [ "superalloy", "steel" ],
     "revert_to": "l-stick",

data/json/items/melee/knives_kitchen.json

@@ -10,8 +10,7 @@
   },
   {
     "id": "knife_butcher",
-    "name": "butcher knife",
-    "name_plural": "butcher knives",
+    "name": { "str": "butcher knife", "str_pl": "butcher knives" },
     "type": "TOOL",
     "category": "weapons",
     "description": "This is a sharp, heavy knife.  It makes a good melee weapon, and is an ideal item for butchering corpses.",

data/json/items/melee/swords_and_blades.json

@@ -1452,8 +1452,7 @@
     "id": "cs_lajatang_off",
     "type": "TOOL",
     "category": "weapons",
-    "name": "chainsaw lajatang (off)",
-    "name_plural": "chainsaw lajatangs (off)",
+    "name": { "str": "chainsaw lajatang (off)", "str_pl": "chainsaw lajatangs (off)" },
     "description": "A long wooden pole with chainsaws impractically attached to both ends.  The product of either genius or insanity, but not both; the weight ensures that only someone both strong and very skilled could possibly hope to use it.",
     "weight": "14254 g",
     "volume": "7500 ml",
@@ -1567,8 +1566,7 @@
     "id": "combatsaw_off",
     "type": "TOOL",
     "category": "weapons",
-    "name": "combat chainsaw (off)",
-    "name_plural": "combat chainsaws (off)",
+    "name": { "str": "combat chainsaw (off)", "str_pl": "combat chainsaws (off)" },
     "description": "This is a chainsaw that has been lightened, tuned, and extensively modified to be a more effective weapon.  Unfortunately these modifications have rendered it much less effective as a woodcutting tool.",
     "weight": "5122 g",
     "volume": "2250 ml",

data/json/items/tool/electronics.json

@@ -2,8 +2,7 @@
   {
     "id": "adv_UPS_off",
     "type": "TOOL",
-    "name": "advanced UPS",
-    "name_plural": "advanced UPS's",
+    "name": { "str": "advanced UPS", "str_pl": "advanced UPS's" },
     "description": "This is an advanced version of the unified power supply, or UPS.  This device has been significantly redesigned to provide better efficiency as well as to consume plutonium fuel cells rather than batteries.  Sadly, its plutonium reactor can't be charged in UPS charging station.",
     "weight": "453 g",
     "volume": "2 L",
@@ -83,8 +82,7 @@
   {
     "id": "cell_phone",
     "type": "TOOL",
-    "name": "cellphone",
-    "name_plural": "cellphones",
+    "name": { "str": "cellphone" },
     "description": "This is a cellphone, an older cousin of a smartphone but still popular in certain circles due to its reliability, sturdiness and the ability to run on common batteries.  Using this cellphone will turn it on and provide light, assuming it is sufficiently charged.  It also has a clock app that includes an alarm.",
     "weight": "226 g",
     "volume": "100 ml",
@@ -124,8 +122,7 @@
     "id": "cell_phone_flashlight",
     "copy-from": "cell_phone",
     "type": "TOOL",
-    "name": "cellphone - Flashlight",
-    "name_plural": "cellphones - Flashlight",
+    "name": { "str": "cellphone - Flashlight", "str_pl": "cellphones - Flashlight" },
     "power_draw": 500,
     "revert_to": "cell_phone",
     "use_action": { "target": "cell_phone", "msg": "You stop lighting up the screen.", "menu_text": "Turn off", "type": "transform" },

data/json/items/tool/misc.json

@@ -621,8 +621,7 @@
   {
     "id": "testflames",
     "type": "TOOL",
-    "name": "Flaming Chunk of Steel +2",
-    "name_plural": "Flaming Chunks of Steel +2",
+    "name": { "str": "Flaming Chunk of Steel +2", "str_pl": "Flaming Chunks of Steel +2" },
     "description": "HOLY SHIT THIS THING IS ON FIRE",
     "weight": "64 g",
     "volume": "250 ml",

data/json/items/tool/science.json

@@ -3,8 +3,7 @@
     "id": "barometer",
     "type": "TOOL",
     "category": "tools",
-    "name": "barometer",
-    "name_plural": "barometers",
+    "name": { "str": "barometer" },
     "description": "A plastic barometer that can read the atmospheric pressure.",
     "weight": "1 g",
     "volume": "250 ml",

data/json/items/tool/woodworking.json

@@ -20,8 +20,7 @@
   {
     "id": "chainsaw_off",
     "type": "TOOL",
-    "name": "chainsaw (off)",
-    "name_plural": "chainsaws (off)",
+    "name": { "str": "chainsaw (off)", "str_pl": "chainsaws (off)" },
     "description": "This is a lumbering tool moonlighting as weapon of opportunity.  If loaded with gas, using this item will cause it to turn on, turning it into a very powerful but unwieldy melee weapon.",
     "weight": "6577 g",
     "volume": "2500 ml",
@@ -58,8 +57,7 @@
   {
     "id": "circsaw_off",
     "type": "TOOL",
-    "name": "circular saw (off)",
-    "name_plural": "circular saws (off)",
+    "name": { "str": "circular saw (off)", "str_pl": "circular saws (off)" },
     "description": "A lightweight handheld cordless circular saw.  Spins a circular blade fast enough to cut wood, zombies, or in an emergency, pizza.  The blade, while effective in combat, is hard to hit with due to its small size.",
     "weight": "2940 g",
     "volume": "750 ml",
@@ -86,8 +84,7 @@
     "id": "circsaw_on",
     "copy-from": "circsaw_off",
     "type": "TOOL",
-    "name": "circular saw (on)",
-    "name_plural": "circular saws (on)",
+    "name": { "str": "circular saw (on)", "str_pl": "circular saws (on)" },
     "//": "Circular saw would be very fast but imprecise butchering tool - alas the qualities are not separate and so speed is sacrificed.",
     "description": "A lightweight handheld cordless circular saw.  It is currently on and the blade is spinning; use this item to turn it off.",
     "cutting": 50,

data/json/items/tool/workshop.json

@@ -550,8 +550,7 @@
   {
     "id": "oxy_torch",
     "type": "TOOL",
-    "name": "acetylene torch",
-    "name_plural": "acetylene torches",
+    "name": { "str": "acetylene torch", "str_pl": "acetylene torches" },
     "description": "A compact tool kit intended for welding and cutting metal, this portable oxyacetylene torch includes a torch handle and cutting attachment in an easy-to-carry tote.  It requires connecting to pressurized cylinders of an appropriate welding gas before use.  In addition to its metalworking uses, you can activate it in order to destroy metal barriers.",
     "weight": "1600 g",
     "volume": "1 L",
@@ -1008,8 +1007,7 @@
   {
     "id": "xacto",
     "type": "TOOL",
-    "name": "X-Acto knife",
-    "name_plural": "X-Acto knives",
+    "name": { "str": "X-Acto knife", "str_pl": "X-Acto knives" },
     "description": "This is a small, sharp knife, designed for making precise cuts for textiles or crafts.  It could cause decent damage, but is difficult to hit things with it.  Its small, sharp blade allows for precision strikes in the hands of the skilled.  It is too small to butcher corpses with.",
     "weight": "23 g",
     "volume": "20 ml",