Merge branch 'sabrecat/summer-splash' into develop

common/css/index.css

@@ -2,12 +2,12 @@
   margin-left: 1.25em;
 }*/
 
-/* Comment out for holiday events */
+/* Comment out for holiday events
 .npc_ian {
   background: url("/common/img/sprites/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-}
+} */
 
 .Gems {
   display:inline-block;

common/dist/sprites/spritesmith0.css

@@ -1,216 +1,216 @@
 .achievement-alien {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -479px;
+  background-position: -1949px -1116px;
   width: 24px;
   height: 26px;
 }
 .achievement-alpha {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -182px;
+  background-position: -1924px -819px;
   width: 24px;
   height: 26px;
 }
 .achievement-armor {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -479px;
+  background-position: -1924px -1116px;
   width: 24px;
   height: 26px;
 }
 .achievement-boot {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -479px;
+  background-position: -1899px -1116px;
   width: 24px;
   height: 26px;
 }
 .achievement-bow {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -452px;
+  background-position: -1949px -1089px;
   width: 24px;
   height: 26px;
 }
 .achievement-cactus {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -452px;
+  background-position: -1924px -1089px;
   width: 24px;
   height: 26px;
 }
 .achievement-cake {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -452px;
+  background-position: -1899px -1089px;
   width: 24px;
   height: 26px;
 }
 .achievement-cave {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -425px;
+  background-position: -1949px -1062px;
   width: 24px;
   height: 26px;
 }
 .achievement-coffin {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -425px;
+  background-position: -1924px -1062px;
   width: 24px;
   height: 26px;
 }
 .achievement-comment {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -425px;
+  background-position: -1899px -1062px;
   width: 24px;
   height: 26px;
 }
 .achievement-costumeContest {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -398px;
+  background-position: -1949px -1035px;
   width: 24px;
   height: 26px;
 }
 .achievement-dilatory {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -398px;
+  background-position: -1924px -1035px;
   width: 24px;
   height: 26px;
 }
 .achievement-firefox {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -398px;
+  background-position: -1899px -1035px;
   width: 24px;
   height: 26px;
 }
 .achievement-habitBirthday {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -371px;
+  background-position: -1949px -1008px;
   width: 24px;
   height: 26px;
 }
 .achievement-heart {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -371px;
+  background-position: -1924px -1008px;
   width: 24px;
   height: 26px;
 }
 .achievement-karaoke {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -371px;
+  background-position: -1899px -1008px;
   width: 24px;
   height: 26px;
 }
 .achievement-ninja {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -344px;
+  background-position: -1949px -981px;
   width: 24px;
   height: 26px;
 }
 .achievement-nye {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -344px;
+  background-position: -1924px -981px;
   width: 24px;
   height: 26px;
 }
 .achievement-perfect {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -182px;
+  background-position: -1899px -819px;
   width: 24px;
   height: 26px;
 }
 .achievement-rat {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -317px;
+  background-position: -1949px -954px;
   width: 24px;
   height: 26px;
 }
 .achievement-shield {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -317px;
+  background-position: -1924px -954px;
   width: 24px;
   height: 26px;
 }
 .achievement-shinySeed {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -317px;
+  background-position: -1899px -954px;
   width: 24px;
   height: 26px;
 }
 .achievement-snowball {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -290px;
+  background-position: -1949px -927px;
   width: 24px;
   height: 26px;
 }
 .achievement-spookDust {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -290px;
+  background-position: -1924px -927px;
   width: 24px;
   height: 26px;
 }
 .achievement-stoikalm {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -290px;
+  background-position: -1899px -927px;
   width: 24px;
   height: 26px;
 }
 .achievement-sun {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -263px;
+  background-position: -1949px -900px;
   width: 24px;
   height: 26px;
 }
 .achievement-sword {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -263px;
+  background-position: -1924px -900px;
   width: 24px;
   height: 26px;
 }
 .achievement-thermometer {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -263px;
+  background-position: -1899px -900px;
   width: 24px;
   height: 26px;
 }
 .achievement-tree {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -236px;
+  background-position: -1949px -873px;
   width: 24px;
   height: 26px;
 }
 .achievement-triadbingo {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -236px;
+  background-position: -1924px -873px;
   width: 24px;
   height: 26px;
 }
 .achievement-ultimate-healer {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -236px;
+  background-position: -1899px -873px;
   width: 24px;
   height: 26px;
 }
 .achievement-ultimate-mage {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -209px;
+  background-position: -1949px -846px;
   width: 24px;
   height: 26px;
 }
 .achievement-ultimate-rogue {
   background-image: url(spritesmith0.png);
-  background-position: -1924px -209px;
+  background-position: -1924px -846px;
   width: 24px;
   height: 26px;
 }
 .achievement-ultimate-warrior {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -209px;
+  background-position: -1899px -846px;
   width: 24px;
   height: 26px;
 }
 .achievement-valentine {
   background-image: url(spritesmith0.png);
-  background-position: -1949px -182px;
+  background-position: -1949px -819px;
   width: 24px;
   height: 26px;
 }
 .achievement-wolf {
   background-image: url(spritesmith0.png);
-  background-position: -1899px -344px;
+  background-position: -1899px -981px;
   width: 24px;
   height: 26px;
 }
@@ -1890,13 +1890,13 @@
 }
 .hair_mustache_1_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -708px -592px;
+  background-position: -182px -1434px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -733px -607px;
+  background-position: -207px -1449px;
   width: 60px;
   height: 60px;
 }
@@ -1938,13 +1938,13 @@
 }
 .hair_mustache_1_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -546px -1434px;
+  background-position: -708px -592px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_mustache_1_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -571px -1449px;
+  background-position: -733px -607px;
   width: 60px;
   height: 60px;
 }
@@ -3810,431 +3810,515 @@
 }
 .hair_bangs_3_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -182px -1434px;
+  background-position: -1899px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_rainbow {
   background-image: url(spritesmith0.png);
-  background-position: -207px -1449px;
+  background-position: -1924px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_red {
   background-image: url(spritesmith0.png);
-  background-position: -637px -979px;
+  background-position: -1899px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_red {
   background-image: url(spritesmith0.png);
-  background-position: -662px -994px;
+  background-position: -1924px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -546px -979px;
+  background-position: -1899px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_snowy {
   background-image: url(spritesmith0.png);
-  background-position: -571px -994px;
+  background-position: -1924px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_white {
   background-image: url(spritesmith0.png);
-  background-position: -455px -979px;
+  background-position: -1899px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_white {
   background-image: url(spritesmith0.png);
-  background-position: -480px -994px;
+  background-position: -1924px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_winternight {
   background-image: url(spritesmith0.png);
-  background-position: -364px -979px;
+  background-position: -1899px -546px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_winternight {
   background-image: url(spritesmith0.png);
-  background-position: -389px -994px;
+  background-position: -1924px -561px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_winterstar {
   background-image: url(spritesmith0.png);
-  background-position: -273px -979px;
+  background-position: -1899px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_winterstar {
   background-image: url(spritesmith0.png);
-  background-position: -298px -994px;
+  background-position: -1924px -652px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_yellow {
   background-image: url(spritesmith0.png);
-  background-position: -182px -979px;
+  background-position: -1899px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_yellow {
   background-image: url(spritesmith0.png);
-  background-position: -207px -994px;
+  background-position: -1924px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_bangs_3_zombie {
   background-image: url(spritesmith0.png);
-  background-position: -91px -979px;
+  background-position: -546px -1434px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_bangs_3_zombie {
   background-image: url(spritesmith0.png);
-  background-position: -116px -994px;
+  background-position: -571px -1449px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_TRUred {
   background-image: url(spritesmith0.png);
-  background-position: 0px -979px;
+  background-position: -637px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_TRUred {
   background-image: url(spritesmith0.png);
-  background-position: -25px -994px;
+  background-position: -662px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_aurora {
   background-image: url(spritesmith0.png);
-  background-position: -989px -819px;
+  background-position: -546px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_aurora {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -834px;
+  background-position: -571px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_black {
   background-image: url(spritesmith0.png);
-  background-position: -989px -728px;
+  background-position: -455px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_black {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -743px;
+  background-position: -480px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_blond {
   background-image: url(spritesmith0.png);
-  background-position: -989px -637px;
+  background-position: -364px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_blond {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -652px;
+  background-position: -389px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_blue {
   background-image: url(spritesmith0.png);
-  background-position: -989px -546px;
+  background-position: -273px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_blue {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -561px;
+  background-position: -298px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_brown {
   background-image: url(spritesmith0.png);
-  background-position: -989px -455px;
+  background-position: -182px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_brown {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -470px;
+  background-position: -207px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_candycane {
   background-image: url(spritesmith0.png);
-  background-position: -989px -364px;
+  background-position: -91px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_candycane {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -379px;
+  background-position: -116px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_candycorn {
   background-image: url(spritesmith0.png);
-  background-position: -989px -273px;
+  background-position: 0px -979px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_candycorn {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -288px;
+  background-position: -25px -994px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_festive {
   background-image: url(spritesmith0.png);
-  background-position: -989px -182px;
+  background-position: -989px -819px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_festive {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -197px;
+  background-position: -1014px -834px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_frost {
   background-image: url(spritesmith0.png);
-  background-position: -989px -91px;
+  background-position: -989px -728px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_frost {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -106px;
+  background-position: -1014px -743px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -989px 0px;
+  background-position: -989px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ghostwhite {
   background-image: url(spritesmith0.png);
-  background-position: -1014px -15px;
+  background-position: -1014px -652px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_green {
   background-image: url(spritesmith0.png);
-  background-position: -819px -888px;
+  background-position: -989px -546px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_green {
   background-image: url(spritesmith0.png);
-  background-position: -844px -903px;
+  background-position: -1014px -561px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_halloween {
   background-image: url(spritesmith0.png);
-  background-position: -728px -888px;
+  background-position: -989px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_halloween {
   background-image: url(spritesmith0.png);
-  background-position: -753px -903px;
+  background-position: -1014px -470px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_holly {
   background-image: url(spritesmith0.png);
-  background-position: -637px -888px;
+  background-position: -989px -364px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_holly {
   background-image: url(spritesmith0.png);
-  background-position: -662px -903px;
+  background-position: -1014px -379px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_hollygreen {
   background-image: url(spritesmith0.png);
-  background-position: -546px -888px;
+  background-position: -989px -273px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_hollygreen {
   background-image: url(spritesmith0.png);
-  background-position: -571px -903px;
+  background-position: -1014px -288px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_midnight {
   background-image: url(spritesmith0.png);
-  background-position: -455px -888px;
+  background-position: -989px -182px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_midnight {
   background-image: url(spritesmith0.png);
-  background-position: -480px -903px;
+  background-position: -1014px -197px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pblue {
   background-image: url(spritesmith0.png);
-  background-position: -364px -888px;
+  background-position: -989px -91px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pblue {
   background-image: url(spritesmith0.png);
-  background-position: -389px -903px;
+  background-position: -1014px -106px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pblue2 {
   background-image: url(spritesmith0.png);
-  background-position: -273px -888px;
+  background-position: -989px 0px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pblue2 {
   background-image: url(spritesmith0.png);
-  background-position: -298px -903px;
+  background-position: -1014px -15px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_peppermint {
   background-image: url(spritesmith0.png);
-  background-position: -182px -888px;
+  background-position: -819px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_peppermint {
   background-image: url(spritesmith0.png);
-  background-position: -207px -903px;
+  background-position: -844px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pgreen {
   background-image: url(spritesmith0.png);
-  background-position: -91px -888px;
+  background-position: -728px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pgreen {
   background-image: url(spritesmith0.png);
-  background-position: -116px -903px;
+  background-position: -753px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pgreen2 {
   background-image: url(spritesmith0.png);
-  background-position: 0px -888px;
+  background-position: -637px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pgreen2 {
   background-image: url(spritesmith0.png);
-  background-position: -25px -903px;
+  background-position: -662px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_porange {
   background-image: url(spritesmith0.png);
-  background-position: -889px -740px;
+  background-position: -546px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_porange {
   background-image: url(spritesmith0.png);
-  background-position: -914px -755px;
+  background-position: -571px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_porange2 {
   background-image: url(spritesmith0.png);
-  background-position: -798px -740px;
+  background-position: -455px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_porange2 {
   background-image: url(spritesmith0.png);
-  background-position: -823px -755px;
+  background-position: -480px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppink {
   background-image: url(spritesmith0.png);
-  background-position: -707px -740px;
+  background-position: -364px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppink {
   background-image: url(spritesmith0.png);
-  background-position: -732px -755px;
+  background-position: -389px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppink2 {
   background-image: url(spritesmith0.png);
-  background-position: -1080px 0px;
+  background-position: -273px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppink2 {
   background-image: url(spritesmith0.png);
-  background-position: -1105px -15px;
+  background-position: -298px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -910px -979px;
+  background-position: -182px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppurple {
   background-image: url(spritesmith0.png);
-  background-position: -935px -994px;
+  background-position: -207px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_ppurple2 {
   background-image: url(spritesmith0.png);
-  background-position: -819px -979px;
+  background-position: -91px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_ppurple2 {
   background-image: url(spritesmith0.png);
-  background-position: -844px -994px;
+  background-position: -116px -903px;
   width: 60px;
   height: 60px;
 }
 .hair_base_10_pumpkin {
   background-image: url(spritesmith0.png);
-  background-position: -728px -979px;
+  background-position: 0px -888px;
   width: 90px;
   height: 90px;
 }
 .customize-option.hair_base_10_pumpkin {
+  background-image: url(spritesmith0.png);
+  background-position: -25px -903px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_purple {
+  background-image: url(spritesmith0.png);
+  background-position: -889px -740px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_purple {
+  background-image: url(spritesmith0.png);
+  background-position: -914px -755px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_pyellow {
+  background-image: url(spritesmith0.png);
+  background-position: -798px -740px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_pyellow {
+  background-image: url(spritesmith0.png);
+  background-position: -823px -755px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_pyellow2 {
+  background-image: url(spritesmith0.png);
+  background-position: -707px -740px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_pyellow2 {
+  background-image: url(spritesmith0.png);
+  background-position: -732px -755px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_rainbow {
+  background-image: url(spritesmith0.png);
+  background-position: -1080px 0px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_rainbow {
+  background-image: url(spritesmith0.png);
+  background-position: -1105px -15px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_red {
+  background-image: url(spritesmith0.png);
+  background-position: -910px -979px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_red {
+  background-image: url(spritesmith0.png);
+  background-position: -935px -994px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_snowy {
+  background-image: url(spritesmith0.png);
+  background-position: -819px -979px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_snowy {
+  background-image: url(spritesmith0.png);
+  background-position: -844px -994px;
+  width: 60px;
+  height: 60px;
+}
+.hair_base_10_white {
+  background-image: url(spritesmith0.png);
+  background-position: -728px -979px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.hair_base_10_white {
   background-image: url(spritesmith0.png);
   background-position: -753px -994px;
   width: 60px;

common/locales/en/gear.json

@@ -128,6 +128,15 @@
   "weaponSpecialSpring2015MageNotes": "Conjure yourself up a carrot with this fancy wand. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
   "weaponSpecialSpring2015HealerText": "Cat Rattle",
   "weaponSpecialSpring2015HealerNotes": "When you wave it, it makes a fascinating clickety noise that would keep ANYONE entertained for hours. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
+
+  "weaponSpecialSummer2015RogueText": "Firing Coral",
+  "weaponSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+  "weaponSpecialSummer2015WarriorText": "Sun Swordfish",
+  "weaponSpecialSummer2015WarriorNotes": "The Sun Swordfish is a fearsome weapon, provided that it can be induced to stop wriggling. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+  "weaponSpecialSummer2015MageText": "Soothsayer Staff",
+  "weaponSpecialSummer2015MageNotes": "Hidden power glimmers in the jewels of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+  "weaponSpecialSummer2015HealerText": "Wand of the Waves",
+  "weaponSpecialSummer2015HealerNotes": "Cures seasickness and sea sickness! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
   
   "weaponMystery201411Text": "Pitchfork of Feasting",
   "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
@@ -259,6 +268,15 @@
   "armorSpecialSpring2015MageNotes": "Your coattails match your cottontail! Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
   "armorSpecialSpring2015HealerText": "Comforting Catsuit",
   "armorSpecialSpring2015HealerNotes": "This soft catsuit is comfortable, and as comforting as mint tea. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+
+  "armorSpecialSummer2015RogueText": "Ruby Tail",
+  "armorSpecialSummer2015RogueNotes": "This garment of shimmering scales transforms its wearer into a real Reef Renegade! Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+  "armorSpecialSummer2015WarriorText": "Golden Tail",
+  "armorSpecialSummer2015WarriorNotes": "This garment of shimmering scales transforms its wearer into a real Sunfish Warrior! Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+  "armorSpecialSummer2015MageText": "Soothsayer Robes",
+  "armorSpecialSummer2015MageNotes": "Hidden power resides in the puffs of these sleeves. Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+  "armorSpecialSummer2015HealerText": "Sailor's Armor",
+  "armorSpecialSummer2015HealerNotes": "This armor lets everyone know that you are an honest merchant sailor who would never dream of behaving like a scalawag. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
   
   "armorMystery201402Text": "Messenger Robes",
   "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
@@ -406,6 +424,15 @@
   "headSpecialSpring2015HealerText": "Comforting Crown",
   "headSpecialSpring2015HealerNotes": "The pearl at the center of this crown calms and comforts those around it. Increases Intelligence by <%= int %>. Limited Edition 2015 Spring Gear.",
 
+  "headSpecialSummer2015RogueText": "Renegade Hat",
+  "headSpecialSummer2015RogueNotes": "This pirate hat fell overboard and has been decorated with scraps of fire coral. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+  "headSpecialSummer2015WarriorText": "Jeweled Oceanic Helm",
+  "headSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this helm is strong and handsome. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+  "headSpecialSummer2015MageText": "Soothsayer Scarf",
+  "headSpecialSummer2015MageNotes": "Hidden power shines in the threads of this scarf. Increases Perception by <%= per %>. Limited Edition 2015 Summer Gear.",
+  "headSpecialSummer2015HealerText": "Sailor's Cap",
+  "headSpecialSummer2015HealerNotes": "With your sailor's cap set firmly on your head, you can navigate even the stormiest seas! Increases Intelligence by <%= int %>. Limited Edition 2015 Summer Gear.",
+
   "headSpecialGaymerxText": "Rainbow Warrior Helm",
   "headSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGBTQ and gaming and is open to everyone. It takes place at the InterContinental in downtown San Francisco on July 11-13! Confers no benefit.",
 
@@ -517,6 +544,13 @@
   "shieldSpecialSpring2015WarriorNotes": "Hurl it at your enemies.... or just hold it, because it will fill up with yummy kibble at dinnertime. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
   "shieldSpecialSpring2015HealerText": "Patterned Pillow",
   "shieldSpecialSpring2015HealerNotes": "You can rest your head on this soft pillow, or you can wrestle it with your fearsome claws. Rawr! Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+
+  "shieldSpecialSummer2015RogueText": "Firing Coral",
+  "shieldSpecialSummer2015RogueNotes": "This relative of fire coral has the ability to propel its venom through the water. Increases Strength by <%= str %>. Limited Edition 2015 Summer Gear.",
+  "shieldSpecialSummer2015WarriorText": "Sunfish Shield",
+  "shieldSpecialSummer2015WarriorNotes": "Crafted of deep-ocean metal by the artisans of Dilatory, this shield shines like the sand and the sea. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
+  "shieldSpecialSummer2015HealerText": "Strapping Shield",
+  "shieldSpecialSummer2015HealerNotes": "Use this shield to bash away bilge rats. Increases Constitution by <%= con %>. Limited Edition 2015 Summer Gear.",
   
   "shieldMystery301405Text": "Clock Shield",
   "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
@@ -556,6 +590,15 @@
   "bodySpecialSummerHealerText": "Coral Collar",
   "bodySpecialSummerHealerNotes": "A stylish collar of live coral! Confers no benefit. Limited Edition 2014 Summer Gear.",
 
+  "bodySpecialSummer2015RogueText": "Renegade Sash",
+  "bodySpecialSummer2015RogueNotes": "You can't be a true Renegade without panache... and a sash. Confers no benefit. Limited Edition 2015 Summer Gear.",
+  "bodySpecialSummer2015WarriorText": "Oceanic Spikes",
+  "bodySpecialSummer2015WarriorNotes": "Each spike drips jellyfish venom, defending the wearer. Confers no benefit. Limited Edition 2015 Summer Gear.",
+  "bodySpecialSummer2015MageText": "Golden Buckle",
+  "bodySpecialSummer2015MageNotes": "This buckle adds no power at all, but it's shiny. Confers no benefit. Limited Edition 2015 Summer Gear.",
+  "bodySpecialSummer2015HealerText": "Sailor's Neckerchief",
+  "bodySpecialSummer2015HealerNotes": "Yo ho ho? No, no, no! Confers no benefit. Limited Edition 2015 Summer Gear.",
+
   "headAccessory": "head accessory",
   "accessories": "Accessories",
   "animalEars": "Animal Ears",

common/locales/en/limited.json

@@ -25,6 +25,7 @@
     "seasonalShopTitle": "<%= linkStart %>Seasonal Sorceress<%= linkEnd %>",
     "seasonalShopClosedText": "The Seasonal Shop is currently closed!! I don't know where the Seasonal Sorceress is now, but I bet she'll be back during the next <%= linkStart %>Grand Gala<%= linkEnd %>!",
     "seasonalShopText": "Welcome to the Seasonal Shop!! We're stocking springtime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Spring Fling event each year, but we're only open until April 30th, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
+    "seasonalShopSummerText": "Welcome to the Seasonal Shop!! We're stocking summertime <a href='http://habitrpg.wikia.com/wiki/Item_Availability' target='_blank'>Seasonal Edition</a> goodies at the moment. Everything here will be available to purchase during the Summer Splash event each year, but we're only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again!",
     "seasonalShopRebirth": "If you've used the Orb of Rebirth, you can repurchase this equipment in the Rewards Column after you unlock the Item Shop. Initially, you'll only be able to purchase the items for your current class (Warrior by default), but fear not, the other class-specific items will become available if you switch to that class.",
     "candycaneSet": "Candy Cane (Mage)",
     "skiSet": "Ski-sassin (Rogue)",
@@ -44,5 +45,9 @@
     "mightyBunnySet": "Mighty Bunny (Warrior)",
     "magicMouseSet": "Magic Mouse (Mage)",
     "lovingPupSet": "Loving Pup (Healer)",
-    "stealthyKittySet": "Stealthy Kitty (Rogue)"
+    "stealthyKittySet": "Stealthy Kitty (Rogue)",
+    "daringSwashbucklerSet": "Daring Swashbuckler (Warrior)",
+    "emeraldMermageSet": "Emerald Mermage (Mage)",
+    "reefSeahealerSet": "Reef Seahealer (Healer)",
+    "roguishPirateSet": "Roguish Pirate (Rogue)"
 }

common/script/content.coffee

@@ -20,6 +20,9 @@ classes = ['warrior', 'rogue', 'healer', 'wizard']
 gearTypes = [ 'weapon', 'armor', 'head', 'shield', 'body', 'back', 'headAccessory', 'eyewear']
 
 events =
+# IMPORTANT: The end date should be one to two days AFTER the actual end of
+# the event, to allow people in different timezones to still buy the
+# event gear up until at least the actual end of the event.
   winter: {start:'2013-12-31',end:'2014-02-01'}
   birthday: {start:'2013-01-30',end:'2014-02-01'}
   spring: {start:'2014-03-21',end:'2014-05-01'}
@@ -28,9 +31,7 @@ events =
   fall: {start:'2014-09-21',end:'2014-11-01'}
   winter2015: {start:'2014-12-21',end:'2015-02-02'}
   spring2015: {start:'2015-03-20',end:'2015-05-02'}
-# IMPORTANT: The end date should be one to two days AFTER the actual end of
-# the event, to allow people in different timezones to still buy the
-# event gear up until at least the actual end of the event.
+  summer2015: {start:'2015-06-20',end:'2015-08-02'}
 
 api.mystery =
   201402: {start:'2014-02-22',end:'2014-02-28', text:'Winged Messenger Set'}
@@ -135,6 +136,11 @@ gear =
       spring2015Warrior:  event: events.spring2015, specialClass: 'warrior', text: t('weaponSpecialSpring2015WarriorText'), notes: t('weaponSpecialSpring2015WarriorNotes', {str: 15}), value: 90, str: 15
       spring2015Mage:     event: events.spring2015, specialClass: 'wizard',  twoHanded:true, text: t('weaponSpecialSpring2015MageText'), notes: t('weaponSpecialSpring2015MageNotes', {int: 15, per: 7}), value: 160, int:15, per:7
       spring2015Healer:   event: events.spring2015, specialClass: 'healer',  text: t('weaponSpecialSpring2015HealerText'), notes: t('weaponSpecialSpring2015HealerNotes', {int: 9}), value: 90, int: 9
+      # Summer 2015
+      summer2015Rogue:    event: events.summer2015, specialClass: 'rogue', text: t('weaponSpecialSummer2015RogueText'), notes: t('weaponSpecialSummer2015RogueNotes', {str: 8}), value: 80, str: 8
+      summer2015Warrior:  event: events.summer2015, specialClass: 'warrior', text: t('weaponSpecialSummer2015WarriorText'), notes: t('weaponSpecialSummer2015WarriorNotes', {str: 15}), value: 90, str: 15
+      summer2015Mage:     event: events.summer2015, specialClass: 'wizard',  twoHanded:true, text: t('weaponSpecialSummer2015MageText'), notes: t('weaponSpecialSummer2015MageNotes', {int: 15, per: 7}), value: 160, int:15, per:7
+      summer2015Healer:   event: events.summer2015, specialClass: 'healer',  text: t('weaponSpecialSummer2015HealerText'), notes: t('weaponSpecialSummer2015HealerNotes', {int: 9}), value: 90, int: 9
     mystery:
       201411: text: t('weaponMystery201411Text'), notes: t('weaponMystery201411Notes'), mystery:'201411', value: 0
       201502: text: t('weaponMystery201502Text'), notes: t('weaponMystery201502Notes'), mystery:'201502', value: 0
@@ -211,6 +217,11 @@ gear =
       spring2015Warrior:  event: events.spring2015, specialClass: 'warrior', text: t('armorSpecialSpring2015WarriorText'), notes: t('armorSpecialSpring2015WarriorNotes', {con: 9}), value: 90, con: 9
       spring2015Mage:     event: events.spring2015, specialClass: 'wizard',    text: t('armorSpecialSpring2015MageText'), notes: t('armorSpecialSpring2015MageNotes', {int: 9}), value: 90, int: 9
       spring2015Healer:   event: events.spring2015, specialClass: 'healer',  text: t('armorSpecialSpring2015HealerText'), notes: t('armorSpecialSpring2015HealerNotes', {con: 15}), value: 90, con: 15
+      # Summer 2015
+      summer2015Rogue:    event: events.summer2015, specialClass: 'rogue',   text: t('armorSpecialSummer2015RogueText'), notes: t('armorSpecialSummer2015RogueNotes', {per: 15}), value: 90, per: 15
+      summer2015Warrior:  event: events.summer2015, specialClass: 'warrior', text: t('armorSpecialSummer2015WarriorText'), notes: t('armorSpecialSummer2015WarriorNotes', {con: 9}), value: 90, con: 9
+      summer2015Mage:     event: events.summer2015, specialClass: 'wizard',    text: t('armorSpecialSummer2015MageText'), notes: t('armorSpecialSummer2015MageNotes', {int: 9}), value: 90, int: 9
+      summer2015Healer:   event: events.summer2015, specialClass: 'healer',  text: t('armorSpecialSummer2015HealerText'), notes: t('armorSpecialSummer2015HealerNotes', {con: 15}), value: 90, con: 15
       # Other
       gaymerx:    event: events.gaymerx, text: t('armorSpecialGaymerxText'), notes: t('armorSpecialGaymerxNotes'), value: 0
     mystery:
@@ -298,6 +309,11 @@ gear =
       spring2015Warrior:  event: events.spring2015, specialClass: 'warrior', text: t('headSpecialSpring2015WarriorText'), notes: t('headSpecialSpring2015WarriorNotes', {str: 9}),value: 60,str: 9
       spring2015Mage:     event: events.spring2015, specialClass: 'wizard',    text: t('headSpecialSpring2015MageText'), notes: t('headSpecialSpring2015MageNotes', {per: 7}),value: 60,per: 7
       spring2015Healer:   event: events.spring2015, specialClass: 'healer',  text: t('headSpecialSpring2015HealerText'), notes: t('headSpecialSpring2015HealerNotes', {int: 7}), value: 60, int: 7
+      # Summer 2015
+      summer2015Rogue:    event: events.summer2015, specialClass: 'rogue',   text: t('headSpecialSummer2015RogueText'), notes: t('headSpecialSummer2015RogueNotes', {per: 9}),value: 60,per: 9
+      summer2015Warrior:  event: events.summer2015, specialClass: 'warrior', text: t('headSpecialSummer2015WarriorText'), notes: t('headSpecialSummer2015WarriorNotes', {str: 9}),value: 60,str: 9
+      summer2015Mage:     event: events.summer2015, specialClass: 'wizard',    text: t('headSpecialSummer2015MageText'), notes: t('headSpecialSummer2015MageNotes', {per: 7}),value: 60,per: 7
+      summer2015Healer:   event: events.summer2015, specialClass: 'healer',  text: t('headSpecialSummer2015HealerText'), notes: t('headSpecialSummer2015HealerNotes', {int: 7}), value: 60, int: 7
       # Other
       gaymerx:        event: events.gaymerx, text: t('headSpecialGaymerxText'), notes: t('headSpecialGaymerxNotes'), value: 0
     mystery:
@@ -375,6 +391,10 @@ gear =
       spring2015Rogue:    event: events.spring2015, specialClass: 'rogue',   text: t('shieldSpecialSpring2015RogueText'), notes: t('shieldSpecialSpring2015RogueNotes', {str: 8}), value: 80, str: 8
       spring2015Warrior:  event: events.spring2015, specialClass: 'warrior', text: t('shieldSpecialSpring2015WarriorText'), notes: t('shieldSpecialSpring2015WarriorNotes', {con: 7}), value: 70, con: 7
       spring2015Healer:   event: events.spring2015, specialClass: 'healer',  text: t('shieldSpecialSpring2015HealerText'), notes: t('shieldSpecialSpring2015HealerNotes', {con: 9}), value: 70, con: 9
+      # Summer 2015
+      summer2015Rogue:    event: events.summer2015, specialClass: 'rogue',   text: t('shieldSpecialSummer2015RogueText'), notes: t('shieldSpecialSummer2015RogueNotes', {str: 8}), value: 80, str: 8
+      summer2015Warrior:  event: events.summer2015, specialClass: 'warrior', text: t('shieldSpecialSummer2015WarriorText'), notes: t('shieldSpecialSummer2015WarriorNotes', {con: 7}), value: 70, con: 7
+      summer2015Healer:   event: events.summer2015, specialClass: 'healer',  text: t('shieldSpecialSummer2015HealerText'), notes: t('shieldSpecialSummer2015HealerNotes', {con: 9}), value: 70, con: 9
     mystery:
       301405: text: t('shieldMystery301405Text'), notes: t('shieldMystery301405Notes'), mystery:'301405', value: 0
     armoire:
@@ -402,6 +422,11 @@ gear =
       # Summer
       summerHealer:   event: events.summer, specialClass: 'healer',  text: t('bodySpecialSummerHealerText'), notes: t('bodySpecialSummerHealerNotes'), value: 20
       summerMage:     event: events.summer, specialClass: 'wizard',  text: t('bodySpecialSummerMageText'), notes: t('bodySpecialSummerMageNotes'), value: 20
+      # Summer 2015
+      summer2015Healer:   event: events.summer2015, specialClass: 'healer',  text: t('bodySpecialSummer2015HealerText'), notes: t('bodySpecialSummer2015HealerNotes'), value: 20
+      summer2015Mage:     event: events.summer2015, specialClass: 'wizard',  text: t('bodySpecialSummer2015MageText'), notes: t('bodySpecialSummer2015MageNotes'), value: 20
+      summer2015Rogue:   event: events.summer2015, specialClass: 'rogue',  text: t('bodySpecialSummer2015RogueText'), notes: t('bodySpecialSummer2015RogueNotes'), value: 20
+      summer2015Warrior:     event: events.summer2015, specialClass: 'warrior',  text: t('bodySpecialSummer2015WarriorText'), notes: t('bodySpecialSummer2015WarriorNotes'), value: 20
 
   headAccessory:
     base:

website/views/options/inventory/inventory.jade

@@ -28,32 +28,28 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html
   .container-fluid
     .stable.row
       .col-md-2
-        .seasonalshop_closed
+        .seasonalshop_summer2015
       .col-md-10
         .popover.static-popover.fade.right.in
           .arrow
-          h3.popover-title!=env.t('seasonalShopClosedTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
+          h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
           .popover-content
-            p!=env.t('seasonalShopClosedText', {linkStart:"<a href='http://habitrpg.wikia.com/wiki/Grand_Galas' target='_blank'>", linkEnd: "</a>"})
-    // .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
-    // li.customize-menu.inventory-gear
-      menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{springWarrior:env.t("mightyBunnySet"), springMage:env.t("magicMouseSet"), springHealer:env.t("lovingPupSet"), springRogue:env.t("stealthyKittySet")}')
-        // The `if true || false` conditional for applying the transparent class is necessary because
-        // when a user activates the orb of rebirth, the seasonal items are still in their inventory, but
-        // they have each have a value of false. The item can be purchased for gold in the rewards column,
-        // not the seasonal shop. This makes that more clear.
+            p!=env.t('seasonalShopSummerText')
+    .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
+    li.customize-menu.inventory-gear
+      menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{summerWarrior:env.t("daringSwashbucklerSet"), summerMage:env.t("emeraldMermageSet"), summerHealer:env.t("reefSeahealerSet"), summerRogue:env.t("roguishPirateSet")}')
         div(ng-repeat='item in ::getSeasonalShopArray(set)' ng-class="{transparent: user.items.gear.owned[item.key] === true ||user.items.gear.owned[item.key] === false}")
           button.customize-option(popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase(item.type,item)', class='shop_{{::item.key}}')
           .text-left
             | {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}&nbsp;
             span.Pet_Currency_Gem1x.inline-gems
-      menu.pets-menu(label=env.t('quests'))
+      // menu.pets-menu(label=env.t('quests'))
         div(ng-repeat='quest in ::getSeasonalShopQuests()')
           button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-append-to-body='true', popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"')
           p
             | {{::quest.value}}&nbsp;
             span.Pet_Currency_Gem1x.inline-gems
-      menu.pets-menu(label=env.t('seasonalItems'))
+      // menu.pets-menu(label=env.t('seasonalItems'))
         div
           button.customize-option(popover='{{::Content.spells.special.shinySeed.notes()}}', popover-title='{{::Content.spells.special.shinySeed.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase("special", Content.spells.special.shinySeed)', class='inventory_special_shinySeed')
           p

website/views/shared/new-stuff.jade

@@ -1,23 +1,45 @@
-h5 6/17/2015 - CUTTLEFISH PET QUEST AND QUEST DISPLAY IMPROVEMENTS
+h5 6/20/2015 - SUMMER SPLASH EVENT: LIMITED EDITION OUTFITS, SEASONAL SHOP OPENS, AND SUMMER NPCS!
   hr
   tr
     td
-      .quest_kraken.pull-right
-      h5 Cuttlefish Pet Quest
-      p A new pet quest is available in the <a href='/#/options/inventory/drops' target='_blank'>Market</a>: The Kraken of Inkomplete! A pleasant day sailing is ruined when a Kraken attacks. Can you strike down the tasks and tentacles that keep cropping up? If so, you'll be awarded with some cuttlefish eggs!
-      p.small.muted art by Lemoness and Wolvenhalo
-      p.small.muted writing by Lemoness
+      h5 Summer Splash Begins!
+      p The Summer Splash festival has arrived, and Habitica has moved to the undersea city of Dilatory for the summer! From today until July 31st, join us for fun in the sun.
   tr
     td
-      h5 Quest Display Improvements
-      p Now you can see the details of a pending quest on the Party Page by clicking the new "Quest Details" tab above the quest invitations. We hope this helps you decide whether or not you want to accept the quest!
-      p.small.muted by hairlessbear
+      .promo_summer_classes_2015.pull-right
+      h5 Limited Edition Class Outfits
+      p From now until July 31st, limited edition outfits are available in the Rewards column. Depending on your class, you can be a Reef Renegade, Sunfish Warrior, Strapping Sailor, or Ship Soothsayer! You'd better get productive to earn enough gold before they disappear. Good luck!
+      p.small.muted by Lemoness
+  tr
+    td
+      .promo_summer_classes_2014.pull-right
+      h5 Seasonal Shop Opens
+      p The <a href='/#/options/inventory/seasonalshop'>Seasonal Shop</a> has opened! It's stocking summertime Seasonal Edition goodies at the moment, including last year's summer outfits. Everything there will be available to purchase during the Summer Splash event each year, but it's only open until July 31st, so be sure to stock up now, or you'll have to wait a year to buy these items again.
+      p.small.muted by Lemoness
+  tr
+    td
+      .seasonalshop_summer2015.pull-right
+      h5 Summer NPCs
+      p Looks like the NPCs are really getting in to the summer spirit. Ian, Bailey, Matt, and the Seasonal Sorceress are having fun under the sea in the sunken city of Dilatory, and Alex and Daniel have moved down to the beach. Even the Time Travelers are getting into the fun, although... oh dear... they seem to have overshot the season...
+      p.small.muted by Lemoness
 
 hr
 a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
-
+  h5 6/17/2015 - CUTTLEFISH PET QUEST AND QUEST DISPLAY IMPROVEMENTS
+    tr
+      td
+        .quest_kraken.pull-right
+        h5 Cuttlefish Pet Quest
+        p A new pet quest is available in the <a href='/#/options/inventory/drops' target='_blank'>Market</a>: The Kraken of Inkomplete! A pleasant day sailing is ruined when a Kraken attacks. Can you strike down the tasks and tentacles that keep cropping up? If so, you'll be awarded with some cuttlefish eggs!
+        p.small.muted art by Lemoness and Wolvenhalo
+        p.small.muted writing by Lemoness
+    tr
+      td
+        h5 Quest Display Improvements
+        p Now you can see the details of a pending quest on the Party Page by clicking the new "Quest Details" tab above the quest invitations. We hope this helps you decide whether or not you want to accept the quest!
+        p.small.muted by hairlessbear
   h5 6/16/2015 - SEARCH BAR, CHALLENGES FILTER, INTERMITTENT REFRESH, AND VISUAL TWEAKS
     tr
       td