diff --git a/common/css/index.css b/common/css/index.css
index fee482b83b..e6f4df7edb 100644
--- a/common/css/index.css
+++ b/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;
diff --git a/common/img/sprites/spritesmith/npcs/npc_alex.png b/common/img/sprites/spritesmith/npcs/npc_alex.png
index 8982854041..67b7476d33 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_alex.png and b/common/img/sprites/spritesmith/npcs/npc_alex.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_bailey.png b/common/img/sprites/spritesmith/npcs/npc_bailey.png
index 419496bdd0..d5940b986b 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_bailey.png and b/common/img/sprites/spritesmith/npcs/npc_bailey.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_daniel.png b/common/img/sprites/spritesmith/npcs/npc_daniel.png
index 471f751e72..531b8ff760 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_daniel.png and b/common/img/sprites/spritesmith/npcs/npc_daniel.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_ian.png b/common/img/sprites/spritesmith/npcs/npc_ian.png
deleted file mode 100644
index 86860dfa1b..0000000000
Binary files a/common/img/sprites/spritesmith/npcs/npc_ian.png and /dev/null differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_justin.png b/common/img/sprites/spritesmith/npcs/npc_justin.png
index 9365bc12c9..08ba7025c2 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_justin.png and b/common/img/sprites/spritesmith/npcs/npc_justin.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_matt.png b/common/img/sprites/spritesmith/npcs/npc_matt.png
index e129d6e43e..2531f1084b 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_matt.png and b/common/img/sprites/spritesmith/npcs/npc_matt.png differ
diff --git a/common/img/sprites/spritesmith/npcs/seasonalshop_spring2015.png b/common/img/sprites/spritesmith/npcs/seasonalshop_spring2015.png
deleted file mode 100644
index e1f811893e..0000000000
Binary files a/common/img/sprites/spritesmith/npcs/seasonalshop_spring2015.png and /dev/null differ
diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade
index 97ad31ad73..f0156f233c 100644
--- a/website/views/options/inventory/inventory.jade
+++ b/website/views/options/inventory/inventory.jade
@@ -28,15 +28,15 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html
.container-fluid
.stable.row
.col-md-2
- .seasonalshop_spring2015
+ .seasonalshop_closed
.col-md-10
.popover.static-popover.fade.right.in
.arrow
- h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"", linkEnd: ""})
+ h3.popover-title!=env.t('seasonalShopClosedTitle')
.popover-content
- p!=env.t('seasonalShopText')
- .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
- li.customize-menu.inventory-gear
+ p!=env.t('seasonalShopClosedText', {linkStart:"", linkEnd: ""})
+ // .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
diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade
index e4dc240b90..d37cf01aa0 100644
--- a/website/views/options/profile.jade
+++ b/website/views/options/profile.jade
@@ -62,7 +62,7 @@ mixin customizeProfile(mobile)
each color in ['pblue','pgreen','porange','ppink','ppurple','pyellow']
button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")')
+buyPref('hair.color', ['rainbow','yellow','green','purple','blue','TRUred'], 'rainbowColors')
- +buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors')
+ +buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors', 'disabled')
+buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors', 'disabled')
+buyPref('hair.color', ['aurora','festive','hollygreen','peppermint','snowy','winterstar'], 'winteryColors', 'disabled')
@@ -134,7 +134,7 @@ mixin customizeProfile(mobile)
// Rainbow Skin
+buyPref('skin', ['eb052b','f69922','f5d70f','0ff591','2b43f6','d7a9f7','800ed0','rainbow'], 'rainbowSkins')
- +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins')
+ +buyPref('skin', ['pastelPink','pastelOrange','pastelYellow','pastelGreen','pastelBlue','pastelPurple','pastelRainbowChevron','pastelRainbowDiagonal'], 'pastelSkins', 'disabled')
// Special Events
+buyPref('skin', ['monster','pumpkin','skeleton','zombie','ghost','shadow'], 'spookySkins', 'disabled')