Merge pull request cataclysmbnteam#5 from CleverRaven/master

update

data/json/furniture.json

@@ -354,7 +354,7 @@
         "id" : "f_oven",
         "name": "oven",
         "symbol": "#",
-        "description": "Used for heating and cooking food with eletricity.  Doesn't look like it's working, although it stil has parts.",
+        "description": "Used for heating and cooking food with electricity.  Doesn't look like it's working, although it still has parts.",
         "color": "dark_gray",
         "move_cost_mod": 2,
         "required_str": 10,
@@ -633,7 +633,7 @@
         "id" : "f_exercise",
         "name": "exercise machine",
         "symbol": "T",
-        "description": "Typically used for, well, excercising.  You're not up for it.",
+        "description": "Typically used for, well, exercising.  You're not up for it.",
         "color": "dark_gray",
         "move_cost_mod": 1,
         "required_str": 8,
@@ -1099,7 +1099,7 @@
         "type" : "furniture",
         "id" : "f_bigmirror_b",
         "name": "broken standing mirror",
-        "description": "You could look at yourself, if the mirror wasnt covered in cracks and fractures.",
+        "description": "You could look at yourself, if the mirror wasn't covered in cracks and fractures.",
         "symbol": "{",
         "color": "light_gray",
         "move_cost_mod": 2,
@@ -2415,7 +2415,7 @@
         "type" : "furniture",
         "id" : "f_floor_canvas",
         "name": "heavy punching bag",
-        "description": "Punch Punch!  Excercise those arms!",
+        "description": "Punch Punch!  Exercise those arms!",
         "symbol": "0",
         "color": "dark_gray",
         "move_cost_mod": -1,

data/json/items/armor.json

@@ -8548,7 +8548,7 @@
       "type": "holster",
       "holster_prompt": "Sheath blade",
       "holster_msg": "You sheath your %s",
-      "min_volume": 1,      
+      "min_volume": 1,
       "max_volume": 4,
       "draw_cost": 3,
       "flags": [ "SHEATH_KNIFE", "SHEATH_SWORD" ]

data/json/items/comestibles/med.json

@@ -1303,7 +1303,8 @@
             "head_power" : 1,
             "torso_power" : 4,
             "bite" : 0.75,
-            "move_cost" : 100
+            "move_cost" : 100,
+            "used_up_item" : "rag"
         }
     },
     {
@@ -1320,7 +1321,8 @@
             "torso_power" : 1,
             "limb_power" : 1,
             "bite" : 0.8,
-            "move_cost" : 300
+            "move_cost" : 300,
+            "used_up_item" : "cotton_ball"
         }
     }
 ]

data/json/items/gun/40mm.json

@@ -75,7 +75,7 @@
     "reload": 400,
     "modes": [
       [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ],
-      [ "AUTO", "auto", 10, "NPC_AVOID" ]
+      [ "AUTO", "auto", 6, "NPC_AVOID" ]
     ],
     "magazines": [ [ "40mm", [ "belt40mm" ] ] ],
     "flags": [ "MOUNTED_GUN" ]

data/json/items/gunmod/sights.json

@@ -146,7 +146,7 @@
     "id": "tele_sight",
     "type": "GUNMOD",
     "name": "telescopic sight",
-    "description": "A simple telescopic sight, essentially a small telescope with crosshairs. Increases weight but improves accuracy.",
+    "description": "A simple telescopic sight, essentially a small telescope with crosshairs.  Increases weight but improves accuracy.",
     "weight": 300,
     "volume": 1,
     "price": 30000,

data/json/items/tools.json

@@ -1375,7 +1375,7 @@
     "type": "TOOL",
     "name": "cell phone",
     "name_plural": "cell phones",
-    "description": "This is a typical cellphone that features an LED for use as a flash.  Using this cellphone will turn it on and provide light, assuming it is charged with batteries. Also it has a clock app that includes an alarm.",
+    "description": "This is a typical cellphone that features an LED for use as a flash.  Using this cellphone will turn it on and provide light, assuming it is charged with batteries.  Also it has a clock app that includes an alarm.",
     "weight": 226,
     "volume": 1,
     "price": 10000,