Merge pull request #6023 from HabitRPG/sabrecat/world-boss

Fall 2015 World Boss
2025-12-17 14:47:53 +01:00 · 2015-10-08 11:15:00 -05:00
parent 51355f7eea 1d4536fc47
commit 291a135fe1
53 changed files with 3786 additions and 3563 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -69,6 +69,7 @@ module.exports = function(grunt) {
          {expand: true, cwd: '', src: 'common/dist/sprites/spritesmith*.png', dest: 'website/build/'},
          {expand: true, cwd: '', src: 'common/img/sprites/backer-only/*.gif', dest: 'website/build/'},
          {expand: true, cwd: '', src: 'common/img/sprites/npc_ian.gif', dest: 'website/build/'},
+          {expand: true, cwd: '', src: 'common/img/sprites/quest_burnout.gif', dest: 'website/build/'},
          {expand: true, cwd: 'website/public/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
        ]
      }
@@ -87,6 +88,7 @@ module.exports = function(grunt) {
          'website/build/common/dist/sprites/*.png',
          'website/build/common/img/sprites/backer-only/*.gif',
          'website/build/common/img/sprites/npc_ian.gif',
+          'website/build/common/img/sprites/quest_burnout.gif',
          'website/build/bower_components/bootstrap/dist/fonts/*'
        ],
        dest: 'website/build/*.css'
--- a/common/css/index.css
+++ b/common/css/index.css
@@ -1,7 +1,3 @@
-/*[class*='Pet_'] {
-  margin-left: 1.25em;
-}*/
-
 /* Comment out for holiday events
 .npc_ian {
  background: url("/common/img/sprites/npc_ian.gif") no-repeat;
@@ -9,6 +5,12 @@
  height: 135px;
 } */

+.quest_burnout {
+  background: url("/common/img/sprites/quest_burnout.gif") no-repeat;
+  width: 219px;
+  height: 249px;
+}
+
 .Gems {
  display:inline-block;
  margin-right:5px;
--- a/common/dist/sprites/habitrpg-shared.css
+++ b/common/dist/sprites/habitrpg-shared.css
--- a/common/dist/sprites/spritesmith-largeSprites-0.css
+++ b/common/dist/sprites/spritesmith-largeSprites-0.css
@@ -1,84 +1,90 @@
 .2014_Fall_HealerPROMO2 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -564px -843px;
+  background-position: -472px -950px;
  width: 90px;
  height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -578px -752px;
+  background-position: -970px -392px;
  width: 120px;
  height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -699px -752px;
+  background-position: -970px -589px;
  width: 105px;
  height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -473px -843px;
+  background-position: -563px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_backtoschool {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px -251px;
+  background-position: -220px -220px;
  width: 150px;
  height: 150px;
 }
+.promo_burnout {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: 0px -220px;
+  width: 219px;
+  height: 240px;
+}
 .promo_classes_fall_2014 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -567px;
+  background-position: -326px -664px;
  width: 321px;
  height: 100px;
 }
 .promo_classes_fall_2015 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -269px;
+  background-position: 0px -564px;
  width: 377px;
  height: 99px;
 }
 .promo_dilatoryDistress {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -837px -843px;
+  background-position: -290px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_enchanted_armoire {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -322px -567px;
+  background-position: -378px -564px;
  width: 374px;
  height: 76px;
 }
 .promo_enchanted_armoire_201507 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px -550px;
+  background-position: -507px -859px;
  width: 217px;
  height: 90px;
 }
 .promo_enchanted_armoire_201508 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -699px -103px;
+  background-position: -725px -859px;
  width: 180px;
  height: 90px;
 }
 .promo_enchanted_armoire_201509 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -291px -843px;
+  background-position: -836px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_habitica {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -271px -220px;
+  background-position: -723px -166px;
  width: 175px;
  height: 175px;
 }
 .promo_haunted_hair {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1023px -402px;
+  background-position: -970px -148px;
  width: 100px;
  height: 137px;
 }
@@ -90,133 +96,133 @@
 }
 .promo_item_notif {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px 0px;
+  background-position: -452px -347px;
  width: 249px;
  height: 102px;
 }
 .promo_mystery_201405 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -200px -843px;
+  background-position: -199px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201406 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1033px -251px;
+  background-position: -970px -680px;
  width: 90px;
  height: 96px;
 }
 .promo_mystery_201407 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -195px -949px;
+  background-position: -1111px -431px;
  width: 42px;
  height: 62px;
 }
 .promo_mystery_201408 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -805px -752px;
+  background-position: -1111px -155px;
  width: 60px;
  height: 71px;
 }
 .promo_mystery_201409 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -746px -843px;
+  background-position: -745px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201410 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -809px -668px;
+  background-position: -1111px -91px;
  width: 72px;
  height: 63px;
 }
 .promo_mystery_201411 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -928px -843px;
+  background-position: -927px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201412 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -152px -949px;
+  background-position: -1154px -361px;
  width: 42px;
  height: 66px;
 }
 .promo_mystery_201501 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1081px -732px;
+  background-position: -1111px -297px;
  width: 48px;
  height: 63px;
 }
 .promo_mystery_201502 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -382px -843px;
+  background-position: -381px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201503 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -949px;
+  background-position: -1111px 0px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201504 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -91px -949px;
+  background-position: -1111px -227px;
  width: 60px;
  height: 69px;
 }
 .promo_mystery_201505 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -655px -843px;
+  background-position: -654px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_201506 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -830px -269px;
+  background-position: -1111px -361px;
  width: 42px;
  height: 69px;
 }
 .promo_mystery_201507 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1039px -103px;
+  background-position: -970px -483px;
  width: 90px;
  height: 105px;
 }
 .promo_mystery_201508 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -106px -843px;
+  background-position: -970px -777px;
  width: 93px;
  height: 90px;
 }
 .promo_mystery_201509 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1019px -843px;
+  background-position: -1018px -950px;
  width: 90px;
  height: 90px;
 }
 .promo_mystery_3014 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px -641px;
+  background-position: -289px -859px;
  width: 217px;
  height: 90px;
 }
 .promo_orca {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -843px;
+  background-position: -970px -286px;
  width: 105px;
  height: 105px;
 }
 .promo_partyhats {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -699px -194px;
+  background-position: -970px -868px;
  width: 115px;
  height: 47px;
 }
 .promo_pastel_skin {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -668px;
+  background-position: 0px -775px;
  width: 330px;
  height: 83px;
 }
@@ -228,7 +234,7 @@
 }
 .promo_pet_skins {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px -402px;
+  background-position: -970px 0px;
  width: 140px;
  height: 147px;
 }
@@ -240,7 +246,7 @@
 }
 .promo_shimmer_hair {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -668px;
+  background-position: -331px -775px;
  width: 330px;
  height: 83px;
 }
@@ -252,7 +258,7 @@
 }
 .promo_splashyskins {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px -732px;
+  background-position: 0px -950px;
  width: 198px;
  height: 91px;
 }
@@ -264,49 +270,49 @@
 }
 .promo_springclasses2014 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -289px -752px;
+  background-position: -430px -461px;
  width: 288px;
  height: 90px;
 }
 .promo_springclasses2015 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -752px;
+  background-position: 0px -859px;
  width: 288px;
  height: 90px;
 }
 .promo_summer_classes_2014 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
+  background-position: 0px -461px;
  width: 429px;
  height: 102px;
 }
 .promo_summer_classes_2015 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -573px -401px;
+  background-position: -648px -664px;
  width: 300px;
  height: 88px;
 }
 .promo_updos {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -882px -103px;
+  background-position: -723px -342px;
  width: 156px;
  height: 147px;
 }
 .promo_veteran_pets {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -662px -668px;
+  background-position: -753px -564px;
  width: 146px;
  height: 75px;
 }
 .promo_winterclasses2015 {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -247px -401px;
+  background-position: 0px -664px;
  width: 325px;
  height: 110px;
 }
 .promo_winteryhair {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -697px -567px;
+  background-position: -220px -371px;
  width: 152px;
  height: 75px;
 }
@@ -324,19 +330,19 @@
 }
 .welcome_basic_avatars {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -103px;
+  background-position: -452px -181px;
  width: 246px;
  height: 165px;
 }
 .welcome_promo_party {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -220px;
+  background-position: -452px 0px;
  width: 270px;
  height: 180px;
 }
 .welcome_sample_tasks {
  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -401px;
+  background-position: -723px 0px;
  width: 246px;
  height: 165px;
 }
--- a/common/dist/sprites/spritesmith-largeSprites-0.png
+++ b/common/dist/sprites/spritesmith-largeSprites-0.png
--- a/common/dist/sprites/spritesmith-main-0.css
+++ b/common/dist/sprites/spritesmith-main-0.css
@@ -1,6 +1,6 @@
 .achievement-alien {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1678px -533px;
+  background-position: -1703px -533px;
  width: 24px;
  height: 26px;
 }
@@ -12,17 +12,23 @@
 }
 .achievement-armor {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1728px -506px;
+  background-position: -1678px -533px;
  width: 24px;
  height: 26px;
 }
 .achievement-boot {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1703px -506px;
+  background-position: -1728px -506px;
  width: 24px;
  height: 26px;
 }
 .achievement-bow {
+  background-image: url(spritesmith-main-0.png);
+  background-position: -1703px -506px;
+  width: 24px;
+  height: 26px;
+}
+.achievement-burnout {
  background-image: url(spritesmith-main-0.png);
  background-position: -1678px -506px;
  width: 24px;
@@ -546,7 +552,7 @@
 }
 .hair_beard_1_TRUred {
  background-image: url(spritesmith-main-0.png);
-  background-position: -819px -1127px;
+  background-position: -1001px -1218px;
  width: 90px;
  height: 90px;
 }
@@ -882,7 +888,7 @@
 }
 .hair_beard_1_white {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1001px -1218px;
+  background-position: -1092px -1218px;
  width: 90px;
  height: 90px;
 }
@@ -894,7 +900,7 @@
 }
 .hair_beard_1_winternight {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1092px -1218px;
+  background-position: -1183px -1218px;
  width: 90px;
  height: 90px;
 }
@@ -906,7 +912,7 @@
 }
 .hair_beard_1_winterstar {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1183px -1218px;
+  background-position: -1314px 0px;
  width: 90px;
  height: 90px;
 }
@@ -918,7 +924,7 @@
 }
 .hair_beard_1_yellow {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1314px 0px;
+  background-position: -1314px -91px;
  width: 90px;
  height: 90px;
 }
@@ -930,7 +936,7 @@
 }
 .hair_beard_1_zombie {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1314px -91px;
+  background-position: -1314px -182px;
  width: 90px;
  height: 90px;
 }
@@ -942,7 +948,7 @@
 }
 .hair_beard_2_TRUred {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1314px -182px;
+  background-position: -1405px -91px;
  width: 90px;
  height: 90px;
 }
@@ -1278,7 +1284,7 @@
 }
 .hair_beard_2_white {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1405px -91px;
+  background-position: -1405px -182px;
  width: 90px;
  height: 90px;
 }
@@ -1290,7 +1296,7 @@
 }
 .hair_beard_2_winternight {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1405px -182px;
+  background-position: -1405px -273px;
  width: 90px;
  height: 90px;
 }
@@ -1302,7 +1308,7 @@
 }
 .hair_beard_2_winterstar {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1405px -273px;
+  background-position: -1405px -364px;
  width: 90px;
  height: 90px;
 }
@@ -1314,7 +1320,7 @@
 }
 .hair_beard_2_yellow {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1405px -364px;
+  background-position: -1405px -455px;
  width: 90px;
  height: 90px;
 }
@@ -1326,7 +1332,7 @@
 }
 .hair_beard_2_zombie {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1405px -455px;
+  background-position: -1405px -546px;
  width: 90px;
  height: 90px;
 }
@@ -1338,7 +1344,7 @@
 }
 .hair_beard_3_TRUred {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1405px -546px;
+  background-position: -1496px -273px;
  width: 90px;
  height: 90px;
 }
@@ -1674,7 +1680,7 @@
 }
 .hair_beard_3_white {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1496px -273px;
+  background-position: -1496px -364px;
  width: 90px;
  height: 90px;
 }
@@ -1686,7 +1692,7 @@
 }
 .hair_beard_3_winternight {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1496px -364px;
+  background-position: -1496px -455px;
  width: 90px;
  height: 90px;
 }
@@ -1698,7 +1704,7 @@
 }
 .hair_beard_3_winterstar {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1496px -455px;
+  background-position: -1496px -546px;
  width: 90px;
  height: 90px;
 }
@@ -1710,7 +1716,7 @@
 }
 .hair_beard_3_yellow {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1496px -546px;
+  background-position: -1496px -637px;
  width: 90px;
  height: 90px;
 }
@@ -1722,7 +1728,7 @@
 }
 .hair_beard_3_zombie {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1496px -637px;
+  background-position: -1496px -728px;
  width: 90px;
  height: 90px;
 }
@@ -1734,7 +1740,7 @@
 }
 .hair_mustache_1_TRUred {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1496px -728px;
+  background-position: -1587px -273px;
  width: 90px;
  height: 90px;
 }
@@ -2070,7 +2076,7 @@
 }
 .hair_mustache_1_white {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1587px -273px;
+  background-position: -1587px -364px;
  width: 90px;
  height: 90px;
 }
@@ -2082,7 +2088,7 @@
 }
 .hair_mustache_1_winternight {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1587px -364px;
+  background-position: -1587px -455px;
  width: 90px;
  height: 90px;
 }
@@ -2094,7 +2100,7 @@
 }
 .hair_mustache_1_winterstar {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1587px -455px;
+  background-position: -1587px -546px;
  width: 90px;
  height: 90px;
 }
@@ -2106,7 +2112,7 @@
 }
 .hair_mustache_1_yellow {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1587px -546px;
+  background-position: -1587px -637px;
  width: 90px;
  height: 90px;
 }
@@ -2118,7 +2124,7 @@
 }
 .hair_mustache_1_zombie {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1587px -637px;
+  background-position: -1587px -728px;
  width: 90px;
  height: 90px;
 }
@@ -2130,7 +2136,7 @@
 }
 .hair_mustache_2_TRUred {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1587px -728px;
+  background-position: -1678px -91px;
  width: 90px;
  height: 90px;
 }
@@ -2466,7 +2472,7 @@
 }
 .hair_mustache_2_white {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1678px -91px;
+  background-position: -910px -1309px;
  width: 90px;
  height: 90px;
 }
@@ -2478,7 +2484,7 @@
 }
 .hair_mustache_2_winternight {
  background-image: url(spritesmith-main-0.png);
-  background-position: -910px -1309px;
+  background-position: -1132px -910px;
  width: 90px;
  height: 90px;
 }
@@ -2490,7 +2496,7 @@
 }
 .hair_mustache_2_winterstar {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -728px;
+  background-position: -1132px -819px;
  width: 90px;
  height: 90px;
 }
@@ -2502,7 +2508,7 @@
 }
 .hair_mustache_2_yellow {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -637px;
+  background-position: -1132px -728px;
  width: 90px;
  height: 90px;
 }
@@ -2514,7 +2520,7 @@
 }
 .hair_mustache_2_zombie {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -546px;
+  background-position: -1132px -637px;
  width: 90px;
  height: 90px;
 }
@@ -2526,7 +2532,7 @@
 }
 .hair_flower_1 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -455px;
+  background-position: -1132px -546px;
  width: 90px;
  height: 90px;
 }
@@ -2538,7 +2544,7 @@
 }
 .hair_flower_2 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -364px;
+  background-position: -1132px -455px;
  width: 90px;
  height: 90px;
 }
@@ -2550,7 +2556,7 @@
 }
 .hair_flower_3 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -273px;
+  background-position: -1132px -364px;
  width: 90px;
  height: 90px;
 }
@@ -2562,7 +2568,7 @@
 }
 .hair_flower_4 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -182px;
+  background-position: -1132px -273px;
  width: 90px;
  height: 90px;
 }
@@ -2574,7 +2580,7 @@
 }
 .hair_flower_5 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -91px;
+  background-position: -1132px -182px;
  width: 90px;
  height: 90px;
 }
@@ -2586,19 +2592,7 @@
 }
 .hair_flower_6 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px 0px;
-  width: 90px;
-  height: 90px;
-}
-.customize-option. {
-  background-image: url();
-  background-position:  ;
-  width: ;
-  height: ;
-}
-.hair_bangs_1_TRUred {
-  background-image: url(spritesmith-main-0.png);
-  background-position: -1001px -1036px;
+  background-position: -1132px -91px;
  width: 90px;
  height: 90px;
 }
@@ -2610,7 +2604,7 @@
 }
 .hair_bangs_1_aurora {
  background-image: url(spritesmith-main-0.png);
-  background-position: -910px -1036px;
+  background-position: -1132px 0px;
  width: 90px;
  height: 90px;
 }
@@ -2622,7 +2616,7 @@
 }
 .hair_bangs_1_black {
  background-image: url(spritesmith-main-0.png);
-  background-position: -819px -1036px;
+  background-position: -1001px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2634,7 +2628,7 @@
 }
 .hair_bangs_1_blond {
  background-image: url(spritesmith-main-0.png);
-  background-position: -728px -1036px;
+  background-position: -910px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2646,7 +2640,7 @@
 }
 .hair_bangs_1_blue {
  background-image: url(spritesmith-main-0.png);
-  background-position: -637px -1036px;
+  background-position: -819px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2658,7 +2652,7 @@
 }
 .hair_bangs_1_brown {
  background-image: url(spritesmith-main-0.png);
-  background-position: -546px -1036px;
+  background-position: -728px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2670,7 +2664,7 @@
 }
 .hair_bangs_1_candycane {
  background-image: url(spritesmith-main-0.png);
-  background-position: -455px -1036px;
+  background-position: -637px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2682,7 +2676,7 @@
 }
 .hair_bangs_1_candycorn {
  background-image: url(spritesmith-main-0.png);
-  background-position: -364px -1036px;
+  background-position: -546px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2694,7 +2688,7 @@
 }
 .hair_bangs_1_festive {
  background-image: url(spritesmith-main-0.png);
-  background-position: -273px -1036px;
+  background-position: -455px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2706,7 +2700,7 @@
 }
 .hair_bangs_1_frost {
  background-image: url(spritesmith-main-0.png);
-  background-position: -182px -1036px;
+  background-position: -364px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2718,7 +2712,7 @@
 }
 .hair_bangs_1_ghostwhite {
  background-image: url(spritesmith-main-0.png);
-  background-position: -91px -1036px;
+  background-position: -273px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2730,7 +2724,7 @@
 }
 .hair_bangs_1_green {
  background-image: url(spritesmith-main-0.png);
-  background-position: 0px -1036px;
+  background-position: -182px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2742,7 +2736,7 @@
 }
 .hair_bangs_1_halloween {
  background-image: url(spritesmith-main-0.png);
-  background-position: -969px -888px;
+  background-position: -91px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2754,7 +2748,7 @@
 }
 .hair_bangs_1_holly {
  background-image: url(spritesmith-main-0.png);
-  background-position: -878px -888px;
+  background-position: 0px -1036px;
  width: 90px;
  height: 90px;
 }
@@ -2766,7 +2760,7 @@
 }
 .hair_bangs_1_hollygreen {
  background-image: url(spritesmith-main-0.png);
-  background-position: -787px -888px;
+  background-position: -969px -888px;
  width: 90px;
  height: 90px;
 }
@@ -2778,7 +2772,7 @@
 }
 .hair_bangs_1_midnight {
  background-image: url(spritesmith-main-0.png);
-  background-position: -696px -888px;
+  background-position: -878px -888px;
  width: 90px;
  height: 90px;
 }
@@ -2790,7 +2784,7 @@
 }
 .hair_bangs_1_pblue {
  background-image: url(spritesmith-main-0.png);
-  background-position: -605px -888px;
+  background-position: -787px -888px;
  width: 90px;
  height: 90px;
 }
@@ -2802,7 +2796,7 @@
 }
 .hair_bangs_1_pblue2 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -514px -888px;
+  background-position: -696px -888px;
  width: 90px;
  height: 90px;
 }
@@ -2814,7 +2808,7 @@
 }
 .hair_bangs_1_peppermint {
  background-image: url(spritesmith-main-0.png);
-  background-position: -728px -1127px;
+  background-position: -605px -888px;
  width: 90px;
  height: 90px;
 }
@@ -2826,7 +2820,7 @@
 }
 .hair_bangs_1_pgreen {
  background-image: url(spritesmith-main-0.png);
-  background-position: -637px -1127px;
+  background-position: -514px -888px;
  width: 90px;
  height: 90px;
 }
@@ -2838,7 +2832,7 @@
 }
 .hair_bangs_1_pgreen2 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -546px -1127px;
+  background-position: -819px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2850,7 +2844,7 @@
 }
 .hair_bangs_1_porange {
  background-image: url(spritesmith-main-0.png);
-  background-position: -455px -1127px;
+  background-position: -728px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2862,7 +2856,7 @@
 }
 .hair_bangs_1_porange2 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -364px -1127px;
+  background-position: -637px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2874,7 +2868,7 @@
 }
 .hair_bangs_1_ppink {
  background-image: url(spritesmith-main-0.png);
-  background-position: -273px -1127px;
+  background-position: -546px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2886,7 +2880,7 @@
 }
 .hair_bangs_1_ppink2 {
  background-image: url(spritesmith-main-0.png);
-  background-position: -182px -1127px;
+  background-position: -455px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2898,7 +2892,7 @@
 }
 .hair_bangs_1_ppurple {
  background-image: url(spritesmith-main-0.png);
-  background-position: -91px -1127px;
+  background-position: -364px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2910,7 +2904,7 @@
 }
 .hair_bangs_1_ppurple2 {
  background-image: url(spritesmith-main-0.png);
-  background-position: 0px -1127px;
+  background-position: -273px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2922,7 +2916,7 @@
 }
 .hair_bangs_1_pumpkin {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -1001px;
+  background-position: -182px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2934,7 +2928,7 @@
 }
 .hair_bangs_1_purple {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -910px;
+  background-position: -91px -1127px;
  width: 90px;
  height: 90px;
 }
@@ -2946,7 +2940,19 @@
 }
 .hair_bangs_1_pyellow {
  background-image: url(spritesmith-main-0.png);
-  background-position: -1132px -819px;
+  background-position: 0px -1127px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option. {
+  background-image: url();
+  background-position:  ;
+  width: ;
+  height: ;
+}
+.hair_bangs_1_pyellow2 {
+  background-image: url(spritesmith-main-0.png);
+  background-position: -1132px -1001px;
  width: 90px;
  height: 90px;
 }
--- a/common/dist/sprites/spritesmith-main-0.png
+++ b/common/dist/sprites/spritesmith-main-0.png
--- a/common/dist/sprites/spritesmith-main-1.css
+++ b/common/dist/sprites/spritesmith-main-1.css
--- a/common/dist/sprites/spritesmith-main-1.png
+++ b/common/dist/sprites/spritesmith-main-1.png
--- a/common/dist/sprites/spritesmith-main-2.css
+++ b/common/dist/sprites/spritesmith-main-2.css
--- a/common/dist/sprites/spritesmith-main-2.png
+++ b/common/dist/sprites/spritesmith-main-2.png
--- a/common/dist/sprites/spritesmith-main-3.css
+++ b/common/dist/sprites/spritesmith-main-3.css
@@ -468,7 +468,7 @@
 }
 .skin_0ff591 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -273px -546px;
+  background-position: -364px -546px;
  width: 90px;
  height: 90px;
 }
@@ -480,7 +480,7 @@
 }
 .skin_0ff591_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -364px -546px;
+  background-position: -273px -546px;
  width: 90px;
  height: 90px;
 }
@@ -492,7 +492,7 @@
 }
 .skin_2b43f6 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -455px -546px;
+  background-position: -546px -546px;
  width: 90px;
  height: 90px;
 }
@@ -504,7 +504,7 @@
 }
 .skin_2b43f6_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -546px -546px;
+  background-position: -455px -546px;
  width: 90px;
  height: 90px;
 }
@@ -516,7 +516,7 @@
 }
 .skin_6bd049 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -639px 0px;
+  background-position: -639px -91px;
  width: 90px;
  height: 90px;
 }
@@ -528,7 +528,7 @@
 }
 .skin_6bd049_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -639px -91px;
+  background-position: -639px 0px;
  width: 90px;
  height: 90px;
 }
@@ -540,7 +540,7 @@
 }
 .skin_800ed0 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -639px -182px;
+  background-position: -639px -273px;
  width: 90px;
  height: 90px;
 }
@@ -552,7 +552,7 @@
 }
 .skin_800ed0_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -639px -273px;
+  background-position: -639px -182px;
  width: 90px;
  height: 90px;
 }
@@ -564,7 +564,7 @@
 }
 .skin_915533 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -639px -364px;
+  background-position: -639px -455px;
  width: 90px;
  height: 90px;
 }
@@ -576,7 +576,7 @@
 }
 .skin_915533_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -639px -455px;
+  background-position: -639px -364px;
  width: 90px;
  height: 90px;
 }
@@ -588,7 +588,7 @@
 }
 .skin_98461a {
  background-image: url(spritesmith-main-3.png);
-  background-position: -639px -546px;
+  background-position: 0px -637px;
  width: 90px;
  height: 90px;
 }
@@ -600,7 +600,7 @@
 }
 .skin_98461a_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: 0px -637px;
+  background-position: -639px -546px;
  width: 90px;
  height: 90px;
 }
@@ -612,7 +612,7 @@
 }
 .skin_bear {
  background-image: url(spritesmith-main-3.png);
-  background-position: -91px -637px;
+  background-position: -182px -637px;
  width: 90px;
  height: 90px;
 }
@@ -624,7 +624,7 @@
 }
 .skin_bear_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -182px -637px;
+  background-position: -91px -637px;
  width: 90px;
  height: 90px;
 }
@@ -636,7 +636,7 @@
 }
 .skin_c06534 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -273px -637px;
+  background-position: -364px -637px;
  width: 90px;
  height: 90px;
 }
@@ -648,7 +648,7 @@
 }
 .skin_c06534_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -364px -637px;
+  background-position: -273px -637px;
  width: 90px;
  height: 90px;
 }
@@ -660,7 +660,7 @@
 }
 .skin_c3e1dc {
  background-image: url(spritesmith-main-3.png);
-  background-position: -455px -637px;
+  background-position: -546px -637px;
  width: 90px;
  height: 90px;
 }
@@ -672,7 +672,7 @@
 }
 .skin_c3e1dc_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -546px -637px;
+  background-position: -455px -637px;
  width: 90px;
  height: 90px;
 }
@@ -684,7 +684,7 @@
 }
 .skin_cactus {
  background-image: url(spritesmith-main-3.png);
-  background-position: -637px -637px;
+  background-position: -730px 0px;
  width: 90px;
  height: 90px;
 }
@@ -696,7 +696,7 @@
 }
 .skin_cactus_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -730px 0px;
+  background-position: -637px -637px;
  width: 90px;
  height: 90px;
 }
@@ -708,7 +708,7 @@
 }
 .skin_candycorn {
  background-image: url(spritesmith-main-3.png);
-  background-position: -730px -91px;
+  background-position: -730px -182px;
  width: 90px;
  height: 90px;
 }
@@ -720,7 +720,7 @@
 }
 .skin_candycorn_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -730px -182px;
+  background-position: -730px -91px;
  width: 90px;
  height: 90px;
 }
@@ -732,7 +732,7 @@
 }
 .skin_clownfish {
  background-image: url(spritesmith-main-3.png);
-  background-position: -730px -273px;
+  background-position: -730px -364px;
  width: 90px;
  height: 90px;
 }
@@ -744,7 +744,7 @@
 }
 .skin_clownfish_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -730px -364px;
+  background-position: -730px -273px;
  width: 90px;
  height: 90px;
 }
@@ -756,7 +756,7 @@
 }
 .skin_d7a9f7 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -730px -455px;
+  background-position: -730px -546px;
  width: 90px;
  height: 90px;
 }
@@ -768,7 +768,7 @@
 }
 .skin_d7a9f7_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -730px -546px;
+  background-position: -730px -455px;
  width: 90px;
  height: 90px;
 }
@@ -780,7 +780,7 @@
 }
 .skin_ddc994 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -730px -637px;
+  background-position: 0px -728px;
  width: 90px;
  height: 90px;
 }
@@ -792,7 +792,7 @@
 }
 .skin_ddc994_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: 0px -728px;
+  background-position: -730px -637px;
  width: 90px;
  height: 90px;
 }
@@ -804,7 +804,7 @@
 }
 .skin_deepocean {
  background-image: url(spritesmith-main-3.png);
-  background-position: -91px -728px;
+  background-position: -182px -728px;
  width: 90px;
  height: 90px;
 }
@@ -816,7 +816,7 @@
 }
 .skin_deepocean_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -182px -728px;
+  background-position: -91px -728px;
  width: 90px;
  height: 90px;
 }
@@ -828,7 +828,7 @@
 }
 .skin_ea8349 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -273px -728px;
+  background-position: -364px -728px;
  width: 90px;
  height: 90px;
 }
@@ -840,7 +840,7 @@
 }
 .skin_ea8349_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -364px -728px;
+  background-position: -273px -728px;
  width: 90px;
  height: 90px;
 }
@@ -852,7 +852,7 @@
 }
 .skin_eb052b {
  background-image: url(spritesmith-main-3.png);
-  background-position: -455px -728px;
+  background-position: -546px -728px;
  width: 90px;
  height: 90px;
 }
@@ -864,7 +864,7 @@
 }
 .skin_eb052b_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -546px -728px;
+  background-position: -455px -728px;
  width: 90px;
  height: 90px;
 }
@@ -876,7 +876,7 @@
 }
 .skin_f5a76e {
  background-image: url(spritesmith-main-3.png);
-  background-position: -637px -728px;
+  background-position: -728px -728px;
  width: 90px;
  height: 90px;
 }
@@ -888,7 +888,7 @@
 }
 .skin_f5a76e_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -728px -728px;
+  background-position: -637px -728px;
  width: 90px;
  height: 90px;
 }
@@ -900,7 +900,7 @@
 }
 .skin_f5d70f {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px 0px;
+  background-position: -821px -91px;
  width: 90px;
  height: 90px;
 }
@@ -912,7 +912,7 @@
 }
 .skin_f5d70f_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px -91px;
+  background-position: -821px 0px;
  width: 90px;
  height: 90px;
 }
@@ -924,7 +924,7 @@
 }
 .skin_f69922 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px -182px;
+  background-position: -821px -273px;
  width: 90px;
  height: 90px;
 }
@@ -936,7 +936,7 @@
 }
 .skin_f69922_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px -273px;
+  background-position: -821px -182px;
  width: 90px;
  height: 90px;
 }
@@ -948,7 +948,7 @@
 }
 .skin_fox {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px -364px;
+  background-position: -821px -455px;
  width: 90px;
  height: 90px;
 }
@@ -960,7 +960,7 @@
 }
 .skin_fox_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px -455px;
+  background-position: -821px -364px;
  width: 90px;
  height: 90px;
 }
@@ -972,7 +972,7 @@
 }
 .skin_ghost {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px -546px;
+  background-position: -821px -637px;
  width: 90px;
  height: 90px;
 }
@@ -984,7 +984,7 @@
 }
 .skin_ghost_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px -637px;
+  background-position: -821px -546px;
  width: 90px;
  height: 90px;
 }
@@ -996,7 +996,7 @@
 }
 .skin_lion {
  background-image: url(spritesmith-main-3.png);
-  background-position: -821px -728px;
+  background-position: 0px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1008,7 +1008,7 @@
 }
 .skin_lion_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: 0px -819px;
+  background-position: -821px -728px;
  width: 90px;
  height: 90px;
 }
@@ -1020,7 +1020,7 @@
 }
 .skin_merblue {
  background-image: url(spritesmith-main-3.png);
-  background-position: -91px -819px;
+  background-position: -182px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1032,7 +1032,7 @@
 }
 .skin_merblue_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -182px -819px;
+  background-position: -91px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1044,7 +1044,7 @@
 }
 .skin_mergold {
  background-image: url(spritesmith-main-3.png);
-  background-position: -273px -819px;
+  background-position: -364px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1056,7 +1056,7 @@
 }
 .skin_mergold_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -364px -819px;
+  background-position: -273px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1068,7 +1068,7 @@
 }
 .skin_mergreen {
  background-image: url(spritesmith-main-3.png);
-  background-position: -455px -819px;
+  background-position: -546px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1080,7 +1080,7 @@
 }
 .skin_mergreen_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -546px -819px;
+  background-position: -455px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1092,7 +1092,7 @@
 }
 .skin_merruby {
  background-image: url(spritesmith-main-3.png);
-  background-position: -637px -819px;
+  background-position: -728px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1104,7 +1104,7 @@
 }
 .skin_merruby_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -728px -819px;
+  background-position: -637px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1116,7 +1116,7 @@
 }
 .skin_monster {
  background-image: url(spritesmith-main-3.png);
-  background-position: -819px -819px;
+  background-position: -912px 0px;
  width: 90px;
  height: 90px;
 }
@@ -1128,7 +1128,7 @@
 }
 .skin_monster_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px 0px;
+  background-position: -819px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1140,7 +1140,7 @@
 }
 .skin_ogre {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -91px;
+  background-position: -912px -182px;
  width: 90px;
  height: 90px;
 }
@@ -1152,7 +1152,7 @@
 }
 .skin_ogre_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -182px;
+  background-position: -912px -91px;
  width: 90px;
  height: 90px;
 }
@@ -1164,7 +1164,7 @@
 }
 .skin_panda {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -273px;
+  background-position: -912px -364px;
  width: 90px;
  height: 90px;
 }
@@ -1176,7 +1176,7 @@
 }
 .skin_panda_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -364px;
+  background-position: -912px -273px;
  width: 90px;
  height: 90px;
 }
@@ -1188,7 +1188,7 @@
 }
 .skin_pastelBlue {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -455px;
+  background-position: -912px -546px;
  width: 90px;
  height: 90px;
 }
@@ -1200,7 +1200,7 @@
 }
 .skin_pastelBlue_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -546px;
+  background-position: -912px -455px;
  width: 90px;
  height: 90px;
 }
@@ -1212,7 +1212,7 @@
 }
 .skin_pastelGreen {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -637px;
+  background-position: -912px -728px;
  width: 90px;
  height: 90px;
 }
@@ -1224,7 +1224,7 @@
 }
 .skin_pastelGreen_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -728px;
+  background-position: -912px -637px;
  width: 90px;
  height: 90px;
 }
@@ -1236,7 +1236,7 @@
 }
 .skin_pastelOrange {
  background-image: url(spritesmith-main-3.png);
-  background-position: -912px -819px;
+  background-position: 0px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1248,7 +1248,7 @@
 }
 .skin_pastelOrange_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: 0px -910px;
+  background-position: -912px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1260,7 +1260,7 @@
 }
 .skin_pastelPink {
  background-image: url(spritesmith-main-3.png);
-  background-position: -91px -910px;
+  background-position: -182px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1272,7 +1272,7 @@
 }
 .skin_pastelPink_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -182px -910px;
+  background-position: -91px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1284,7 +1284,7 @@
 }
 .skin_pastelPurple {
  background-image: url(spritesmith-main-3.png);
-  background-position: -273px -910px;
+  background-position: -364px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1296,7 +1296,7 @@
 }
 .skin_pastelPurple_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -364px -910px;
+  background-position: -273px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1308,7 +1308,7 @@
 }
 .skin_pastelRainbowChevron {
  background-image: url(spritesmith-main-3.png);
-  background-position: -455px -910px;
+  background-position: -546px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1320,7 +1320,7 @@
 }
 .skin_pastelRainbowChevron_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -546px -910px;
+  background-position: -455px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1332,7 +1332,7 @@
 }
 .skin_pastelRainbowDiagonal {
  background-image: url(spritesmith-main-3.png);
-  background-position: -637px -910px;
+  background-position: -728px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1344,7 +1344,7 @@
 }
 .skin_pastelRainbowDiagonal_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -728px -910px;
+  background-position: -637px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1356,7 +1356,7 @@
 }
 .skin_pastelYellow {
  background-image: url(spritesmith-main-3.png);
-  background-position: -819px -910px;
+  background-position: -910px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1368,7 +1368,7 @@
 }
 .skin_pastelYellow_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -910px -910px;
+  background-position: -819px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1380,7 +1380,7 @@
 }
 .skin_pig {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px 0px;
+  background-position: -1003px -91px;
  width: 90px;
  height: 90px;
 }
@@ -1392,7 +1392,7 @@
 }
 .skin_pig_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -91px;
+  background-position: -1003px 0px;
  width: 90px;
  height: 90px;
 }
@@ -1404,7 +1404,7 @@
 }
 .skin_pumpkin {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -182px;
+  background-position: -1003px -273px;
  width: 90px;
  height: 90px;
 }
@@ -1416,7 +1416,7 @@
 }
 .skin_pumpkin2 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -273px;
+  background-position: -1003px -455px;
  width: 90px;
  height: 90px;
 }
@@ -1440,7 +1440,7 @@
 }
 .skin_pumpkin_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -455px;
+  background-position: -1003px -182px;
  width: 90px;
  height: 90px;
 }
@@ -1452,7 +1452,7 @@
 }
 .skin_rainbow {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -546px;
+  background-position: -1003px -637px;
  width: 90px;
  height: 90px;
 }
@@ -1464,7 +1464,7 @@
 }
 .skin_rainbow_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -637px;
+  background-position: -1003px -546px;
  width: 90px;
  height: 90px;
 }
@@ -1476,7 +1476,7 @@
 }
 .skin_reptile {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -728px;
+  background-position: -1003px -819px;
  width: 90px;
  height: 90px;
 }
@@ -1488,7 +1488,7 @@
 }
 .skin_reptile_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -819px;
+  background-position: -1003px -728px;
  width: 90px;
  height: 90px;
 }
@@ -1500,7 +1500,7 @@
 }
 .skin_shadow {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1003px -910px;
+  background-position: 0px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1512,7 +1512,7 @@
 }
 .skin_shadow2 {
  background-image: url(spritesmith-main-3.png);
-  background-position: 0px -1001px;
+  background-position: -182px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1536,7 +1536,7 @@
 }
 .skin_shadow_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -182px -1001px;
+  background-position: -1003px -910px;
  width: 90px;
  height: 90px;
 }
@@ -1548,7 +1548,7 @@
 }
 .skin_shark {
  background-image: url(spritesmith-main-3.png);
-  background-position: -273px -1001px;
+  background-position: -364px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1560,7 +1560,7 @@
 }
 .skin_shark_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -364px -1001px;
+  background-position: -273px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1572,7 +1572,7 @@
 }
 .skin_skeleton {
  background-image: url(spritesmith-main-3.png);
-  background-position: -455px -1001px;
+  background-position: -546px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1584,7 +1584,7 @@
 }
 .skin_skeleton2 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -546px -1001px;
+  background-position: -728px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1608,7 +1608,7 @@
 }
 .skin_skeleton_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -728px -1001px;
+  background-position: -455px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1620,7 +1620,7 @@
 }
 .skin_tiger {
  background-image: url(spritesmith-main-3.png);
-  background-position: -819px -1001px;
+  background-position: -910px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1632,7 +1632,7 @@
 }
 .skin_tiger_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -910px -1001px;
+  background-position: -819px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1644,7 +1644,7 @@
 }
 .skin_transparent {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1001px -1001px;
+  background-position: -1094px 0px;
  width: 90px;
  height: 90px;
 }
@@ -1656,7 +1656,7 @@
 }
 .skin_transparent_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1094px 0px;
+  background-position: -1001px -1001px;
  width: 90px;
  height: 90px;
 }
@@ -1668,7 +1668,7 @@
 }
 .skin_tropicalwater {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1094px -91px;
+  background-position: -1094px -182px;
  width: 90px;
  height: 90px;
 }
@@ -1680,7 +1680,7 @@
 }
 .skin_tropicalwater_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1094px -182px;
+  background-position: -1094px -91px;
  width: 90px;
  height: 90px;
 }
@@ -1692,7 +1692,7 @@
 }
 .skin_wolf {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1094px -273px;
+  background-position: -1094px -364px;
  width: 90px;
  height: 90px;
 }
@@ -1704,7 +1704,7 @@
 }
 .skin_wolf_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1094px -364px;
+  background-position: -1094px -273px;
  width: 90px;
  height: 90px;
 }
@@ -1716,7 +1716,7 @@
 }
 .skin_zombie {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1094px -455px;
+  background-position: -1094px -546px;
  width: 90px;
  height: 90px;
 }
@@ -1728,7 +1728,7 @@
 }
 .skin_zombie2 {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1094px -546px;
+  background-position: -1094px -728px;
  width: 90px;
  height: 90px;
 }
@@ -1752,7 +1752,7 @@
 }
 .skin_zombie_sleep {
  background-image: url(spritesmith-main-3.png);
-  background-position: -1094px -728px;
+  background-position: -1094px -455px;
  width: 90px;
  height: 90px;
 }
--- a/common/dist/sprites/spritesmith-main-3.png
+++ b/common/dist/sprites/spritesmith-main-3.png
--- a/common/dist/sprites/spritesmith-main-4.css
+++ b/common/dist/sprites/spritesmith-main-4.css
--- a/common/dist/sprites/spritesmith-main-4.png
+++ b/common/dist/sprites/spritesmith-main-4.png
--- a/common/dist/sprites/spritesmith-main-5.css
+++ b/common/dist/sprites/spritesmith-main-5.css
--- a/common/dist/sprites/spritesmith-main-5.png
+++ b/common/dist/sprites/spritesmith-main-5.png
--- a/common/dist/sprites/spritesmith-main-6.css
+++ b/common/dist/sprites/spritesmith-main-6.css
--- a/common/dist/sprites/spritesmith-main-6.png
+++ b/common/dist/sprites/spritesmith-main-6.png
--- a/common/dist/sprites/spritesmith-main-7.css
+++ b/common/dist/sprites/spritesmith-main-7.css
--- a/common/dist/sprites/spritesmith-main-7.png
+++ b/common/dist/sprites/spritesmith-main-7.png
--- a/common/dist/sprites/spritesmith-main-8.css
+++ b/common/dist/sprites/spritesmith-main-8.css
--- a/common/dist/sprites/spritesmith-main-8.png
+++ b/common/dist/sprites/spritesmith-main-8.png
--- a/common/dist/sprites/spritesmith-main-9.css
+++ b/common/dist/sprites/spritesmith-main-9.css
--- a/common/dist/sprites/spritesmith-main-9.png
+++ b/common/dist/sprites/spritesmith-main-9.png
--- a/common/img/sprites/quest_burnout.gif
+++ b/common/img/sprites/quest_burnout.gif
--- a/common/img/sprites/spritesmith/achievements/achievement-burnout.png
+++ b/common/img/sprites/spritesmith/achievements/achievement-burnout.png
--- a/common/img/sprites/spritesmith/npcs/npc_daniel_broken.png
+++ b/common/img/sprites/spritesmith/npcs/npc_daniel_broken.png
--- a/common/img/sprites/spritesmith/npcs/npc_ian_broken.png
+++ b/common/img/sprites/spritesmith/npcs/npc_ian_broken.png
--- a/common/img/sprites/spritesmith/npcs/seasonalshop_broken.png
+++ b/common/img/sprites/spritesmith/npcs/seasonalshop_broken.png
--- a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Phoenix-Base.png
+++ b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Phoenix-Base.png
--- a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Phoenix-Base.png
+++ b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Phoenix-Base.png
--- a/common/img/sprites/spritesmith/stable/pets/Pet-Phoenix-Base.png
+++ b/common/img/sprites/spritesmith/stable/pets/Pet-Phoenix-Base.png
--- a/common/img/sprites/spritesmith_large/promo/promo_burnout.png
+++ b/common/img/sprites/spritesmith_large/promo/promo_burnout.png
--- a/common/locales/en/generic.json
+++ b/common/locales/en/generic.json
@@ -110,7 +110,9 @@
    "December": "December",
    "dateFormat": "Date Format",
    "achievementStressbeast": "Savior of Stoïkalm",
-    "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2015 Winter Wonderland Event!",
+    "achievementStressbeastText": "Helped defeat the Abominable Stressbeast during the 2014 Winter Wonderland Event!",
+    "achievementBurnout": "Savior of the Flourishing Fields",
+    "achievementBurnoutText": "Helped defeat Burnout and restore the Exhaust Spirits during the 2015 Fall Festival Event!",
    "checkOutProgress": "Check out my progress in Habitica!",
    "cardReceived": "Received a card!",
    "cardReceivedFrom": "<%= cardType %> from <%= userName %>",
--- a/common/locales/en/pets.json
+++ b/common/locales/en/pets.json
@@ -18,6 +18,7 @@
    "mammoth": "Woolly Mammoth",
    "orca": "Orca",
    "royalPurpleGryphon": "Royal Purple Gryphon",
+    "phoenix": "Phoenix",
    "rarePetPop1": "Click the gold paw to learn more about how you can obtain this rare pet through contributing to Habitica!",
    "rarePetPop2": "How to Get this Pet!",
    "potion": "<%= potionType %> Potion",
--- a/common/locales/en/quests.json
+++ b/common/locales/en/quests.json
@@ -27,13 +27,14 @@
    "begin": "Begin",
    "bossHP": "Boss Health",
    "bossStrength": "Boss Strength",
+    "rage": "Rage",
    "collect": "Collect",
    "collected": "Collected",
    "collectionItems": "<%= number %> <%= items %>",
    "itemsToCollect": "Items to Collect",
    "bossDmg1": "Each completed Daily and To-Do and each positive Habit hurts the boss. Hurt it more with redder tasks or Brutal Smash and Burst of Flames. The boss will deal damage to every quest participant for every Daily you've missed (multiplied by the boss's Strength) in addition to your regular damage, so keep your party healthy by completing your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
    "bossDmg2": "Only participants will fight the boss and share in the quest loot.",
-    "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once his Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
+    "tavernBossInfo": "To hurt a world boss, complete your Dailies and To-Dos. Higher task damage means higher boss damage (completing reds, Mage spells, Warrior attacks, etc). For each Daily you've missed (multiplied by the boss's Strength), the boss's Rage will increase. Once its Rage reaches max, something bad will happen - so complete your Dailies! <strong>All damage to and from a boss is tallied on cron (your day roll-over).</strong>",
    "bossColl1": "To collect items, do your positive tasks. Quest items drop just like normal items; however, you won't see the drops until the next day, then everything you've found will be tallied up and contributed to the pile.",
    "bossColl2": "Only participants can collect items and share in the quest loot.",
    "abort": "Abort",
--- a/common/locales/en/questsContent.json
+++ b/common/locales/en/questsContent.json
@@ -291,5 +291,18 @@
  "questHorseCompletion": "It takes all your skill, but finally the horse stamps a couple of hooves and nuzzles you in the shoulder before allowing you to mount. You ride briefly but proudly around the Tavern grounds while your friends cheer. The stranger breaks into a broad grin.\n\"I can see that was no idle boast! Your determination is truly impressive. Take these eggs to raise horses of your own, and perhaps we'll meet again one day.\" You take the eggs, the stranger tips his hat... and vanishes.",
  "questHorseBoss": "Night-Mare",
  "questHorseDropHorseEgg": "Horse (Egg)",
-  "questHorseUnlockText": "Unlocks purchasable Horse eggs in the Market"
+  "questHorseUnlockText": "Unlocks purchasable Horse eggs in the Market",
+
+  "questBurnoutText": "Burnout and the Exhaust Spirits",
+  "questBurnoutNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Exhaust Strike Bar. When the Exhaust Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts not resting in the Inn will have their tasks tallied.<hr>It is well past midnight, still and stiflingly hot, when Redphoenix and scout captain Kiwibot abruptly burst through the city gates. \"We need to evacuate all the wooden buildings!\" Redphoenix shouts. \"Hurry!\"<br><br>Kiwibot grips the wall as she catches her breath. \"It's draining people and turning them into Exhaust Spirits! That's why everything was delayed. That's where the missing people have gone. It's been stealing their energy!\"<br><br>\"'It'?'\" asks Lemoness.<br><br>And then the heat takes form.<br><br>It rises from the earth in a billowing, twisting mass, and the air chokes with the scent of smoke and sulphur. Flames lick across the molten ground and contort into limbs, writhing to horrific heights. Smoldering eyes snap open, and the creature lets out a deep and crackling cackle.<br><br> Kiwibot whispers a single word.<br><br><em>\"Burnout.\"</em>",
+  "questBurnoutCompletion": "<strong>Burnout is DEFEATED!</strong><br><br>With a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.<br><br>Ian, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!<br><br>\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!<br><br>One of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"<br><br>Her tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"<br><br>She claps her hands. \"Now - let's celebrate!\"",
+  "questBurnoutCompletionChat": "`Burnout is DEFEATED!`\n\nWith a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.\n\nIan, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!\n\n\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!\n\nOne of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"\n\nHer tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"\n\nShe claps her hands. \"Now - let's celebrate!\"\n\nAll Habiticans receive:\n\nPhoenix Pet\nPhoenix Mount\nAchievement: Savior of the Flourishing Fields\nBasic Candy\nVanilla Candy\nSand Candy\nCinnamon Candy\nChocolate Candy\nRotten Candy\nSour Pink Candy\nSour Blue Candy\nHoney Candy",
+  "questBurnoutBoss": "Burnout",
+  "questBurnoutBossRageTitle": "Exhaust Strike",
+  "questBurnoutBossRageDescription": "When this gauge fills, Burnout will unleash its Exhaust Strike on Habitica!",
+  "questBurnoutDropPhoenixPet": "Phoenix (Pet)",
+  "questBurnoutDropPhoenixMount": "Phoenix (Mount)",
+  "questBurnoutBossRageQuests": "`Burnout uses EXHAUST STRIKE!`\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and now Burnout is inflamed with energy! With a crackling snarl, it engulfs Ian the Quest Master in a surge of spectral fire. As fallen quest scrolls smolder, the smoke clears, and you see that Ian has been drained of energy and turned into a drifting Exhaust Spirit!\n\nOnly defeating Burnout can break the spell and restore our beloved Quest Master. Let's keep our Dailies in check and defeat this monster before it attacks again!",
+  "questBurnoutBossRageSeasonalShop": "`Burnout uses EXHAUST STRIKE!`\n\nAhh!!! Our incomplete Dailies have fed the flames of Burnout, and now it has enough energy to strike again! It lets loose a gout of spectral flame that sears the Seasonal Shop. You're horrified to see that the cheery Seasonal Sorceress has been transformed into a drooping Exhaust Spirit.\n\nWe have to rescue our NPCs! Hurry, Habiticans, complete your tasks and defeat Burnout before it strikes for a third time!",
+  "questBurnoutBossRageTavern": "`Burnout uses EXHAUST STRIKE!`\n\nMany Habiticans have been hiding from Burnout in the Tavern, but no longer! With a screeching howl, Burnout rakes the Tavern with its white-hot hands. As the Tavern patrons flee, Daniel is caught in Burnout's grip, and transforms into an Exhaust Spirit right in front of you!\n\nThis hot-headed horror has gone on for too long. Don't give up... we're so close to vanquishing Burnout for once and for all!"
 }
--- a/common/script/content/index.coffee
+++ b/common/script/content/index.coffee
@@ -1143,6 +1143,7 @@ api.specialPets =
  'JackOLantern-Base':  'jackolantern'
  'Mammoth-Base':       'mammoth'
  'Tiger-Veteran':      'veteranTiger'
+  'Phoenix-Base':       'phoenix'

 api.specialMounts =
  'BearCub-Polar':       'polarBear'
@@ -1152,6 +1153,7 @@ api.specialMounts =
  'Mammoth-Base':        'mammoth'
  'Orca-Base':           'orca'
  'Gryphon-RoyalPurple': 'royalPurpleGryphon'
+  'Phoenix-Base':        'phoenix'

 api.timeTravelStable =
  pets:
@@ -1348,6 +1350,45 @@ api.quests =
      gp: 0
      exp: 0

+  burnout:
+    text: t('questBurnoutText')
+    notes: t('questBurnoutNotes')
+    completion: t('questBurnoutCompletion')
+    completionChat: t('questBurnoutCompletionChat')
+    value: 0
+    canBuy: (()->false)
+    category: 'world'
+    boss:
+      name: t('questBurnoutBoss')
+      hp: 11000000
+      str: 2.5
+      def: 1
+      rage:
+        title: t('questBurnoutBossRageTitle')
+        description: t('questBurnoutBossRageDescription')
+        value: 1000000
+        quests: t('questBurnoutBossRageQuests')
+        seasonalShop: t('questBurnoutBossRageSeasonalShop')
+        tavern: t('questBurnoutBossRageTavern')
+    drop:
+      items: [
+        {type: 'pets', key: 'Phoenix-Base', text: t('questBurnoutDropPhoenixPet')}
+        {type: 'mounts', key: 'Phoenix-Base', text: t('questBurnoutDropPhoenixMount')}
+
+        {type: 'food', key: 'Candy_Base', text: t('foodCandyBase')}
+        {type: 'food', key: 'Candy_White', text: t('foodCandyWhite')}
+        {type: 'food', key: 'Candy_Desert', text: t('foodCandyDesert')}
+        {type: 'food', key: 'Candy_Red', text: t('foodCandyRed')}
+        {type: 'food', key: 'Candy_Shade', text: t('foodCandyShade')}
+        {type: 'food', key: 'Candy_Skeleton', text: t('foodCandySkeleton')}
+        {type: 'food', key: 'Candy_Zombie', text: t('foodCandyZombie')}
+        {type: 'food', key: 'Candy_CottonCandyPink', text: t('foodCandyCottonCandyPink')}
+        {type: 'food', key: 'Candy_CottonCandyBlue', text: t('foodCandyCottonCandyBlue')}
+        {type: 'food', key: 'Candy_Golden', text: t('foodCandyGolden')}
+      ]
+      gp: 0
+      exp: 0
+
  evilsanta:
    canBuy: (()->false)
    text: t('questEvilSantaText') # title of the quest (eg, Deep into Vice's Layer)
--- a/common/script/src/content/pets-mounts/special-mounts.js
+++ b/common/script/src/content/pets-mounts/special-mounts.js
@@ -6,6 +6,7 @@ let specialMounts = {
  'Mammoth-Base':        'mammoth',
  'Orca-Base':           'orca',
  'Gryphon-RoyalPurple': 'royalPurpleGryphon',
+  'Phoenix-Base':        'phoenix'
 }

 export default specialMounts;
--- a/common/script/src/content/pets-mounts/special-pets.js
+++ b/common/script/src/content/pets-mounts/special-pets.js
@@ -8,6 +8,7 @@ let specialPets = {
  'JackOLantern-Base': 'jackolantern',
  'Mammoth-Base':      'mammoth',
  'Tiger-Veteran':     'veteranTiger',
+  'Phoenix-Base':      'phoenix'
 }

 export default specialPets;
--- a/common/script/src/content/quests/world.js
+++ b/common/script/src/content/quests/world.js
@@ -154,6 +154,78 @@ let worldQuests = {
      exp: 0
    }
  },
+  burnout: {
+    completionChat: t('questBurnoutCompletionChat'),
+    boss: {
+      name: t('questBurnoutBoss'),
+      hp: 11000000,
+      str: 2.5,
+      def: 1,
+      rage: {
+        title: t('questBurnoutBossRageTitle'),
+        description: t('questBurnoutBossRageDescription'),
+        value: 1000000,
+        quests: t('questBurnoutBossRageQuests'),
+        seasonalShop: t('questBurnoutBossRageSeasonalShop'),
+        tavern: t('questBurnoutBossRageTavern')
+      }
+    },
+    drop: {
+      items: [
+        {
+          type: 'pets',
+          key: 'Phoenix-Base',
+          text: t('questBurnoutDropPhoenixPet')
+        }, {
+          type: 'mounts',
+          key: 'Phoenix-Base',
+          text: t('questBurnoutDropPhoenixMount')
+        }, {
+          type: 'food',
+          key: 'Candy_Base',
+          text: t('foodCandyBase')
+        }, {
+          type: 'food',
+          key: 'Candy_White',
+          text: t('foodCandyWhite')
+        }, {
+          type: 'food',
+          key: 'Candy_Desert',
+          text: t('foodCandyDesert')
+        }, {
+          type: 'food',
+          key: 'Candy_Red',
+          text: t('foodCandyRed')
+        }, {
+          type: 'food',
+          key: 'Candy_Shade',
+          text: t('foodCandyShade')
+        }, {
+          type: 'food',
+          key: 'Candy_Skeleton',
+          text: t('foodCandySkeleton')
+        }, {
+          type: 'food',
+          key: 'Candy_Zombie',
+          text: t('foodCandyZombie')
+        }, {
+          type: 'food',
+          key: 'Candy_CottonCandyPink',
+          text: t('foodCandyCottonCandyPink')
+        }, {
+          type: 'food',
+          key: 'Candy_CottonCandyBlue',
+          text: t('foodCandyCottonCandyBlue')
+        }, {
+          type: 'food',
+          key: 'Candy_Golden',
+          text: t('foodCandyGolden')
+        }
+      ],
+      gp: 0,
+      exp: 0
+    }
+  },
 };

 let questDefaults = (name) => {
--- a/website/src/middlewares/locals.js
+++ b/website/src/middlewares/locals.js
@@ -6,7 +6,7 @@ var i18n = require('../i18n.js');
 var buildManifest = require('../libs/buildManifest');
 var shared = require('../../../common');
 var forceRefresh = require('./forceRefresh');
-var tavern = require('../models/group').tavern;
+var tavernQuest = require('../models/group').tavernQuest;
 var mods = require('../models/user').mods;

 // To avoid stringifying more data then we need,
@@ -21,7 +21,6 @@ var env = {
  getBuildUrl: buildManifest.getBuildUrl,
  _: _,
  clientVars: clientVars,
-  tavern: tavern, // for world boss
  mods: mods,
  Content: shared.content,
  siteVersion: forceRefresh.siteVersion,
@@ -53,9 +52,9 @@ module.exports = function(req, res, next) {
      args.push(language.code);
      return shared.i18n.t.apply(null, args);
    },
-    // Defined here and not outside of the middleware because tavern might be an
+    // Defined here and not outside of the middleware because tavernQuest might be an
    // empty object until the query to fetch it finishes
-    worldDmg: (tavern && tavern.quest && tavern.quest.extra && tavern.quest.extra.worldDmg) || {},
+    worldDmg: (tavernQuest && tavernQuest.extra && tavernQuest.extra.worldDmg) || {},
  });

  // Put query-string party (& guild but use partyInvite for backward compatibility)
--- a/website/src/models/group.js
+++ b/website/src/models/group.js
@@ -269,12 +269,15 @@ GroupSchema.statics.collectQuest = function(user, progress, cb) {
 }

 // to set a boss: `db.groups.update({_id:'habitrpg'},{$set:{quest:{key:'dilatory',active:true,progress:{hp:1000,rage:1500}}}})`
-module.exports.tavern = {};
+module.exports.tavernQuest = {};
 var tavernQ = {_id:'habitrpg','quest.key':{$ne:null}};
 process.nextTick(function(){
-  mongoose.model('Group').findOne(tavernQ,function(err,tavern){
-    // Using _assign so we don't lose the reference to the exported tavern
-    _.assign(module.exports.tavern, tavern);
+  mongoose.model('Group').findOne(tavernQ, function(err,tavern){
+    if (!tavern) return; // No tavern quest
+
+    var quest = tavern.quest.toObject();
+    // Using _assign so we don't lose the reference to the exported tavernQuest
+    _.assign(module.exports.tavernQuest, quest);
  });
 });

@@ -291,14 +294,13 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
    },
    function(tavern,cb){
      if (!(tavern && tavern.quest && tavern.quest.key)) return cb(true);
-      module.exports.tavern = tavern;

      var quest = shared.content.quests[tavern.quest.key];
      if (tavern.quest.progress.hp <= 0) {
        tavern.sendChat(quest.completionChat('en'));
        tavern.finishQuest(quest, function(){});
        tavern.save(cb);
-        module.exports.tavern = undefined;
+        _.assign(module.exports.tavernQuest, {extra: null});
      } else {
        // Deal damage. Note a couple things here, str & def are calculated. If str/def are defined in the database,
        // use those first - which allows us to update the boss on the go if things are too easy/hard.
@@ -308,8 +310,7 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
        if (tavern.quest.progress.rage >= quest.boss.rage.value) {
          if (!tavern.quest.extra.worldDmg) tavern.quest.extra.worldDmg = {};
          var wd = tavern.quest.extra.worldDmg;
-          // var scene = wd.tavern ? wd.stables ? wd.market ? false : 'market' : 'stables' : 'tavern'; // Dilatory attacks tavern, stables, market
-          var scene = wd.stables ? wd.bailey ? wd.guide ? false : 'guide' : 'bailey' : 'stables'; // Stressbeast attacks stables, Bailey, Justin
+          var scene = wd.quests ? wd.seasonalShop ? wd.tavern ? false : 'tavern' : 'seasonalShop' : 'quests'; // Burnout attacks Ian, Seasonal Sorceress, tavern
          if (!scene) {
            tavern.sendChat('`'+quest.boss.name('en')+' tries to unleash '+quest.boss.rage.title('en')+', but is too tired.`');
            tavern.quest.progress.rage = 0 //quest.boss.rage.value;
@@ -319,16 +320,20 @@ GroupSchema.statics.tavernBoss = function(user,progress) {
            tavern.quest.extra.worldDmg.recent = scene;
            tavern.markModified('quest.extra.worldDmg');
            tavern.quest.progress.rage = 0;
-            tavern.quest.progress.hp += (quest.boss.rage.healing * tavern.quest.progress.hp);
+            if (quest.boss.rage.healing) {
+              tavern.quest.progress.hp += (quest.boss.rage.healing * tavern.quest.progress.hp);
+            }
          }
        }
-        if ((tavern.quest.progress.hp < quest.boss.desperation.threshold) && !tavern.quest.extra.desperate) {
+        if (quest.boss.desperation && (tavern.quest.progress.hp < quest.boss.desperation.threshold) && !tavern.quest.extra.desperate) {
          tavern.sendChat(quest.boss.desperation.text('en'));
          tavern.quest.extra.desperate = true;
          tavern.quest.extra.def = quest.boss.desperation.def;
          tavern.quest.extra.str = quest.boss.desperation.str;
          tavern.markModified('quest.extra');
        }
+
+        _.assign(module.exports.tavernQuest, tavern.quest.toObject());
        tavern.save(cb);
      }
    }
--- a/website/views/options/inventory/quests.jade
+++ b/website/views/options/inventory/quests.jade
@@ -4,7 +4,7 @@ include ../../shared/mixins
  .row
    .col-md-6
      .clearfix
-        .npc_ian.pull-left-sm.col-centered
+        div(class="#{env.worldDmg.quests ? 'npc_ian_broken' : 'npc_ian'}").pull-left-sm.col-centered
        .popover.static-popover.fade.right.in.pull-left-sm.col-centered
          .arrow.hidden-xs
          h3.popover-title=env.t('ian')
--- a/website/views/options/inventory/seasonal-shop.jade
+++ b/website/views/options/inventory/seasonal-shop.jade
@@ -1,6 +1,6 @@
 .container-fluid
  .stable.row: .col-xs-12
-    .seasonalshop_open.pull-left-sm.col-centered
+    div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_open'}").pull-left-sm.col-centered
    .popover.static-popover.fade.right.in.pull-left-sm.col-centered
      .arrow.hidden-xs
      h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
--- a/website/views/options/social/quests/bossStats.jade
+++ b/website/views/options/social/quests/bossStats.jade
@@ -8,17 +8,17 @@ else
  .meter-label(tooltip=env.t('bossHP'))
    span.glyphicon.glyphicon-heart
  .meter.health
-    .bar(ng-style='{width: Shared.percent(progress.hp, boss.hp) + "%"}')
+    .bar(ng-style='{width: Shared.percent(group.quest.progress.hp, Content.quests[group.quest.key].boss.hp) + "%"}')
    span.meter-text.value
-      | {{Math.ceil(progress.hp) | roundLargeNumbers}} 
-      | &nbsp;/ {{::boss.hp | roundLargeNumbers}}
-  div(ng-if='boss.rage')
-    .meter-label(tooltip='Rage')
+      | {{Math.ceil(group.quest.progress.hp) | roundLargeNumbers}} 
+      | &nbsp;/ {{::Content.quests[group.quest.key].boss.hp | roundLargeNumbers}}
+  div(ng-if='Content.quests[group.quest.key].boss.rage')
+    .meter-label(tooltip=env.t('rage'))
      span.glyphicon.glyphicon-fire
-    .meter.mana(popover="{{::boss.rage.description()}}",
-      popover-title="{{::boss.rage.title()}}",
+    .meter.mana(popover="{{::Content.quests[group.quest.key].boss.rage.description()}}",
+      popover-title="{{::Content.quests[group.quest.key].boss.rage.title()}}",
      popover-trigger='mouseenter', popover-placement='bottom')
-      .bar(ng-style='{width: Shared.percent(progress.rage, boss.rage.value) + "%"}')
+      .bar(ng-style='{width: Shared.percent(group.quest.progress.rage, Content.quests[group.quest.key].boss.rage.value) + "%"}')
      span.meter-text.value
-        | {{Math.ceil(progress.rage)  | roundLargeNumbers}} 
-        | &nbsp;/ {{::boss.rage.value | roundLargeNumbers}}
+        | {{Math.ceil(group.quest.progress.rage)  | roundLargeNumbers}} 
+        | &nbsp;/ {{::Content.quests[group.quest.key].boss.rage.value | roundLargeNumbers}}
--- a/website/views/options/social/quests/ianQuestInfo.jade
+++ b/website/views/options/social/quests/ianQuestInfo.jade
@@ -1,4 +1,4 @@
-.npc_ian.pull-left
+div(class="#{env.worldDmg.quests ? 'npc_ian_broken' : 'npc_ian'}").pull-left

 div(ng-if='::Content.quests[group.quest.key].boss')
  if tavern
--- a/website/views/options/social/quests/questActive.jade
+++ b/website/views/options/social/quests/questActive.jade
@@ -9,12 +9,15 @@ div(ng-if='group.quest.active===true')
          include ./collectionStats

        div(ng-bind-html='::Content.quests[group.quest.key].notes()')
-        unless tavern
          quest-rewards(key='{{::group.quest.key}}')

      tab(heading=env.t('questParticipants'))
        +participants(true)

+  if tavern
+    include ./bossStats
+    div(ng-bind-html='::Content.quests[group.quest.key].notes()')
+
  hr

  include ./ianQuestInfo
--- a/website/views/options/social/quests/questNotActive.jade
+++ b/website/views/options/social/quests/questNotActive.jade
@@ -18,7 +18,7 @@ div(ng-if='group.quest.active===false')

  hr

-  .npc_ian.pull-left
+  div(class="#{env.worldDmg.quests ? 'npc_ian_broken' : 'npc_ian'}").pull-left
  p=env.t('questStart')

  span(ng-if='user.party.quest.RSVPNeeded')
--- a/website/views/shared/modals/quests.jade
+++ b/website/views/shared/modals/quests.jade
@@ -38,7 +38,7 @@ script(type='text/ng-template', id='modals/showQuest.html')
  .modal-body
    +questInfo
    hr
-    .npc_ian.pull-left
+    div(class="#{env.worldDmg.quests ? 'npc_ian_broken' : 'npc_ian'}").pull-left
    p=env.t('questSend')
    p=env.t('questWarning')
  .modal-footer
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,32 +1,57 @@
-h2 10/5/2015 - OCTOBER BACKGROUNDS REVEALED, COSTUME CHALLENGE BEGINS, AND FALL PLOT-LINE CONTINUES
+h2 10/8/2015 - WORLD BOSS REVEALED: BURNOUT!
  hr
  tr
    td
-      .background_harvest_moon.pull-right
-      h3 October Backgrounds Revealed
-      p There are three new avatar backgrounds in the <a href='/#/options/profile/backgrounds'>Background Shop!</a> Now your avatar can slog through a Slimy Swamp, cackle under the Harvest Moon, or shiver in the Swarming Darkness!
-      p.small.muted by Leephon, midori88, and Draayder
-  tr
-    td
-      h3 Costume Challenge Begins
-      p The Community Costume Challenge has begun! Between now and October 31st, dress up as your avatar in real life and post a photo on social media to get the coveted Costume Challenge badge! Read the full rules on the Challenge page <a href='/#/options/groups/challenges/0b3d1116-89d3-4025-8a9e-593bc28e9cff'>here</a>.
-      p.small.muted by Lemoness
-  tr
-    td
-      h3 Fall Plot-Line Continues
-      p Although we are now well into autumn, the Flourishing Fields are locked in a sweltering heat wave. The candies grow sticky in the sun, and the Spooky Pets lie panting in the shade. But this is minor news compared to the calamity that has just occurred.
+      .promo_burnout.pull-right
+      h3 Burnout, Scourge of the Flourishing Fields
+      p It is well past midnight, still and stiflingly hot, when Redphoenix and scout captain Kiwibot abruptly burst through the city gates. "We need to evacuate all the wooden buildings!" Redphoenix shouts. "Hurry!"
      br
-      p The Joyful Reaper is gone.
+      p Kiwibot grips the wall as she catches her breath."It's draining people and turning them into Exhaust Spirits! That's why everything was delayed. That's where the missing people have gone. It's been stealing their energy!"
      br
-      p The citizens of the Flourishing Fields are working frantically to find their lost ruler, but many of their search parties have not returned. Those few that do make it back are empty-handed. Worse yet, they report frightening hordes of spirits drifting at the edges of the Fields.
+      p "'It'?'" asks Lemoness.
      br
-      p Redphoenix grimly gathers her scouts. "If these spirits are a threat, we need to face them directly," she says. "There's no point in procrastination." Without fuss or fanfare, they set off into the night.
+      p And then the heat takes form.
+      br
+      p It rises from the earth in a billowing, twisting mass, and the air chokes with the scent of smoke and sulphur. Flames lick across the molten ground and contort into limbs, writhing to horrific heights. Smoldering eyes snap open, and the creature lets out a deep and crackling cackle.
+      br
+      p Kiwibot whispers a single word.
+      br
+      p "Burnout."
+      hr
+      p Quickly, Habiticans, we have to save the Flourishing Fields from incineration! All of us will battle this World Boss together by completing tasks, but it won't attack us individually. However, the more Dailies we skip, the closer we get to triggering its fearsome Exhaust Strike, which will target our NPCs!
+      br
+      p Knowing your enemy is the first step to defeating it. <a href='http://habitica.wikia.com/wiki/Boss#World_Bosses' target='_blank'>Read more about World Bosses here</a>.
+      br
+      p.small.muted by Lemoness, SabreCat, and Kiwibot

 if menuItem !== 'oldNews'
  hr
  a(href='/static/old-news', target='_blank') Read older news

 mixin oldNews
+  h2 10/5/2015 - OCTOBER BACKGROUNDS REVEALED, COSTUME CHALLENGE BEGINS, AND FALL PLOT-LINE CONTINUES
+    tr
+      td
+        .background_harvest_moon.pull-right
+        h3 October Backgrounds Revealed
+        p There are three new avatar backgrounds in the <a href='/#/options/profile/backgrounds'>Background Shop!</a> Now your avatar can slog through a Slimy Swamp, cackle under the Harvest Moon, or shiver in the Swarming Darkness!
+        p.small.muted by Leephon, midori88, and Draayder
+    tr
+      td
+        h3 Costume Challenge Begins
+        p The Community Costume Challenge has begun! Between now and October 31st, dress up as your avatar in real life and post a photo on social media to get the coveted Costume Challenge badge! Read the full rules on the Challenge page <a href='/#/options/groups/challenges/0b3d1116-89d3-4025-8a9e-593bc28e9cff'>here</a>.
+        p.small.muted by Lemoness
+    tr
+      td
+        h3 Fall Plot-Line Continues
+        p Although we are now well into autumn, the Flourishing Fields are locked in a sweltering heat wave. The candies grow sticky in the sun, and the Spooky Pets lie panting in the shade. But this is minor news compared to the calamity that has just occurred.
+        br
+        p The Joyful Reaper is gone.
+        br
+        p The citizens of the Flourishing Fields are working frantically to find their lost ruler, but many of their search parties have not returned. Those few that do make it back are empty-handed. Worse yet, they report frightening hordes of spirits drifting at the edges of the Fields.
+        br
+        p Redphoenix grimly gathers her scouts. "If these spirits are a threat, we need to face them directly," she says. "There's no point in procrastination." Without fuss or fanfare, they set off into the night.
+
  h2 10/1/2015 - SPOOKY HATCHING POTION; NEW ITEMS IN THE ENCHANTED ARMOIRE
    tr
      td
--- a/website/views/shared/profiles/achievements.jade
+++ b/website/views/shared/profiles/achievements.jade
@@ -219,6 +219,13 @@ div(ng-if='::profile.achievements.quests.stressbeast')
    =env.t('achievementStressbeastText')
  hr

+div(ng-if='::profile.achievements.quests.burnout')
+  .achievement.achievement-burnout
+  h5=env.t('achievementBurnout')
+  small
+    =env.t('achievementBurnoutText')
+  hr
+
 div(ng-if='::profile.achievements.costumeContest')
  .achievement.achievement-costumeContest
  h5=env.t('costumeContest')