diff --git a/website/client/assets/images/sprites/spritesmith-main-10.png b/website/client/assets/images/sprites/spritesmith-main-10.png index 95215a74e8..5519dc9875 100644 Binary files a/website/client/assets/images/sprites/spritesmith-main-10.png and b/website/client/assets/images/sprites/spritesmith-main-10.png differ diff --git a/website/client/assets/scss/variables.scss b/website/client/assets/scss/variables.scss index ce054846bc..573376536b 100644 --- a/website/client/assets/scss/variables.scss +++ b/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: 'thanksgiving'; -$npc_quests_flavor: 'thanksgiving'; -$npc_seasonal_flavor: 'thanksgiving'; +$npc_market_flavor: 'normal'; +$npc_quests_flavor: 'normal'; +$npc_seasonal_flavor: 'normal'; $npc_timetravelers_flavor: 'normal'; -$npc_tavern_flavor: 'thanksgiving'; +$npc_tavern_flavor: 'normal'; diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index ee18cd560d..d5940b986b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_bailey.png and b/website/raw_sprites/spritesmith/npcs/npc_bailey.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png index ef720ee718..2531f1084b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_matt.png and b/website/raw_sprites/spritesmith/npcs/npc_matt.png differ diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index 995fa34a87..020dd59ebe 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -125,8 +125,6 @@ function _setUpNewUser (user) { let iterableFlags = user.flags.toObject(); user.items.quests.dustbunnies = 1; - user.items.pets['Turkey-Base'] = 5; - user.items.currentPet = 'Turkey-Base'; user.purchased.background.violet = true; user.preferences.background = 'violet';