Armor name to object, fix looks_like

data/json/items/armor/belts.json

@@ -102,7 +102,7 @@
   {
     "id": "leather_belt",
     "type": "ARMOR",
-    "name": "leather belt",
+    "name": { "str": "leather belt" },
     "description": "A leather belt.  Useful for making your pair of pants fit.",
     "weight": "102 g",
     "volume": "250 ml",

data/json/items/armor/cloaks.json

@@ -87,7 +87,7 @@
   {
     "id": "cloak_leather",
     "type": "ARMOR",
-    "name": "leather cloak",
+    "name": { "str": "leather cloak" },
     "description": "A heavy leather cloak meant to be thrown over your body.  Provides decent protection.",
     "weight": "2060 g",
     "volume": "3500 ml",

data/json/items/armor/coats.json

@@ -252,7 +252,7 @@
   {
     "id": "duster_leather",
     "type": "ARMOR",
-    "name": "leather duster",
+    "name": { "str": "leather duster" },
     "description": "A thick leather full-length duster.  Has many pockets for storage.",
     "weight": "2655 g",
     "volume": "7 L",
@@ -495,7 +495,7 @@
   {
     "id": "jacket_leather",
     "type": "ARMOR",
-    "name": "leather jacket",
+    "name": { "str": "leather jacket" },
     "description": "A jacket made from thick leather.  Cumbersome, but offers excellent protection from cuts.",
     "weight": "1450 g",
     "volume": "4500 ml",
@@ -542,7 +542,7 @@
     "id": "jacket_light",
     "repairs_like": "trenchcoat",
     "type": "ARMOR",
-    "name": "light jacket",
+    "name": { "str": "light jacket" },
     "description": "A thin cotton jacket with a hood.  Good for brisk weather.",
     "weight": "227 g",
     "volume": "2250 ml",
@@ -1127,7 +1127,7 @@
   {
     "id": "trenchcoat_leather",
     "type": "ARMOR",
-    "name": "leather trenchcoat",
+    "name": { "str": "leather trenchcoat" },
     "description": "A thick leather trenchcoat, lined with pockets.  Great for storage.",
     "weight": "1967 g",
     "volume": "5250 ml",

data/json/items/armor/helmets.json

@@ -335,7 +335,7 @@
     "id": "helmet_larmor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "leather armor helmet",
+    "name": { "str": "leather armor helmet" },
     "description": "A thick leather helmet that provides excellent protection for the head.",
     "weight": "435 g",
     "volume": "2 L",

data/json/items/armor/hoods.json

@@ -67,7 +67,7 @@
     "id": "hood_lsurvivor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "light survivor hood",
+    "name": { "str": "light survivor hood" },
     "description": "A customized armored cloth and Kevlar hood, very light and durable.",
     "weight": "628 g",
     "volume": "750 ml",

data/json/items/armor/jewelry.json

@@ -1262,7 +1262,7 @@
   {
     "id": "leather_collar",
     "type": "ARMOR",
-    "name": "leather collar",
+    "name": { "str": "leather collar" },
     "description": "A black leather 'collar' with a bell dangling from the front.  Don't worry, the bell is silent.",
     "weight": "10 g",
     "volume": "250 ml",
@@ -1468,7 +1468,7 @@
   {
     "id": "leather_cat_tail",
     "type": "ARMOR",
-    "name": "leather cat tail",
+    "name": { "str": "leather cat tail" },
     "description": "A glossy black leather tail weighted down with tiny beads of plastic.  Sways behind you when you walk.",
     "weight": "80 g",
     "volume": "250 ml",

data/json/items/armor/legs_clothes.json

@@ -180,7 +180,7 @@
   {
     "id": "kilt_leather",
     "type": "ARMOR",
-    "name": "leather kilt",
+    "name": { "str": "leather kilt" },
     "description": "No true Scotsman would leave home without his kilt.",
     "weight": "1814 g",
     "volume": "1500 ml",
@@ -252,7 +252,7 @@
   {
     "id": "loincloth_leather",
     "type": "ARMOR",
-    "name": "leather loincloth",
+    "name": { "str": "leather loincloth" },
     "description": "Leather patches stitched together and tied into a makeshift loincloth.  Covers your modesty, but not much else.",
     "weight": "64 g",
     "volume": "250 ml",
@@ -571,7 +571,7 @@
     "id": "skirt_leather",
     "repairs_like": "pants_leather",
     "type": "ARMOR",
-    "name": "leather skirt",
+    "name": { "str": "leather skirt" },
     "description": "A very short leather skirt, clearly designed to look good, not be practical.",
     "weight": "230 g",
     "volume": "250 ml",

data/json/items/armor/power_armor.json

@@ -183,7 +183,7 @@
     "id": "power_armor_helmet_light",
     "type": "ARMOR",
     "category": "armor",
-    "name": "light power armor helmet",
+    "name": { "str": "light power armor helmet" },
     "description": "A power armor helmet designed for use with the DoubleTech Power Armor, Mk. II-L.  This improved design is lighter and cooler than the Mk. I helmet.  Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
     "weight": "1814 g",
     "volume": "4 L",
@@ -209,7 +209,7 @@
     "id": "power_armor_light",
     "type": "ARMOR",
     "category": "armor",
-    "name": "light power armor",
+    "name": { "str": "light power armor" },
     "description": "A suit of DoubleTech Power Armor, Mk. II-L.  This model offers several improvements over the Mk. I, most notably the reduced weight.  Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
     "weight": "7670 g",
     "volume": "15 L",

data/json/items/armor/storage.json

@@ -82,7 +82,7 @@
   {
     "id": "backpack_leather",
     "type": "ARMOR",
-    "name": "leather backpack",
+    "name": { "str": "leather backpack" },
     "description": "A small leather backpack.  Good storage for a little encumbrance.",
     "weight": "818 g",
     "volume": "2 L",

data/json/items/armor/suits_protection.json

@@ -127,7 +127,7 @@
     "id": "armor_larmor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "leather body armor",
+    "name": { "str": "leather body armor" },
     "description": "Thick leather body armor.  Light and comfortable.",
     "weight": "1498 g",
     "volume": "7 L",
@@ -195,7 +195,7 @@
   {
     "id": "armor_nomad_light",
     "type": "ARMOR",
-    "name": "light nomad gear",
+    "name": { "str": "light nomad gear" },
     "description": "A light makeshift outfit made from pre-Cataclysm clothing designed for long summer travels.  It offers less storage space and armor compared to regular nomad gear.",
     "weight": "3200 g",
     "volume": "6500 ml",
@@ -570,7 +570,7 @@
     "id": "lsurvivor_suit",
     "type": "ARMOR",
     "category": "armor",
-    "name": "light survivor suit",
+    "name": { "str": "light survivor suit" },
     "description": "A lightweight, hand-built combination armor made from a cut-down bulletproof vest and a reinforced fabric jumpsuit.  Protects from the elements as well as from harm.",
     "weight": "5100 g",
     "volume": "10500 ml",
@@ -726,7 +726,7 @@
     "id": "touring_suit",
     "repairs_like": "armor_larmor",
     "type": "ARMOR",
-    "name": "leather touring suit",
+    "name": { "str": "leather touring suit" },
     "description": "A thick leather body suit made for protection while riding motorcycles.  Light and very comfortable.",
     "weight": "2214 g",
     "volume": "6500 ml",

data/json/items/armor/torso_armor.json

@@ -299,14 +299,14 @@
     "id": "lsurvivor_armor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "light survivor body armor",
+    "name": { "str": "light survivor body armor" },
     "description": "Lightweight, custom-built body armor made from Kevlar and tough fabric.  Mostly waterproof.",
     "weight": "3000 g",
     "volume": "6 L",
     "price": 60000,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
-    "looks_like": "survivor_armor",
+    "looks_like": "lsurvivor_suit",
     "color": "green",
     "covers": [ "TORSO" ],
     "coverage": 95,

data/json/items/armor/torso_clothes.json

@@ -2,7 +2,7 @@
   {
     "id": "apron_leather",
     "type": "ARMOR",
-    "name": "leather apron",
+    "name": { "str": "leather apron" },
     "description": "An apron made of thick leather.  Cumbersome, but offers excellent protection from cuts.",
     "weight": "1950 g",
     "volume": "2250 ml",
@@ -652,7 +652,7 @@
   {
     "id": "vest_leather",
     "type": "ARMOR",
-    "name": "leather vest",
+    "name": { "str": "leather vest" },
     "description": "A vest made from thick leather.  Offers excellent protection from cuts.",
     "weight": "997 g",
     "volume": "2500 ml",

data/json/items/armor/undergarment.json

@@ -91,7 +91,7 @@
   {
     "id": "bikini_top_leather",
     "type": "ARMOR",
-    "name": "leather bikini top",
+    "name": { "str": "leather bikini top" },
     "description": "A simple leather bikini top.",
     "weight": "38 g",
     "volume": "250 ml",
@@ -254,7 +254,7 @@
   {
     "id": "chestwrap_leather",
     "type": "ARMOR",
-    "name": "leather chestwrap",
+    "name": { "str": "leather chestwrap" },
     "description": "Leather patches wrapped around the chest.  Preserves your modesty and keeps things out of the way, but not good for much else.",
     "weight": "137 g",
     "volume": "750 ml",
@@ -292,7 +292,7 @@
   {
     "id": "corset",
     "type": "ARMOR",
-    "name": "leather corset",
+    "name": { "str": "leather corset" },
     "description": "A snug, black leather corset.  Has no pockets, but its thick material provides good protection from harm.",
     "weight": "640 g",
     "volume": "1250 ml",

data/json/items/tool_armor.json

@@ -101,7 +101,7 @@
   {
     "id": "leg_splint",
     "type": "ARMOR",
-    "name": "leg splint",
+    "name": { "str": "leg splint" },
     "description": "A tool to help set bones and hold them in place.",
     "weight": "500 g",
     "volume": "1 L",
@@ -120,7 +120,7 @@
   {
     "id": "leg_xlsplint",
     "type": "ARMOR",
-    "name": "leg splint XL",
+    "name": { "str": "leg splint XL", "str_pl": "leg splints XL" },
     "description": "A tool to help set bones and hold them in place.  It is specifically designed to fit Huge people.",
     "copy-from": "leg_splint",
     "weight": "1000 g",