Armor name to object, volume to string, fix looks_like

data/json/items/armor/cloaks.json

@@ -198,7 +198,7 @@
   {
     "id": "snuggie",
     "type": "ARMOR",
-    "name": "snuggie",
+    "name": { "str": "snuggie" },
     "description": "Perfect for reading all those books you scavenged.",
     "weight": "625 g",
     "volume": "3 L",

data/json/items/armor/coats.json

@@ -815,7 +815,7 @@
   {
     "id": "sleeveless_duster",
     "type": "ARMOR",
-    "name": "sleeveless duster",
+    "name": { "str": "sleeveless duster" },
     "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original.  Making it from an original takes 50% the time.",
     "description": "A rugged full-length duster that leaves your arms unencumbered.  Has plenty of storage space due to its many pockets.",
     "weight": "857 g",
@@ -838,7 +838,7 @@
   {
     "id": "sleeveless_duster_fur",
     "type": "ARMOR",
-    "name": "sleeveless fur duster",
+    "name": { "str": "sleeveless fur duster" },
     "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original.  Making it from an original takes 50% the time.",
     "description": "A thick fur full-length duster without sleeves, leaving your arms unencumbered.  Has plenty of storage space due to its many pockets.",
     "weight": "2007 g",
@@ -863,7 +863,7 @@
     "id": "sleeveless_duster_faux_fur",
     "type": "ARMOR",
     "copy-from": "sleeveless_duster_fur",
-    "name": "sleeveless faux fur duster",
+    "name": { "str": "sleeveless faux fur duster" },
     "description": "A thick, sleeveless faux fur duster, falling below your knees.  Has many pockets for storing things.",
     "material": [ "faux_fur", "cotton" ],
     "covers": [ "TORSO", "LEGS" ],
@@ -873,7 +873,7 @@
   {
     "id": "sleeveless_duster_leather",
     "type": "ARMOR",
-    "name": "sleeveless leather duster",
+    "name": { "str": "sleeveless leather duster" },
     "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original.  Making it from an original takes 50% the time.",
     "description": "A thick leather full-length duster without sleeves, leaving your arms unencumbered.  Has plenty of storage space due to its many pockets.",
     "weight": "2257 g",
@@ -898,7 +898,7 @@
     "id": "sleeveless_duster_survivor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "sleeveless survivor duster",
+    "name": { "str": "sleeveless survivor duster" },
     "//": "The general guideline for sleeveless dusters is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original.  Making it from an original takes 50% the time.",
     "description": "A custom Kevlar armored full-length duster without sleeves, covered with pouches and pockets.  Comfortable, durable, and great for storage.",
     "weight": "2203 g",
@@ -922,7 +922,7 @@
   {
     "id": "sleeveless_trenchcoat",
     "type": "ARMOR",
-    "name": "sleeveless trenchcoat",
+    "name": { "str": "sleeveless trenchcoat" },
     "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original.  Making it from an original takes 50% the time.",
     "description": "A thin cotton trenchcoat that leaves your arms unencumbered.  Has plenty of storage space due to its many pockets.",
     "weight": "635 g",
@@ -945,7 +945,7 @@
   {
     "id": "sleeveless_trenchcoat_fur",
     "type": "ARMOR",
-    "name": "sleeveless fur trenchcoat",
+    "name": { "str": "sleeveless fur trenchcoat" },
     "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original.  Making it from an original takes 50% the time.",
     "description": "A thick fur trenchcoat without sleeves, leaving your arms unencumbered.  Has plenty of storage space due to its many pockets.",
     "weight": "1487 g",
@@ -970,7 +970,7 @@
     "id": "sleeveless_trenchcoat_faux_fur",
     "type": "ARMOR",
     "copy-from": "sleeveless_trenchcoat_fur",
-    "name": "sleeveless faux fur trenchcoat",
+    "name": { "str": "sleeveless faux fur trenchcoat" },
     "description": "A thick faux fur trenchcoat without sleeves.  Has plenty of storage space, and looks pretty good.",
     "material": [ "faux_fur", "cotton" ],
     "covers": [ "TORSO" ],
@@ -980,7 +980,7 @@
   {
     "id": "sleeveless_trenchcoat_leather",
     "type": "ARMOR",
-    "name": "sleeveless leather trenchcoat",
+    "name": { "str": "sleeveless leather trenchcoat" },
     "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original.  Making it from an original takes 50% the time.",
     "description": "A thick leather trenchcoat without sleeves, leaving your arms unencumbered.  Has plenty of storage space due to its many pockets.",
     "weight": "1672 g",
@@ -1005,7 +1005,7 @@
     "id": "sleeveless_trenchcoat_survivor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "sleeveless survivor trenchcoat",
+    "name": { "str": "sleeveless survivor trenchcoat" },
     "//": "The general guideline for sleeveless trenchcoats is the components, volume, weight, time to craft, and value are 15% lower (rounded down) than the original.  Making it from an original takes 50% the time.",
     "description": "A custom Kevlar armored trenchcoat without sleeves, covered with pouches and pockets.  Comfortable, durable, and great for storage.",
     "weight": "1632 g",
@@ -1029,7 +1029,7 @@
   {
     "id": "sleeveless_tunic",
     "type": "ARMOR",
-    "name": "sleeveless tunic",
+    "name": { "str": "sleeveless tunic" },
     "description": "A sleeveless cloth garment that covers the torso and legs.",
     "weight": "240 g",
     "volume": "1 L",

data/json/items/armor/hats.json

@@ -369,15 +369,15 @@
     "id": "hat_sombrero",
     "repairs_like": "tricorne",
     "type": "ARMOR",
-    "name": "sombrero",
+    "name": { "str": "sombrero" },
     "//": "Head encumbrance stops you from wearing additional headgear.  No helmet over a sombrero, sorry.  But brimmed gear gets the anti-glare flag!",
     "description": "A felt orange sombrero with traditional white and yellow hand stitching.  The wide brim keeps the sun out of your eyes, and a thin strap hooks around your chin.",
     "weight": "140 g",
     "volume": "3500 ml",
     "price": 5500,
     "material": [ "wool" ],
     "symbol": "[",
-    "looks_like": "hat_cowboy",
+    "looks_like": "cowboy_hat",
     "color": "light_red",
     "covers": [ "HEAD" ],
     "coverage": 50,
@@ -491,14 +491,14 @@
   {
     "id": "straw_hat",
     "type": "ARMOR",
-    "name": "straw hat",
+    "name": { "str": "straw hat" },
     "description": "Hat that is woven out of straw.  Its brim helps keep the sun out of your eyes.",
     "weight": "50 g",
     "volume": "750 ml",
     "price": 300,
     "material": [ "paper" ],
     "symbol": "[",
-    "looks_like": "hat_cowboy",
+    "looks_like": "cowboy_hat",
     "color": "dark_gray",
     "covers": [ "HEAD" ],
     "coverage": 40,

data/json/items/armor/jewelry.json

@@ -945,10 +945,10 @@
   {
     "id": "small_relic",
     "type": "ARMOR",
-    "name": "small relic",
+    "name": { "str": "small relic" },
     "description": "A small relic from a forgotten saint.  As extraordinary as the world has become it may have some power yet.",
     "weight": "60 g",
-    "volume": 0,
+    "volume": "15 ml",
     "price": 1000,
     "price_postapoc": 1000,
     "material": [ "bone", "silver" ],

data/json/items/armor/legs_clothes.json

@@ -551,7 +551,7 @@
     "id": "skirt",
     "repairs_like": "jeans",
     "type": "ARMOR",
-    "name": "skirt",
+    "name": { "str": "skirt" },
     "description": "A short, breezy cotton skirt.  Easy to move in, but only has a single small pocket.",
     "weight": "74 g",
     "volume": "250 ml",

data/json/items/armor/misc.json

@@ -91,10 +91,10 @@
   {
     "id": "tie_skinny",
     "type": "ARMOR",
-    "name": "skinny tie",
+    "name": { "str": "skinny tie" },
     "description": "A skinny black and white checkered necktie.",
     "weight": "12 g",
-    "volume": 0,
+    "volume": "50 ml",
     "price": 750,
     "material": [ "cotton" ],
     "symbol": "[",

data/json/items/armor/sheath.json

@@ -160,7 +160,7 @@
   {
     "id": "spearsling",
     "type": "ARMOR",
-    "name": "spear strap",
+    "name": { "str": "spear strap" },
     "description": "A leather strap tied around the torso for toting spears while keeping your hands free.  You have to duck to get through doors while one's in it, though.  Activate to holster/draw a weapon.",
     "weight": "160 g",
     "volume": "500 ml",

data/json/items/armor/storage.json

@@ -752,7 +752,7 @@
     "id": "slingpack",
     "repairs_like": "backpack",
     "type": "ARMOR",
-    "name": "sling pack",
+    "name": { "str": "sling pack" },
     "//": "Depends on if you're getting a cheap school version or something more like a range bag.",
     "description": "A simple single-sling backpack.  Easier to access than a normal backpack, but can't comfortably hold as much.",
     "weight": "566 g",
@@ -777,7 +777,7 @@
   {
     "id": "straw_basket",
     "type": "ARMOR",
-    "name": "straw basket",
+    "name": { "str": "straw basket" },
     "description": "Hand made straw basket.  Carry it with you for extra storage.",
     "weight": "100 g",
     "volume": "2500 ml",

data/json/items/armor/suits_clothes.json

@@ -122,7 +122,7 @@
     "id": "subsuit_xl",
     "repairs_like": "jumpsuit",
     "type": "ARMOR",
-    "name": "subject suit",
+    "name": { "str": "subject suit" },
     "description": "A thin, short-sleeved and short-legged one-piece suit.  Judging by the odd tailoring and adjustment points… maybe you don't want to know who wore it.  Provides nominal storage and is not very encumbering.",
     "weight": "810 g",
     "volume": "5 L",

data/json/items/armor/swimming.json

@@ -131,7 +131,7 @@
   {
     "id": "wetsuit_spring",
     "type": "ARMOR",
-    "name": "spring suit",
+    "name": { "str": "spring suit" },
     "description": "A long-sleeved spring wetsuit with pink color details and cleavage-enhancing, hip-accentuating construction.  Not as protective as a full-body suit, but also less restrictive.",
     "weight": "1320 g",
     "volume": "4 L",

data/json/items/armor/torso_clothes.json

@@ -229,7 +229,7 @@
     "id": "jersey",
     "repairs_like": "tshirt",
     "type": "ARMOR",
-    "name": "sports jersey",
+    "name": { "str": "sports jersey" },
     "//": "Genuine team merch, and priced like it!",
     "description": "A shirt made of thick material imprinted with the name and logo of a sports team.",
     "weight": "480 g",
@@ -459,7 +459,7 @@
     "id": "striped_shirt",
     "repairs_like": "tshirt",
     "type": "ARMOR",
-    "name": "striped shirt",
+    "name": { "str": "striped shirt" },
     "description": "A long-sleeved shirt with horizontal black and white stripes.",
     "weight": "146 g",
     "volume": "750 ml",

data/json/items/armor/undergarment.json

@@ -408,7 +408,7 @@
   {
     "id": "long_undertop_sleeveless",
     "type": "ARMOR",
-    "name": "sleeveless underwear top",
+    "name": { "str": "sleeveless underwear top" },
     "description": "A sleeveless underwear top that helps to maintain body temperature.",
     "weight": "80 g",
     "volume": "400 ml",
@@ -462,7 +462,7 @@
   {
     "id": "sports_bra",
     "type": "ARMOR",
-    "name": "sports bra",
+    "name": { "str": "sports bra" },
     "description": "A sturdy nylon bra to provide additional support during physical movement.  Typically worn when exercising, it clings to the skin and is easy to wear.",
     "weight": "92 g",
     "volume": "500 ml",

data/json/items/generic/bedding.json

@@ -85,7 +85,7 @@
   {
     "id": "sleeping_bag",
     "type": "ARMOR",
-    "name": "sleeping bag",
+    "name": { "str": "sleeping bag" },
     "description": "A large sleeping bag that covers you head to toe.  This one is medium weight.",
     "weight": "1600 g",
     "volume": "14 L",