chore(event): end New Year's bennies

website/assets/sprites/dist/spritesmith-main-7.css

@@ -696,9 +696,9 @@
 }
 .npc_bailey {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1622px -1153px;
+  background-position: -1637px -1274px;
   width: 54px;
-  height: 93px;
+  height: 78px;
 }
 .npc_daniel {
   background-image: url(/static/sprites/spritesmith-main-7.png);
@@ -756,7 +756,7 @@
 }
 .npc_vicky {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1637px -1274px;
+  background-position: -1622px -1153px;
   width: 59px;
   height: 82px;
 }

website/client/assets/css/sprites/spritesmith-main-7.css

@@ -696,9 +696,9 @@
 }
 .npc_bailey {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1622px -1153px;
+  background-position: -1637px -1274px;
   width: 54px;
-  height: 93px;
+  height: 78px;
 }
 .npc_daniel {
   background-image: url(/static/sprites/spritesmith-main-7.png);
@@ -756,7 +756,7 @@
 }
 .npc_vicky {
   background-image: url(/static/sprites/spritesmith-main-7.png);
-  background-position: -1637px -1274px;
+  background-position: -1622px -1153px;
   width: 59px;
   height: 82px;
 }

website/common/locales/en/npc.json

@@ -4,7 +4,7 @@
     "npcAchievementText": "Backed the Kickstarter project at the maximum level!",
     "mattBoch": "Matt Boch",
     "mattShall": "Shall I bring you your steed, <%= name %>? Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
-    "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. Starting at level 3, you can hatch pets using eggs and potions. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 3, and they'll grow into hardy mounts.",
+    "mattBochText1": "Welcome to the Stable! I'm Matt, the beast master. Starting at level 3, you will find eggs and potions to hatch pets with. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 3, and they'll grow into hardy mounts.",
     "daniel": "Daniel",
     "danielText": "Welcome to the Tavern! Stay a while and meet the locals. If you need to rest (vacation? illness?), I'll set you up at the Inn. While checked-in, your Dailies won't hurt you at the day's end, but you can still check them off.",
     "danielText2": "Be warned: If you are participating in a boss quest, the boss will still damage you for your party mates' missed Dailies! Also, your own damage to the Boss (or items collected) will not be applied until you check out of the Inn.",
@@ -90,7 +90,7 @@
     "tourMarketPage": "Starting at Level 3, eggs and hatching potions drop randomly when you complete tasks. They appear here - use them to hatch pets! You can also buy items from the Market.",
     "tourHallPage": "Welcome to the Hall of Heroes, where open-source contributors to Habitica are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned Gems, exclusive equipment, and prestigious titles. You can contribute to Habitica, too!",
     "tourPetsPage": "This is the Stable! After reaching level 3, you will gather pet eggs and hatching potions as you complete tasks. When you hatch a pet in the Market, it will appear here! Click a pet's image to add it to your avatar. Feed them with the food you find after level 3, and they'll grow into powerful mounts.",
-    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. (Pets, mounts, and food are available after level 3.) Click a mount to saddle up!",
+    "tourMountsPage": "Once you've fed a pet enough food to turn it into a mount, it will appear here. Click a mount to saddle up!",
     "tourEquipmentPage": "This is where your Equipment is stored! Your Battle Gear affects your stats. If you want to show different Equipment on your avatar without changing your stats, click \"Enable Costume.\"",
     "equipmentAlreadyOwned": "You already own that piece of equipment",
 

website/server/models/user/hooks.js

@@ -78,8 +78,6 @@ function _setUpNewUser (user) {
   let iterableFlags = user.flags.toObject();
 
   user._ABtest = '';
-  user.migration = '20161230_nye_hats.js';
-  user.items.gear.owned.head_special_nye = false; // eslint-disable-line camelcase
   // A/B test 2016-12-21: Should we deliver notifications for upcoming incentives on days when users don't receive rewards?
   if (Math.random() < 0.5) {
     user._ABtests.checkInModals = '20161221_noCheckInPreviews'; // no 'preview' check-in modals

website/views/options/inventory/seasonal-shop.jade

@@ -19,7 +19,7 @@
         div
           | {{item.value}}
           span(ng-class="{ 'shop_gold': item.currency === 'gold', 'Pet_Currency_Gem1x inline-gems': item.currency === 'gems'}")
-      div(ng-if='category.identifier === "spells"')
+      // div(ng-if='category.identifier === "spells"')
         button.customize-option(class='inventory_special_nye',
         popover='{{::Content.spells.special.nye.notes()}}',
         popover-title='{{::Content.spells.special.nye.text()}}',