feat(spring): Fling

common/css/index.css

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

common/locales/en/gear.json

@@ -120,6 +120,15 @@
   "weaponSpecialWinter2015HealerText": "Soothing Scepter",
   "weaponSpecialWinter2015HealerNotes": "This scepter warms sore muscles and soothes away stress. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.",
 
+  "weaponSpecialSpring2015RogueText": "Exploding Squeak",
+  "weaponSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.",
+  "weaponSpecialSpring2015WarriorText": "Bone Club",
+  "weaponSpecialSpring2015WarriorNotes": "It is a real bone club for real fierce doggies and is definitely not a chew toy that the Seasonal Sorceress gave you because who's a good doggy? Whoooo's a good doggy?? It's you!!! You're a good doggy!!! Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.",
+  "weaponSpecialSpring2015MageText": "Magician's Wand",
+  "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.",
+  
   "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.",
   "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth",
@@ -235,6 +244,15 @@
   "armorSpecialWinter2015HealerText": "Skating Outfit",
   "armorSpecialWinter2015HealerNotes": "Ice-skating is very relaxing, but you shouldn't try it without this protective gear in case you get attacked by the icicle drakes. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
 
+  "armorSpecialSpring2015RogueText": "Squeaker Robes",
+  "armorSpecialSpring2015RogueNotes": "Furry, soft, and definitely not flammable. Increases Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
+  "armorSpecialSpring2015WarriorText": "Beware Armor",
+  "armorSpecialSpring2015WarriorNotes": "Only the fiercest doggy is allowed to be this fluffy. Increases Constitution by <%= con %>. Limited Edition 2015 Spring Gear.",
+  "armorSpecialSpring2015MageText": "Magician's Bunny Suit",
+  "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.",
+  
   "armorMystery201402Text": "Messenger Robes",
   "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
   "armorMystery201403Text": "Forest Walker Armor",
@@ -363,6 +381,15 @@
   "headSpecialWinter2015HealerText": "Snuggly Earmuffs",
   "headSpecialWinter2015HealerNotes": "These warm earmuffs keep out chills and distracting noises. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.",
 
+  "headSpecialSpring2015RogueText": "Fireproof Helm",
+  "headSpecialSpring2015RogueNotes": "Fire? HAH! You squeak fiercely in the face of fire! Increases Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
+  "headSpecialSpring2015WarriorText": "Beware Helm",
+  "headSpecialSpring2015WarriorNotes": "Beware the Helm! Only a fierce doggy can wear it. Stop laughing. Increases Strength by <%= str %>. Limited Edition 2015 Spring Gear.",
+  "headSpecialSpring2015MageText": "Stage Magician's Hat",
+  "headSpecialSpring2015MageNotes": "Which came first, the bunny or the hat? Increases Perception by <%= per %>. Limited Edition 2015 Spring Gear.",
+  "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.",
+
   "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.",
 
@@ -455,6 +482,13 @@
   "shieldSpecialWinter2015HealerText": "Soothing Shield",
   "shieldSpecialWinter2015HealerNotes": "This shield deflects the freezing wind. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
 
+  "shieldSpecialSpring2015RogueText": "Exploding Squeak",
+  "shieldSpecialSpring2015RogueNotes": "Don't let the sound fool you - these explosives pack a punch. Increases Strength <%= str %>. Limited Edition 2015 Spring Gear.",
+  "shieldSpecialSpring2015WarriorText": "Dish Discus",
+  "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.",
+  
   "shieldMystery301405Text": "Clock Shield",
   "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
 
@@ -500,10 +534,18 @@
   "headAccessorySpecialSpringHealerText": "Yellow Dog Ears",
   "headAccessorySpecialSpringHealerNotes": "Floppy but cute. Wanna play? Confers no benefit. Limited Edition 2014 Spring Gear.",
 
+  "headAccessorySpecialSpring2015RogueText": "Yellow Mouse Ears",
+  "headAccessorySpecialSpring2015RogueNotes": "These ears steel themselves against the sound of explosions. Confers no benefit. Limited Edition 2015 Spring Gear.",
+  "headAccessorySpecialSpring2015WarriorText": "Purple Dog Ears",
+  "headAccessorySpecialSpring2015WarriorNotes": "They are purple. They are dog ears. Do not waste your time with further foolishness. Confers no benefit. Limited Edition 2015 Spring Gear.",
+  "headAccessorySpecialSpring2015MageText": "Blue Bunny Ears",
+  "headAccessorySpecialSpring2015MageNotes": "These ears listen keenly, in case somewhere a magician is revealing secrets. Confers no benefit. Limited Edition 2015 Spring Gear.",
+  "headAccessorySpecialSpring2015HealerText": "Green Kitty Ears",
+  "headAccessorySpecialSpring2015HealerNotes": "These cute kitty ears will make others green with envy. Confers no benefit. Limited Edition 2015 Spring Gear.",
+  
   "headAccessoryMystery201403Text": "Forest Walker Antlers",
   "headAccessoryMystery201403Notes": "These antlers shimmer with moss and lichen. Confers no benefit. March 2014 Subscriber Item.",
   "headAccessoryMystery201404Text": "Twilight Butterfly Antennae",
-  "headAccessoryMystery201404Notes": "These antennae help the wearer sense dangerous distractions!",
   "headAccessoryMystery201404Notes": "These antennae help the wearer sense dangerous distractions! Confers no benefit. April 2014 Subscriber Item.",
   "headAccessoryMystery201409Text": "Autumn Antlers",
   "headAccessoryMystery201409Notes": "These powerful antlers change colors with the leaves. Confers no benefit. September 2014 Subscriber Item.",

common/locales/en/limited.json

@@ -22,7 +22,7 @@
     "seasonalShopClosedTitle": "<%= linkStart %>Siena Leslie<%= linkEnd %>",
     "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! From now until January 31st, we're stocking lots of seasonal edition winter goodies. After that, these items won't be back for another year, so get them while they're hot!! Or, er, cold.",
+    "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!",
     "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)",
@@ -38,5 +38,9 @@
     "newYear2": "Happy New Year! May you earn many a Perfect Day.",
     "newYear3": "Happy New Year! May your To-Do list stay short and sweet.",
     "newYear4": "Happy New Year! May you not get attacked by a raging Hippogriff.",
-    "holidayCard": "Received a holiday card!"
+    "holidayCard": "Received a holiday card!",
+    "mightyBunnySet": "Mighty Bunny (Warrior)",
+    "magicMouseSet": "Magic Mouse (Mage)",
+    "lovingPupSet": "Loving Pup (Healer)",
+    "stealthyKittySet": "Stealthy Kitty (Rogue)"
 }

common/script/content.coffee

@@ -27,6 +27,7 @@ events =
   gaymerx: {start:'2014-07-02',end:'2014-08-01'}
   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.
@@ -122,10 +123,15 @@ gear =
       fallMage:     event: events.fall, specialClass: 'wizard',  twoHanded:true, text: t('weaponSpecialFallMageText'), notes: t('weaponSpecialFallMageNotes', {int: 15, per: 7}), value: 160, int:15, per:7
       fallHealer:   event: events.fall, specialClass: 'healer',  text: t('weaponSpecialFallHealerText'), notes: t('weaponSpecialFallHealerNotes', {int: 9}), value: 90, int: 9
       # Winter 2015
-      winter2015Rogue:  event: events.winter2015, specialClass: 'rogue', text: t('weaponSpecialWinter2015RogueText'), notes: t('weaponSpecialWinter2015RogueNotes', {str: 8}), value: 80, str: 8
+      winter2015Rogue:    event: events.winter2015, specialClass: 'rogue', text: t('weaponSpecialWinter2015RogueText'), notes: t('weaponSpecialWinter2015RogueNotes', {str: 8}), value: 80, str: 8
       winter2015Warrior:  event: events.winter2015, specialClass: 'warrior', text: t('weaponSpecialWinter2015WarriorText'), notes: t('weaponSpecialWinter2015WarriorNotes', {str: 15}), value: 90, str: 15
       winter2015Mage:     event: events.winter2015, specialClass: 'wizard',  twoHanded:true, text: t('weaponSpecialWinter2015MageText'), notes: t('weaponSpecialWinter2015MageNotes', {int: 15, per: 7}), value: 160, int:15, per:7
       winter2015Healer:   event: events.winter2015, specialClass: 'healer',  text: t('weaponSpecialWinter2015HealerText'), notes: t('weaponSpecialWinter2015HealerNotes', {int: 9}), value: 90, int: 9
+      # Spring 2015
+      spring2015Rogue:    event: events.spring2015, specialClass: 'rogue', text: t('weaponSpecialSpring2015RogueText'), notes: t('weaponSpecialSpring2015RogueNotes', {str: 8}), value: 80, str: 8
+      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
     mystery:
       201411: text: t('weaponMystery201411Text'), notes: t('weaponMystery201411Notes'), mystery:'201411', value: 0
       201502: text: t('weaponMystery201502Text'), notes: t('weaponMystery201502Notes'), mystery:'201502', value: 0
@@ -193,6 +199,11 @@ gear =
       winter2015Mage:     event: events.winter2015, specialClass: 'wizard',    text: t('armorSpecialWinter2015MageText'), notes: t('armorSpecialWinter2015MageNotes', {int: 9}), value: 90, int: 9
       winter2015Healer:   event: events.winter2015, specialClass: 'healer',  text: t('armorSpecialWinter2015HealerText'), notes: t('armorSpecialWinter2015HealerNotes', {con: 15}), value: 90, con: 15
       birthday2015:   text: t('armorSpecialBirthday2015Text'), notes: t('armorSpecialBirthday2015Notes'), value: 0, canOwn: ((u)-> u.items.gear.owned.armor_special_birthday2015?)
+      # Spring 2015
+      spring2015Rogue:    event: events.spring2015, specialClass: 'rogue',   text: t('armorSpecialSpring2015RogueText'), notes: t('armorSpecialSpring2015RogueNotes', {per: 15}), value: 90, per: 15
+      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
       # Other
       gaymerx:    event: events.gaymerx, text: t('armorSpecialGaymerxText'), notes: t('armorSpecialGaymerxNotes'), value: 0
     mystery:
@@ -270,6 +281,11 @@ gear =
       winter2015Mage:     event: events.winter2015, specialClass: 'wizard',    text: t('headSpecialWinter2015MageText'), notes: t('headSpecialWinter2015MageNotes', {per: 7}),value: 60,per: 7
       winter2015Healer:   event: events.winter2015, specialClass: 'healer',  text: t('headSpecialWinter2015HealerText'), notes: t('headSpecialWinter2015HealerNotes', {int: 7}), value: 60, int: 7
       nye2014:      text: t('headSpecialNye2014Text'), notes: t('headSpecialNye2014Notes'), value: 0, canOwn: ((u)-> u.items.gear.owned.head_special_nye2014?)
+      # Spring 2015
+      spring2015Rogue:    event: events.spring2015, specialClass: 'rogue',   text: t('headSpecialSpring2015RogueText'), notes: t('headSpecialSpring2015RogueNotes', {per: 9}),value: 60,per: 9
+      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
       # Other
       gaymerx:        event: events.gaymerx, text: t('headSpecialGaymerxText'), notes: t('headSpecialGaymerxNotes'), value: 0
     mystery:
@@ -336,6 +352,10 @@ gear =
       winter2015Rogue:    event: events.winter2015, specialClass: 'rogue',   text: t('shieldSpecialWinter2015RogueText'), notes: t('shieldSpecialWinter2015RogueNotes', {str: 8}), value: 80, str: 8
       winter2015Warrior:  event: events.winter2015, specialClass: 'warrior', text: t('shieldSpecialWinter2015WarriorText'), notes: t('shieldSpecialWinter2015WarriorNotes', {con: 7}), value: 70, con: 7
       winter2015Healer:   event: events.winter2015, specialClass: 'healer',  text: t('shieldSpecialWinter2015HealerText'), notes: t('shieldSpecialWinter2015HealerNotes', {con: 9}), value: 70, con: 9
+      # Spring 2015
+      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
     mystery:
       301405: text: t('shieldMystery301405Text'), notes: t('shieldMystery301405Notes'), mystery:'301405', value: 0
 
@@ -370,6 +390,11 @@ gear =
       springWarrior: event: events.spring, specialClass: 'warrior', text: t('headAccessorySpecialSpringWarriorText'), notes: t('headAccessorySpecialSpringWarriorNotes'), value: 20
       springMage:    event: events.spring, specialClass: 'wizard',  text: t('headAccessorySpecialSpringMageText'), notes: t('headAccessorySpecialSpringMageNotes'), value: 20
       springHealer:  event: events.spring, specialClass: 'healer',  text: t('headAccessorySpecialSpringHealerText'), notes: t('headAccessorySpecialSpringHealerNotes'), value: 20
+      # Spring 2015
+      spring2015Rogue:   event: events.spring2015, specialClass: 'rogue',   text: t('headAccessorySpecialSpring2015RogueText'), notes: t('headAccessorySpecialSpring2015RogueNotes'), value: 20
+      spring2015Warrior: event: events.spring2015, specialClass: 'warrior', text: t('headAccessorySpecialSpring2015WarriorText'), notes: t('headAccessorySpecialSpring2015WarriorNotes'), value: 20
+      spring2015Mage:    event: events.spring2015, specialClass: 'wizard',  text: t('headAccessorySpecialSpring2015MageText'), notes: t('headAccessorySpecialSpring2015MageNotes'), value: 20
+      spring2015Healer:  event: events.spring2015, specialClass: 'healer',  text: t('headAccessorySpecialSpring2015HealerText'), notes: t('headAccessorySpecialSpring2015HealerNotes'), value: 20
       
     mystery:
       201403: text: t('headAccessoryMystery201403Text'), notes: t('headAccessoryMystery201403Notes'), mystery:'201403', value: 0

website/public/js/controllers/inventoryCtrl.js

@@ -228,7 +228,7 @@ habitrpg.controller("InventoryCtrl",
       var questArray = _.toArray(Content.quests);
 
       var filteredArray = _.filter(questArray, function(q){
-        return q.key == "evilsanta" || q.key == "evilsanta2";
+        return q.key == "egg";
       });
 
       return filteredArray;

website/views/options/inventory/inventory.jade

@@ -35,10 +35,10 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html
           h3.popover-title!=env.t('seasonalShopClosedTitle', {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>"})
-  // br
+  br
     .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 ::{candycane:env.t("candycaneSet"), ski:env.t("skiSet"), snowflake:env.t("snowflakeSet"), yeti:env.t("yetiSet")}')
+      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,
@@ -48,19 +48,19 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html
           .text-center
             | {{((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.snowball.notes()}}', popover-title='{{::Content.spells.special.snowball.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='purchase("special", Content.spells.special.snowball)', class='inventory_special_snowball')
           p
             | {{::Content.spells.special.snowball.value}}
             span(class='shop_gold')
-        // div
+        div
           button.customize-option(popover='{{::Content.spells.special.nye.notes()}}', popover-title='{{::Content.spells.special.nye.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.nye)', class='inventory_special_nye')
           p
             | {{Content.spells.special.nye.value}}

website/views/shared/new-stuff.jade

@@ -1,30 +1,53 @@
-h5 3/17/2015 - BUNNY PET QUEST, EGG PURCHASING CHANGE, LAST DAY FOR SURVEY AND ACHIEVEMENT, AND UNEQUIP BUTTONS
+h5 3/20/2015 - SPRING FLING EVENT! LIMITED EDITION OUTFITS, SEASONAL SHOP OPENS, AND SPRING NPCS
   hr
   tr
     td
-      h5 New Pet Quest: Killer Bunny
-      p There's a new quest scroll in the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a>! Deep within Mount Procrastination lies a once-sweet beast grown horrifying with neglect. Can you rally your strength to defeat the Killer Bunny? If so, you'll get some bunny eggs!
-      p.small.muted by Draayder, Gully, and TetoIsGreat
+      h5 Spring Fling!
+      p The Spring Fling is here! From today until April 30th, join Habitica in its sweet celebration.
   tr
     td
-      h5 Egg Purchasing Change
-      p You can now purchase quest eggs from the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a> after defeating the corresponding boss at least once! Previously, you had to defeat the boss at least twice before being able to purchase the eggs.
-      p.small.muted by Blade
+      .promo_springclasses2015.pull-right
+      h5 Limited Edition Class Outfits
+      p From now until April 30th, limited edition outfits are available in the Rewards column. Depending on your class, you can be a Beware Dog, Magician's Bunny, Sneaky Squeaker, or Comforting Kitty! You'd better get productive to earn enough gold before they disappear. Good luck!
+      p.small.muted by Lemoness
   tr
     td
-      h5 Last Day for Survey and Achievement
-      p March 18th is the final day to complete <a href='https://www.surveymonkey.com/s/62RXRF3' target='_blank'>this survey</a> to receive or stack the Helped Habit Grow survey! After it is closed, it will take us several days to award the badges. Thanks so much for sharing your feedback with us!
-      p.small.muted by sugarfiend and SabreCat
+      .promo_springclasses2014.pull-right
+      h5 Seasonal Shop Opens
+      p The <a href='https://habitrpg.com/#/options/inventory/seasonalshop' target='_blank'>Seasonal Shop</a> has opened! It's stocking springtime Seasonal Edition goodies at the moment, including last year's spring outfits. Everything there will be available to purchase during the Spring Fling event each year, but it's 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.
+      p.small.muted by Lemoness
   tr
     td
-      h5 Unequip Buttons
-      p It’s now easier to switch your avatar’s costume! You can now unequip all your battle gear, costume pieces, and/or pets from the Equipment page using the new Unequip buttons.
-      p.small.muted by TheHolidayInn
+      .seasonalshop_spring2015.pull-right
+      h5 Spring NPCs
+      p Looks like the NPCs are really getting in to the springtime fun around the site. Who wouldn't? After all, there's plenty more to come!
+      p.small.muted by Lemoness and Shaner
 
 hr
 a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h5 3/17/2015 - BUNNY PET QUEST, EGG PURCHASING CHANGE, LAST DAY FOR SURVEY AND ACHIEVEMENT, AND UNEQUIP BUTTONS
+    tr
+      td
+        h5 New Pet Quest: Killer Bunny
+        p There's a new quest scroll in the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a>! Deep within Mount Procrastination lies a once-sweet beast grown horrifying with neglect. Can you rally your strength to defeat the Killer Bunny? If so, you'll get some bunny eggs!
+        p.small.muted by Draayder, Gully, and TetoIsGreat
+    tr
+      td
+        h5 Egg Purchasing Change
+        p You can now purchase quest eggs from the <a href='https://habitrpg.com/#/options/inventory/drops' target='_blank'>Market</a> after defeating the corresponding boss at least once! Previously, you had to defeat the boss at least twice before being able to purchase the eggs.
+        p.small.muted by Blade
+    tr
+      td
+        h5 Last Day for Survey and Achievement
+        p March 18th is the final day to complete <a href='https://www.surveymonkey.com/s/62RXRF3' target='_blank'>this survey</a> to receive or stack the Helped Habit Grow survey! After it is closed, it will take us several days to award the badges. Thanks so much for sharing your feedback with us!
+        p.small.muted by sugarfiend and SabreCat
+    tr
+      td
+        h5 Unequip Buttons
+        p It’s now easier to switch your avatar’s costume! You can now unequip all your battle gear, costume pieces, and/or pets from the Equipment page using the new Unequip buttons.
+        p.small.muted by TheHolidayInn
   h5 3/10/2015 - SURVEY, TESTIMONIALS GUILD, AND CHAT EXTENSION
     hr
     tr