Armor name to object, volume to string and add volume

data/json/items/armor/cloaks.json

@@ -66,7 +66,7 @@
   {
     "id": "cloak_fur",
     "type": "ARMOR",
-    "name": "fur cloak",
+    "name": { "str": "fur cloak" },
     "description": "A heavy fur cloak meant to be thrown over your body.",
     "weight": "1735 g",
     "volume": "4 L",

data/json/items/armor/coats.json

@@ -48,7 +48,7 @@
   {
     "id": "coat_fur",
     "type": "ARMOR",
-    "name": "fur coat",
+    "name": { "str": "fur coat" },
     "description": "A fur coat with a couple small pockets.  Extremely warm.",
     "weight": "1677 g",
     "volume": "5750 ml",
@@ -217,7 +217,7 @@
   {
     "id": "duster_fur",
     "type": "ARMOR",
-    "name": "fur duster",
+    "name": { "str": "fur duster" },
     "description": "A thick fur full-length duster.  Has many pockets for storage.",
     "weight": "2362 g",
     "volume": "9750 ml",
@@ -1093,7 +1093,7 @@
   {
     "id": "trenchcoat_fur",
     "type": "ARMOR",
-    "name": "fur trenchcoat",
+    "name": { "str": "fur trenchcoat" },
     "description": "A thick fur trenchcoat, lined with pockets.  Great for storage.",
     "weight": "1750 g",
     "volume": "7250 ml",

data/json/items/armor/hats.json

@@ -219,7 +219,7 @@
   {
     "id": "hat_fur",
     "type": "ARMOR",
-    "name": "fur hat",
+    "name": { "str": "fur hat" },
     "description": "A hat made from the pelts of animals.  Extremely warm.",
     "weight": "246 g",
     "volume": "750 ml",

data/json/items/armor/jewelry.json

@@ -738,10 +738,10 @@
   {
     "id": "gold_bracelet",
     "type": "ARMOR",
-    "name": "gold bracelet",
+    "name": { "str": "gold bracelet" },
     "description": "A fancy golden bracelet.  You can wear it if you like, but it won't provide any effects.",
     "weight": "40 g",
-    "volume": 0,
+    "volume": "25 ml",
     "price": 46000,
     "price_postapoc": 1000,
     "material": [ "gold" ],
@@ -752,10 +752,10 @@
   {
     "id": "gold_dental_grill",
     "type": "ARMOR",
-    "name": "gold dental grill",
+    "name": { "str": "gold dental grill" },
     "description": "Fake golden teeth, worn over the teeth.  Fits horribly, but looks very shiny.",
     "weight": "10 g",
-    "volume": 0,
+    "volume": "50 ml",
     "price": 20000,
     "price_postapoc": 500,
     "bashing": 2,
@@ -783,10 +783,10 @@
   {
     "id": "gold_hairpin",
     "type": "ARMOR",
-    "name": "gold hairpin",
+    "name": { "str": "gold hairpin" },
     "description": "A gold hairpin, designed by the rich, for the rich.  You can wear it if you like, but it won't provide any effects.",
     "weight": "4 g",
-    "volume": 0,
+    "volume": "10 ml",
     "price": 5000,
     "price_postapoc": 100,
     "material": [ "gold" ],
@@ -797,10 +797,10 @@
   {
     "id": "gold_locket",
     "type": "ARMOR",
-    "name": "gold locket",
+    "name": { "str": "gold locket" },
     "description": "A heart-shaped, gold locket with a frame inside to store photographs or small objects.  You can wear it if you like, but it won't provide any effects.",
     "weight": "50 g",
-    "volume": 0,
+    "volume": "25 ml",
     "price": 20000,
     "price_postapoc": 1900,
     "material": [ "gold" ],
@@ -811,10 +811,10 @@
   {
     "id": "gold_medal",
     "type": "ARMOR",
-    "name": "gold medal",
+    "name": { "str": "gold medal" },
     "description": "A medal awarded for achieving first place in some event.  Before everything fell apart, this could be a source of pride for its owner.  Now it's just another shiny bauble.",
     "weight": "30 g",
-    "volume": 0,
+    "volume": "25 ml",
     "price": 10000,
     "price_postapoc": 2900,
     "material": [ "gold" ],
@@ -825,10 +825,10 @@
   {
     "id": "gold_necklace",
     "type": "ARMOR",
-    "name": "gold necklace",
+    "name": { "str": "gold necklace" },
     "description": "A shiny, unadorned gold necklace.  You can wear it if you like, but it won't provide any effects.",
     "weight": "30 g",
-    "volume": 0,
+    "volume": "50 ml",
     "price": 40000,
     "price_postapoc": 5000,
     "material": [ "gold" ],
@@ -839,10 +839,10 @@
   {
     "id": "gold_ring",
     "type": "ARMOR",
-    "name": "gold ring",
+    "name": { "str": "gold ring" },
     "description": "A flashy gold ring.  You can wear it if you like, but it won't provide any effects.",
     "weight": "10 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 30000,
     "price_postapoc": 6000,
     "material": [ "gold" ],
@@ -1407,7 +1407,7 @@
   {
     "id": "fur_cat_tail",
     "type": "ARMOR",
-    "name": "fuzzy cat tail",
+    "name": { "str": "fuzzy cat tail" },
     "description": "A fuzzy tawny tail weighted down with tiny beads of plastic.  Sways behind you when you walk.",
     "weight": "80 g",
     "volume": "250 ml",
@@ -1431,7 +1431,7 @@
   {
     "id": "fur_collar",
     "type": "ARMOR",
-    "name": "fur kitty collar",
+    "name": { "str": "fur kitty collar" },
     "description": "A decorative 'collar' made out of fur, complete with a little bell hanging from the front.  Don't worry, it's silent.",
     "weight": "10 g",
     "volume": "250 ml",

data/json/items/armor/legs_clothes.json

@@ -234,7 +234,7 @@
   {
     "id": "loincloth_fur",
     "type": "ARMOR",
-    "name": "fur loincloth",
+    "name": { "str": "fur loincloth" },
     "description": "A fur pelt tied into a loincloth.  Covers your modesty, but not much else.  Now you are a true barbarian warrior.",
     "weight": "64 g",
     "volume": "250 ml",

data/json/items/armor/misc.json

@@ -36,7 +36,7 @@
   {
     "id": "crown_golden",
     "type": "ARMOR",
-    "name": "golden crown",
+    "name": { "str": "golden crown" },
     "description": "A delicate golden crown featuring flowering trees.",
     "weight": "1000 g",
     "volume": "1 L",
@@ -54,7 +54,7 @@
   {
     "id": "crown_golden_survivor",
     "type": "ARMOR",
-    "name": "golden crown",
+    "name": { "str": "golden crown" },
     "description": "A golden crown for the monarch of survivors.",
     "weight": "1000 g",
     "volume": "1 L",
@@ -124,7 +124,7 @@
   {
     "id": "sleeping_bag_fur",
     "type": "ARMOR",
-    "name": "fur sleeping bag",
+    "name": { "str": "fur sleeping bag" },
     "description": "A large sleeping bag lined with fur.  Who needs a tent?",
     "weight": "1175 g",
     "volume": "4500 ml",

data/json/items/armor/storage.json

@@ -59,7 +59,7 @@
     "id": "backpack_giant",
     "repairs_like": "bigback",
     "type": "ARMOR",
-    "name": "giant novelty backpack",
+    "name": { "str": "giant novelty backpack" },
     "description": "A huge fabric backpack made mostly as a joke before the Cataclysm.  Now, it's still rather silly, but it can store a lot of stuff.",
     "weight": "1200 g",
     "volume": "8750 ml",

data/json/items/armor/suits_protection.json

@@ -103,7 +103,7 @@
     "id": "armor_farmor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "fur body armor",
+    "name": { "str": "fur body armor" },
     "description": "Thick body armor made from furs.  Warm and comfortable.",
     "weight": "3414 g",
     "volume": "10 L",
@@ -503,7 +503,7 @@
   {
     "id": "gambeson",
     "type": "ARMOR",
-    "name": "gambeson",
+    "name": { "str": "gambeson" },
     "description": "A thick jacket of quilted fabric, designed to be worn underneath mail or other armor.  Or worn on its own, if you can't afford proper armor.",
     "weight": "453 g",
     "volume": "3 L",

data/json/items/armor/undergarment.json

@@ -73,7 +73,7 @@
   {
     "id": "bikini_top_fur",
     "type": "ARMOR",
-    "name": "fur bikini top",
+    "name": { "str": "fur bikini top" },
     "description": "A simple fur bikini top.",
     "weight": "44 g",
     "volume": "250 ml",
@@ -235,7 +235,7 @@
   {
     "id": "chestwrap_fur",
     "type": "ARMOR",
-    "name": "fur chestwrap",
+    "name": { "str": "fur chestwrap" },
     "description": "Fur pelts wrapped around the chest.  Preserves your modesty and keeps things out of the way, but not good for much else.",
     "weight": "154 g",
     "volume": "750 ml",

data/json/items/generic/bedding.json

@@ -64,7 +64,7 @@
   {
     "id": "fur_blanket",
     "type": "ARMOR",
-    "name": "fur blanket",
+    "name": { "str": "fur blanket" },
     "description": "A heavy fur blanket that covers most of your body.",
     "weight": "3500 g",
     "volume": "31 L",

data/json/items/tool_armor.json

@@ -70,7 +70,7 @@
   {
     "id": "gobag",
     "type": "ARMOR",
-    "name": "go bag",
+    "name": { "str": "go bag" },
     "description": "A huge duffel bag with backpack attached, both packed to the gills.  Judging by the feel, a National Guard soldier could have packed this to be ready for deployment.  Activate to unpack and enjoy.",
     "weight": "18043 g",
     "volume": "35750 ml",