Merge branch 'release' into develop

website/client/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,114 +1,120 @@
 .achievement-costumeContest6x {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1013px -819px;
+  background-position: -958px -455px;
   width: 144px;
   height: 156px;
 }
 .promo_alligator {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px 0px;
+  background-position: -477px 0px;
   width: 480px;
   height: 360px;
 }
 .promo_animal_tails {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1013px -208px;
+  background-position: -1325px -422px;
   width: 141px;
   height: 441px;
 }
 .promo_armoire_backgrounds_201810 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -1157px;
+  background-position: 0px -1147px;
   width: 423px;
   height: 147px;
 }
 .promo_fall_avatar_customizations {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1013px 0px;
+  background-position: -1325px -214px;
   width: 336px;
   height: 207px;
 }
 .promo_fall_festival_2017 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -481px -453px;
+  background-position: 0px -936px;
   width: 414px;
   height: 210px;
 }
 .promo_fall_festival_2018 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -367px -723px;
+  background-position: -1325px 0px;
   width: 393px;
   height: 213px;
 }
 .promo_forest_friends_bundle {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -1009px;
+  background-position: -415px -936px;
   width: 423px;
   height: 147px;
 }
 .promo_ghost_potions {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -848px -1009px;
+  background-position: -839px -936px;
   width: 423px;
   height: 147px;
 }
 .promo_ios {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -361px;
+  background-position: 0px -365px;
   width: 375px;
   height: 361px;
 }
 .promo_jackolanterns {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -1009px;
+  background-position: -513px -727px;
   width: 423px;
   height: 147px;
 }
 .promo_mystery_201810 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1013px -650px;
+  background-position: -958px -286px;
   width: 294px;
   height: 168px;
 }
+.promo_seaserpent {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px 0px;
+  width: 476px;
+  height: 364px;
+}
 .promo_seasonal_shop {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1155px -503px;
+  background-position: -1467px -717px;
   width: 162px;
   height: 138px;
 }
 .promo_spooky_sparkles {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1155px -208px;
+  background-position: -1467px -422px;
   width: 140px;
   height: 294px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1158px -819px;
+  background-position: -1608px -422px;
   width: 96px;
   height: 69px;
 }
 .promo_veteran_pets {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -1157px;
+  background-position: -1325px -864px;
   width: 363px;
   height: 141px;
 }
 .scene_nametag {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -481px -244px;
+  background-position: 0px -727px;
   width: 512px;
   height: 208px;
 }
 .scene_positivity {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -481px 0px;
+  background-position: -376px -365px;
   width: 531px;
   height: 243px;
 }
 .scene_tools {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -723px;
+  background-position: -958px 0px;
   width: 366px;
   height: 285px;
 }

website/client/assets/scss/variables.scss

@@ -2,8 +2,8 @@
 // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
 // more to be added on future seasons
 
-$npc_market_flavor: 'habitoween';
-$npc_quests_flavor: 'habitoween';
-$npc_seasonal_flavor: 'habitoween';
-$npc_timetravelers_flavor: 'fall';
-$npc_tavern_flavor: 'habitoween';
+$npc_market_flavor: 'normal';
+$npc_quests_flavor: 'normal';
+$npc_seasonal_flavor: 'normal';
+$npc_timetravelers_flavor: 'normal';
+$npc_tavern_flavor: 'normal';