Merge branch 'master' into species_data

uuuuuuuuuuuuuuuuugh

Conflicts:
	crawl-ref/source/ability.cc
	crawl-ref/source/mutation-data.h
	crawl-ref/source/mutation.cc
	crawl-ref/source/ng-setup.cc
	crawl-ref/source/output.cc
	crawl-ref/source/player.cc
	crawl-ref/source/species.cc

diff --cc crawl-ref/source/ability.cc
Simple merge

diff --cc crawl-ref/source/art-func.h
Simple merge

diff --cc crawl-ref/source/artefact.cc
Simple merge

diff --cc crawl-ref/source/attack.cc
Simple merge

diff --cc crawl-ref/source/command.cc
Simple merge

diff --cc crawl-ref/source/describe.cc
Simple merge

diff --cc crawl-ref/source/enum.h
Simple merge

diff --cc crawl-ref/source/ghost.cc
Simple merge

diff --cc crawl-ref/source/godabil.cc
Simple merge

diff --cc crawl-ref/source/godwrath.cc
Simple merge

diff --cc crawl-ref/source/item_use.cc
Simple merge

diff --cc crawl-ref/source/main.cc
Simple merge

diff --cc crawl-ref/source/melee_attack.cc
Simple merge

diff --cc crawl-ref/source/mon-info.cc
Simple merge

diff --cc crawl-ref/source/mon-util.cc
Simple merge

diff --cc crawl-ref/source/mutation-data.h
index 7a11541,e546948..3ab96c3
--- 1/crawl-ref/source/mutation-data.h
--- 2/crawl-ref/source/mutation-data.h
+++ b/crawl-ref/source/mutation-data.h
@@@ -931,9 -883,9 +931,9 @@@ static const mutation_def mut_data[] 
  
     "a tentacle spike",
  },
 -
  #if TAG_MAJOR_VERSION == 34
 +
- { MUT_BREATHE_POISON,                 4,  1, MUTFLAG_GOOD, false,
+ { MUT_BREATHE_POISON,                 0,  1, MUTFLAG_GOOD, false,
    "breathe poison",
  
    {"You can exhale a cloud of poison.", "", ""},

diff --cc crawl-ref/source/mutation.cc
index 30efd05,8ce47dd..784d277
--- 1/crawl-ref/source/mutation.cc
--- 2/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@@ -1019,17 -1258,16 +1019,16 @@@ bool physiology_mutation_conflict(mutat
          return true;
      }
  
-     // Red Draconians can already breathe flames.
-     if (you.species == SP_RED_DRACONIAN && mutat == MUT_BREATHE_FLAMES)
-         return true;
- 
-     // Green Draconians can breathe mephitic, poison is not really redundant
-     // but its name might confuse players a bit ("noxious" vs "poison").
-     if (you.species == SP_GREEN_DRACONIAN && mutat == MUT_SPIT_POISON)
+     // Draconians already get breath weapons.
 -    if (player_genus(GENPC_DRACONIAN)
++    if (species_is_draconian(you.species)
+         && (mutat == MUT_BREATHE_FLAMES
+             || mutat == MUT_SPIT_POISON))
+     {
          return true;
+     }
  
      // Only Draconians (and gargoyles) can get wings.
 -    if (!player_genus(GENPC_DRACONIAN) && you.species != SP_GARGOYLE
 +    if (!species_is_draconian(you.species) && you.species != SP_GARGOYLE
          && mutat == MUT_BIG_WINGS)
      {
          return true;
@@@ -1394,11 -1637,15 +1398,11 @@@ bool mutate(mutation_type which_mutatio
              break;
  
          case MUT_SPIT_POISON:
 +            // Breathe poison replaces spit poison (so it takes the slot).
-             if (you.mutation[mutat] == 3)
+             if (you.mutation[mutat] >= 3)
 -            {
 -                // Breathe poison replaces spit poison (so it takes the slot).
                  for (int i = 0; i < 52; ++i)
 -                {
                      if (you.ability_letter_table[i] == ABIL_SPIT_POISON)
                          you.ability_letter_table[i] = ABIL_BREATHE_POISON;
 -                }
 -            }
              break;
  
          default:

diff --cc crawl-ref/source/ng-setup.cc
Simple merge

diff --cc crawl-ref/source/output.cc
Simple merge

diff --cc crawl-ref/source/player-act.cc
Simple merge

diff --cc crawl-ref/source/player.cc
Simple merge

diff --cc crawl-ref/source/player.h
Simple merge

diff --cc crawl-ref/source/religion.cc
Simple merge

diff --cc crawl-ref/source/skills.cc
Simple merge

diff --cc crawl-ref/source/tags.cc
Simple merge

diff --cc crawl-ref/source/transform.cc
Simple merge

diff --cc crawl-ref/source/transform.h
Simple merge

diff --cc crawl-ref/source/wiz-fsim.cc
Simple merge

diff --cc crawl-ref/source/wiz-item.cc
Simple merge

diff --cc crawl-ref/source/wiz-you.cc
Simple merge

diff --cc crawl-ref/source/xom.cc
Simple merge