Merge pull request #98 from CleverRaven/master

Merge pull request CleverRaven#38545 from Fris0uman/reset_scent

data/json/items/armor/ammo_pouch.json

@@ -74,7 +74,7 @@
   {
     "id": "ammo_satchel",
     "type": "ARMOR",
-    "name": "ammo satchel",
+    "name": { "str": "ammo satchel" },
     "description": "A fabric ammo bag worn at the waist which is capable of holding a single large magazine close at hand.",
     "weight": "180 g",
     "volume": "500 ml",

data/json/items/armor/hats.json

@@ -160,7 +160,7 @@
     "id": "hat_ball",
     "repairs_like": "balclava",
     "type": "ARMOR",
-    "name": "baseball cap",
+    "name": { "str": "baseball cap" },
     "//": "Head encumbrance stops you from wearing additional headgear.  No helmet over a ballcap, sorry.  But brimmed gear gets the anti-glare flag!",
     "description": "A Red Sox cap.  It provides a little bit of warmth.",
     "weight": "88 g",

data/json/items/armor/helmets.json

@@ -48,7 +48,7 @@
     "repairs_like": "xlkevlar",
     "type": "ARMOR",
     "category": "armor",
-    "name": "army helmet",
+    "name": { "str": "army helmet" },
     "description": "A heavy helmet that provides excellent protection from all sorts of damage.  It is labeled as the advanced combat helmet.",
     "weight": "1383 g",
     "volume": "1750 ml",
@@ -145,7 +145,7 @@
     "repairs_like": "helmet_barbute",
     "type": "ARMOR",
     "category": "armor",
-    "name": "baseball helmet",
+    "name": { "str": "baseball helmet" },
     "description": "A hard plastic helmet that covers the head and ears.  Designed to protect against a baseball to the head.",
     "weight": "453 g",
     "volume": "1750 ml",
@@ -168,7 +168,7 @@
     "id": "helmet_barbute",
     "type": "ARMOR",
     "category": "armor",
-    "name": "barbute helm",
+    "name": { "str": "barbute helm" },
     "description": "A medieval helmet that provides excellent protection for the head, with a Y shaped opening for the face.",
     "weight": "1175 g",
     "volume": "2500 ml",

data/json/items/armor/holster.json

@@ -2,7 +2,7 @@
   {
     "id": "back_holster",
     "type": "ARMOR",
-    "name": "back holster",
+    "name": { "str": "back holster" },
     "description": "A leather holster, big enough for a rifle or other large gun.  Designed to be strapped to the back.  Whilst initially cumbersome it becomes much easier to use with practice.  Activate to holster/draw a gun.",
     "weight": "240 g",
     "volume": "1250 ml",
@@ -28,7 +28,7 @@
   {
     "id": "bootstrap",
     "type": "ARMOR",
-    "name": "ankle holster",
+    "name": { "str": "ankle holster" },
     "description": "A small concealed holster worn on the ankle.  It is awkward to use without practice.  Activate to holster/draw a small pistol.",
     "weight": "200 g",
     "volume": "250 ml",

data/json/items/armor/hoods.json

@@ -3,7 +3,7 @@
     "id": "beekeeping_hood",
     "repairs_like": "balclava",
     "type": "ARMOR",
-    "name": "beekeeping hood",
+    "name": { "str": "beekeeping hood" },
     "description": "A beekeeping hood.  Keeps the bees out, but lets fresh air in.  Rather cumbersome to wear, as it is rather bulky and hinders vision.",
     "weight": "260 g",
     "volume": "1500 ml",

data/json/items/armor/jewelry.json

@@ -2,11 +2,11 @@
   {
     "id": "bead_bracelet",
     "type": "ARMOR",
-    "name": "beaded bracelet",
+    "name": { "str": "beaded bracelet" },
     "description": "A simple bracelet of string and wooden beads.  You can wear it if you like, but it won't provide any effects.  Also doubles as a set of prayer beads, if you're so inclined.",
     "looks_like": "copper_bracelet",
     "weight": "12 g",
-    "volume": 0,
+    "volume": "10 ml",
     "price": 100,
     "price_postapoc": 100,
     "flags": [ "FANCY" ],
@@ -32,11 +32,11 @@
   {
     "id": "bead_necklace",
     "type": "ARMOR",
-    "name": "beaded necklace",
+    "name": { "str": "beaded necklace" },
     "description": "A simple necklace made of string and wooden beads.  You can wear it if you like, but it won't provide any effects.  Also doubles as a set of prayer beads, if you're so inclined.",
-    "looks_like": "necklace",
+    "looks_like": "silver_necklace",
     "weight": "15 g",
-    "volume": 0,
+    "volume": "10 ml",
     "price": 100,
     "price_postapoc": 100,
     "material": [ "wood" ],
@@ -187,10 +187,10 @@
   {
     "id": "barrette",
     "type": "ARMOR",
-    "name": "barrette",
+    "name": { "str": "barrette" },
     "description": "A barrette with lots of ornaments.",
     "weight": "5 g",
-    "volume": 0,
+    "volume": "50 ml",
     "price": 800,
     "material": [ "plastic" ],
     "symbol": "[",
@@ -1308,10 +1308,10 @@
   {
     "abstract": "badge_abstract",
     "type": "ARMOR",
-    "name": "badge template",
+    "name": { "str": "badge template" },
     "description": "This is a template for police/medical badges.  If found in a game, it is a bug.",
     "weight": "60 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 5000,
     "price_postapoc": 700,
     "material": [ "silver" ],

data/json/items/armor/masks.json

@@ -2,7 +2,7 @@
   {
     "id": "balclava",
     "type": "ARMOR",
-    "name": "balaclava",
+    "name": { "str": "balaclava" },
     "description": "A warm covering that protects the head and face from the cold.",
     "weight": "40 g",
     "volume": "250 ml",
@@ -21,7 +21,7 @@
   {
     "id": "bandana",
     "type": "ARMOR",
-    "name": "bandana",
+    "name": { "str": "bandana" },
     "description": "A cotton bandana, worn over the mouth for warmth and minor protection from dust and other contaminants.",
     "weight": "42 g",
     "volume": "250 ml",
@@ -105,7 +105,7 @@
     "repairs_like": "xlkevlar",
     "type": "ARMOR",
     "category": "armor",
-    "name": "ballistic mask",
+    "name": { "str": "ballistic mask" },
     "description": "A protective reinforced Kevlar mask that covers the face.  Provides excellent protection from ballistic threats.",
     "weight": "512 g",
     "volume": "750 ml",

data/json/items/armor/power_armor.json

@@ -54,7 +54,7 @@
     "id": "power_armor_basic",
     "type": "ARMOR",
     "category": "armor",
-    "name": "basic power armor",
+    "name": { "str": "basic power armor" },
     "description": "The DoubleTech Power Armor, Mk. I: A heavy suit of basic power armor, offering very good protection against attacks, but hard to move in.  The UPS compartment can store other things if you don't mind powering the suit yourself.  Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
     "weight": "20339 g",
     "volume": "25 L",
@@ -131,7 +131,7 @@
     "id": "power_armor_helmet_basic",
     "type": "ARMOR",
     "category": "armor",
-    "name": "basic power armor helmet",
+    "name": { "str": "basic power armor helmet" },
     "description": "A basic helmet, designed for use with the DoubleTech Power Armor, Mk. I.  Offers excellent protection from both attacks and environmental hazards.  Like all DoubleTech power armor, the control and climate-regulation systems require direct skin contact.",
     "weight": "3628 g",
     "volume": "5 L",

data/json/items/armor/sheath.json

@@ -2,7 +2,7 @@
   {
     "id": "axe_ring",
     "type": "ARMOR",
-    "name": "axe ring holster",
+    "name": { "str": "axe ring holster" },
     "description": "A combination of leather and a metal ring to hold an axe on your waist.",
     "weight": "130 g",
     "volume": "600 ml",
@@ -28,7 +28,7 @@
   {
     "id": "baldric",
     "type": "ARMOR",
-    "name": "baldric",
+    "name": { "str": "baldric" },
     "description": "A leather scabbard, big enough for anything up to a longsword, or even a bit larger than that.  Designed to be worn at the waist, secured by a shoulder belt.  Activate to sheath/draw a sword.",
     "weight": "1625 g",
     "volume": "2 L",
@@ -55,7 +55,7 @@
   {
     "id": "bootsheath",
     "type": "ARMOR",
-    "name": "ankle sheath",
+    "name": { "str": "ankle sheath" },
     "description": "A small concealed knife sheath worn on the ankle.  It is awkward to use without practice.  Activate to sheathe/draw a weapon.",
     "weight": "160 g",
     "volume": "500 ml",
@@ -82,7 +82,7 @@
   {
     "id": "bscabbard",
     "type": "ARMOR",
-    "name": "back scabbard",
+    "name": { "str": "back scabbard" },
     "description": "A leather scabbard, big enough for almost any sword.  Designed to be strapped to the back, it's very difficult to draw from without considerable practice.  Activate to sheath/draw a sword.",
     "weight": "1890 g",
     "volume": "2250 ml",

data/json/items/armor/storage.json

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

data/json/items/armor/suits_protection.json

@@ -355,7 +355,7 @@
     "id": "beekeeping_suit",
     "repairs_like": "trenchcoat",
     "type": "ARMOR",
-    "name": "beekeeping suit",
+    "name": { "str": "beekeeping suit" },
     "description": "A white suit commonly worn by professional beekeepers with straps on your ankles and wrists to prevent bees from flying in.  It's not a very tough fabric, but it's lightweight and has plenty of storage thanks to a chest pocket.",
     "weight": "1587 g",
     "volume": "3500 ml",

data/json/items/armor/torso_armor.json

@@ -194,7 +194,7 @@
   {
     "id": "jacket_leather_mod",
     "type": "ARMOR",
-    "name": "armored leather jacket",
+    "name": { "str": "armored leather jacket" },
     "description": "An armored jacket made from thick leather and metal plates.  Cumbersome, but offers excellent protection from harm.",
     "weight": "2180 g",
     "volume": "5500 ml",
@@ -379,7 +379,7 @@
   {
     "id": "vest_leather_mod",
     "type": "ARMOR",
-    "name": "armored leather vest",
+    "name": { "str": "armored leather vest" },
     "description": "An armored vest made from thick leather and metal plates.  Cumbersome, but offers excellent protection from harm.",
     "weight": "1210 g",
     "volume": "3 L",

data/json/items/biosignatures.json

@@ -57,7 +57,7 @@
     "id": "fetid_goop",
     "symbol": "~",
     "color": "white",
-    "name": "fetid goop",
+    "name": { "str": "fetid goop" },
     "weight": "750 g",
     "volume": "1 L",
     "description": "A foul smelling goop.  It has a disgusting texture and a powerful smell that overrides every other smell around it.",

data/json/items/comestibles/bread.json

@@ -46,7 +46,7 @@
     "id": "sourdough_split",
     "type": "GENERIC",
     "category": "food",
-    "name": "freshly fed sourdough starter",
+    "name": { "str": "freshly fed sourdough starter" },
     "description": "This jar contains a floury paste with sourdough starter mixed in.  It needs a few hours to recover its strength before it can be used again.",
     "weight": "52 g",
     "volume": "250 ml",

data/json/items/comestibles/med.json

@@ -3,7 +3,7 @@
     "id": "1st_aid",
     "type": "GENERIC",
     "category": "drugs",
-    "name": "first aid kit",
+    "name": { "str": "first aid kit" },
     "description": "A full medical kit, with bandages, local anesthetics, and rapid healing agents.  Used for healing large amounts of damage.  Disassemble to get its content.",
     "weight": "1750 g",
     "volume": "1250 ml",

data/json/items/generic.json

@@ -108,7 +108,7 @@
   {
     "type": "GENERIC",
     "id": "file",
-    "name": "file",
+    "name": { "str": "file" },
     "category": "books",
     "description": "Several documents with all kinds of information, customer data and charts kept together, pretty useless now though.",
     "weight": "15 g",
@@ -147,13 +147,13 @@
     "category": "other",
     "symbol": "-",
     "color": "pink",
-    "name": "foodplace loyalty card",
+    "name": { "str": "foodplace loyalty card" },
     "description": "A bright pink loyalty card, all the points are stamped.  This would definitely prove your fidelity to Foodplace, if it still meant anything…",
     "price": 0,
     "material": "paper",
-    "flags": "TRADER_AVOID",
+    "flags": [ "TRADER_AVOID" ],
     "weight": "3 g",
-    "volume": 0
+    "volume": "5 ml"
   },
   {
     "type": "GENERIC",
@@ -173,7 +173,7 @@
     "id": "fur",
     "symbol": ",",
     "color": "brown",
-    "name": "fur pelt",
+    "name": { "str": "fur pelt" },
     "description": "A small bolt of fur from an animal.  Can be made into warm clothing.",
     "price": 1000,
     "material": [ "fur", "leather" ],
@@ -272,7 +272,7 @@
     "id": "fertilizer",
     "symbol": "*",
     "color": "green",
-    "name": "fertilizer",
+    "name": { "str": "fertilizer" },
     "description": "A token, representing fertilization of a plant.",
     "material": "veggy"
   },
@@ -2658,7 +2658,7 @@
     "id": "fluid_preserved_brain",
     "type": "GENERIC",
     "category": "other",
-    "name": "fluid preserved brain",
+    "name": { "str": "fluid preserved brain" },
     "description": "This 3L jar contains a human brain preserved in a formaldehyde solution.",
     "weight": "365 g",
     "volume": "3 L",
@@ -2907,7 +2907,7 @@
     "id": "fire_brick",
     "symbol": ",",
     "color": "brown",
-    "name": "fire brick",
+    "name": { "str": "fire brick" },
     "category": "spare_parts",
     "description": "A reinforced brick designed to withstand intense heat.",
     "price": 2500,

data/json/items/generic/toys_and_sports.json

@@ -142,7 +142,7 @@
     "id": "football",
     "symbol": "*",
     "color": "brown",
-    "name": "football",
+    "name": { "str": "football" },
     "category": "other",
     "description": "An oval made of leather and string, it's easily thrown but does little damage.  You could take it apart into leather if you wanted.",
     "price": 1000,

data/json/items/melee/knives_kitchen.json

@@ -122,7 +122,7 @@
   },
   {
     "id": "knife_meat_cleaver",
-    "name": "meat cleaver",
+    "name": { "str": "meat cleaver" },
     "type": "TOOL",
     "category": "weapons",
     "description": "This is a menacing looking knife with a broad, square shaped blade.  Its heft and sharpness would make it a very effective melee weapon, and an excellent butchering tool.",

data/json/items/melee/spears_and_polearms.json

@@ -57,7 +57,7 @@
     "id": "makeshift_scythe_war",
     "type": "TOOL",
     "category": "weapons",
-    "name": "makeshift war scythe",
+    "name": { "str": "makeshift war scythe" },
     "description": "This farming tool has been modified into an improvised weapon by rotating its blade 90 degrees, transforming it into a deadly giant blade on the end of a stick.  However it's quite fragile.",
     "weight": "3013 g",
     "volume": "3250 ml",
@@ -149,7 +149,7 @@
   {
     "type": "GENERIC",
     "id": "spear_forked",
-    "name": "forked spear",
+    "name": { "str": "forked spear" },
     "description": "A wooden pole with three spikes tied to it and decent grip.  It's specialized for catching weapons, and not intended for extended use in combat.",
     "weight": "1650 g",
     "//": "Block 2 until we re-implement defensive-disarm, I'm afraid.",

data/json/items/melee/swords_and_blades.json

@@ -238,7 +238,7 @@
     "id": "makeshift_machete",
     "type": "TOOL",
     "category": "weapons",
-    "name": "makeshift machete",
+    "name": { "str": "makeshift machete" },
     "description": "This is a large blade that has had a portion of the handle wrapped in duct tape, making it easier to wield as a rough machete.",
     "weight": "581 g",
     "volume": "2 L",
@@ -257,7 +257,7 @@
     "id": "machete",
     "type": "TOOL",
     "category": "weapons",
-    "name": "machete",
+    "name": { "str": "machete" },
     "description": "This huge steel knife makes an excellent tool for cutting down large vegetation or other 'obstacles.'",
     "weight": "538 g",
     "volume": "1 L",

data/json/items/ranged/throwing.json

@@ -35,7 +35,7 @@
     "id": "frisbee",
     "category": "weapons",
     "price": 1000,
-    "name": "frisbee",
+    "name": { "str": "frisbee" },
     "symbol": "o",
     "color": "yellow",
     "description": "A plastic frisbee made for outdoor games.",