Merge pull request #3 from CleverRaven/master

merge upstream

.github/CONTRIBUTING.md

@@ -149,6 +149,21 @@ If you are also looking for suggestions then mark it with [CR] — "comments req
 
 This can help speed up our review process by allowing us to only review the things that are ready for it, and will prevent anything that isn't completely ready from being merged in.
 
+### All PRs should have a "Summary" line
+Summary is a one-line description of your change that will be extracted and added to the project changelog at https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt
+
+The format is: ```SUMMARY: Category "description"```
+
+The categories to choose from are: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N.
+
+Example: ```SUMMARY: Content "Adds new mutation category 'Mouse'"```
+Or, if you want it treated as a minor tweak that doesn't appear in the changelog:
+```SUMMARY: None```
+
+See the Changelog Guidelines at https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md for explanations of the categories.
+
+### Closing issues using keywords
+
 One more thing: when marking your PR as closing, fixing, or resolving issues, please include "XXXX #???" somewhere in the description, where XXX is on this list:
 * close
 * closes
@@ -162,6 +177,8 @@ One more thing: when marking your PR as closing, fixing, or resolving issues, pl
 
 The "???" is the issue number. This automatically closes the issue when the PR is pulled in, and allows merges to work slightly faster. To close multiple issues format it as "XXXX #???, XXXX#???".
 
+See https://help.github.com/articles/closing-issues-using-keywords/ for more.
+
 ## Advanced Techniques
 
 These guidelines aren't essential, but they can make keeping things in order much easier.

Makefile

@@ -852,6 +852,7 @@ endif
 ifdef LUA
 	mkdir -p $(DATA_PREFIX)/lua
 	install --mode=644 lua/autoexec.lua $(DATA_PREFIX)/lua
+	install --mode=644 lua/log.lua $(DATA_PREFIX)/lua
 	install --mode=644 lua/class_definitions.lua $(DATA_PREFIX)/lua
 endif
 	install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \
@@ -888,6 +889,7 @@ endif
 ifdef LUA
 	mkdir -p $(DATA_PREFIX)/lua
 	install --mode=644 lua/autoexec.lua $(DATA_PREFIX)/lua
+	install --mode=644 lua/log.lua $(DATA_PREFIX)/lua
 	install --mode=644 lua/class_definitions.lua $(DATA_PREFIX)/lua
 endif
 	install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \

data/json/bionics.json

@@ -422,7 +422,7 @@
     "id": "bio_gills",
     "type": "bionic",
     "name": "Oxygenator",
-    "description": "A complex oxygen delivery system.  Improves the ability to extract oxygen from air and allows extracting it from water.  Will automatically turn on when drowning.  Turn on to recharge stamina faster, at moderate power cost.",
+    "description": "A complex oxygen delivery system.  Improves the ability to extract oxygen from air and allows extracting it from water.  Will automatically turn on when drowning.  Turn on to recharge stamina faster, at moderate power cost.  Asthmatics may also use it to stop asthma attacks.",
     "occupied_bodyparts": [ [ "TORSO", 8 ], [ "HEAD", 2 ], [ "MOUTH", 2 ] ],
     "flags": [ "BIONIC_TOGGLED" ]
   },
@@ -1050,6 +1050,20 @@
     "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "HAND_R", 2 ] ],
     "act_cost": 50
   },
+  {
+    "id": "bio_syringe",
+    "type": "bionic",
+    "name": "Intravenous Needletip",
+    "description": "The flesh of the inside of your middle finger has been replaced with a tube leading into your arteries, with a retractable needle extending out of the tip of the finger when clenched.  This lets you pump intravenous drugs like morphine directly into your bloodstream without needing to carry a syringe.",
+    "occupied_bodyparts": [ [ "HAND_L", 1 ] ]
+  },
+  {
+    "id": "bio_weight",
+    "type": "bionic",
+    "name": "Titanium Skeletal Bracing",
+    "description": "Titanium bracing has been installed onto your elbows, knees, and spine, making them far better at handling strain.  Your carrying capacity is increased by 20 kilograms, or about 44 pounds.",
+    "occupied_bodyparts": [ [ "TORSO", 8 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ] ]
+  },
   {
     "id": "bio_shock_absorber",
     "type": "bionic",

data/json/furniture.json

@@ -257,19 +257,29 @@
     "description": "A variety of plant, used for decoration.",
     "required_str": 5,
     "max_volume": 2000,
-    "flags": [ "CONTAINER", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "TINY", "TRANSPARENT" ],
+    "flags": [ "CONTAINER", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "TINY", "TRANSPARENT", "EASY_DECONSTRUCT" ],
+    "deconstruct": {
+      "items": [
+        { "item": "withered" },
+        { "item": "wrapper", "prob": 5 },
+        { "item": "can_drink_unsealed", "prob": 5 },
+        { "item": "bag_plastic", "prob": 5 },
+        { "item": "cig_butt", "prob": 10, "repeat": [ 1, 10 ] },
+        { "group": "flower_pots" }
+      ]
+    },
     "bash": {
       "str_min": 2,
       "str_max": 18,
       "sound": "smash!",
       "sound_fail": "whump.",
       "items": [
         { "item": "withered", "prob": 50 },
-        { "item": "wrapper", "prob": 50 },
-        { "item": "can_drink_unsealed", "prob": 50 },
-        { "item": "bag_plastic", "prob": 50 },
-        { "item": "ceramic_shard", "count": [ 1, 3 ] },
-        { "item": "cig_butt", "prob": 50 }
+        { "item": "wrapper", "prob": 5 },
+        { "item": "can_drink_unsealed", "prob": 5 },
+        { "item": "bag_plastic", "prob": 5 },
+        { "item": "cig_butt", "prob": 10, "repeat": [ 1, 10 ] },
+        { "group": "flower_pots_broken" }
       ]
     }
   },
@@ -283,19 +293,29 @@
     "move_cost_mod": 2,
     "required_str": 5,
     "max_volume": 2000,
-    "flags": [ "CONTAINER", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "TINY", "TRANSPARENT" ],
+    "flags": [ "CONTAINER", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "TINY", "TRANSPARENT", "EASY_DECONSTRUCT" ],
+    "deconstruct": {
+      "items": [
+        { "item": "withered" },
+        { "item": "wrapper", "prob": 5 },
+        { "item": "can_drink_unsealed", "prob": 5 },
+        { "item": "bag_plastic", "prob": 5 },
+        { "item": "cig_butt", "prob": 10, "repeat": [ 1, 10 ] },
+        { "group": "flower_pots" }
+      ]
+    },
     "bash": {
       "str_min": 2,
       "str_max": 18,
       "sound": "smash!",
       "sound_fail": "whump.",
       "items": [
         { "item": "withered", "prob": 50 },
-        { "item": "wrapper", "prob": 50 },
-        { "item": "can_drink_unsealed", "prob": 50 },
-        { "item": "bag_plastic", "prob": 50 },
-        { "item": "ceramic_shard", "count": [ 1, 3 ] },
-        { "item": "cig_butt", "prob": 50 }
+        { "item": "wrapper", "prob": 5 },
+        { "item": "can_drink_unsealed", "prob": 5 },
+        { "item": "bag_plastic", "prob": 5 },
+        { "item": "cig_butt", "prob": 10, "repeat": [ 1, 10 ] },
+        { "group": "flower_pots_broken" }
       ]
     }
   },
@@ -1669,7 +1689,7 @@
     "id": "f_mutpoppy",
     "name": "mutated poppy flower",
     "symbol": "f",
-    "color": "red",
+    "color": "light_red",
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH" ],
@@ -2099,6 +2119,30 @@
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH" ],
     "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
   },
+  {
+    "type": "furniture",
+    "id": "f_flower_tulip",
+    "name": "tulip",
+    "symbol": "f",
+    "color": "magenta",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH" ],
+    "examine_action": "flower_tulip",
+    "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
+  },
+  {
+    "type": "furniture",
+    "id": "f_flower_spurge",
+    "name": "spurge flower",
+    "symbol": "f",
+    "color": "light_green",
+    "move_cost_mod": 0,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH" ],
+    "examine_action": "flower_spurge",
+    "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." }
+  },
   {
     "type": "furniture",
     "id": "f_cattails",

data/json/item_actions.json

@@ -54,7 +54,7 @@
     },{
         "type" : "item_action",
         "id" : "HOTPLATE",
-        "name" : "Heat up food"
+        "name" : "Heat up food (with it)"
     },{
         "type" : "item_action",
         "id" : "MISC_REPAIR",
@@ -406,7 +406,7 @@
     },{
         "type" : "item_action",
         "id" : "HEAT_FOOD",
-        "name" : "Heat up food"
+        "name" : "Heat up food (in it)"
     },{
         "type" : "item_action",
         "id" : "HONEYCOMB",