Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix

website/views/options/inventory/equipment.jade

@@ -4,6 +4,13 @@
       h3.equipment-title.hint(popover-trigger='mouseenter',
         popover-placement='right', popover-append-to-body='true',
         popover=env.t('battleGearText'))=env.t('battleGear')
+      
+      .checkbox.equipment-title
+        label
+          input(type="checkbox", ng-model="user.preferences.autoEquip",
+            ng-change='set({"preferences.autoEquip":user.preferences.autoEquip ? true : false})')
+          |  
+          =env.t('autoEquipBattleGear')
 
       div
         button.btn.btn-default(type="button", ng-click='dequip("battleGear");') {{env.t("unequipBattleGear")}}

website/views/options/inventory/quests.jade

@@ -4,12 +4,13 @@ include ../../shared/mixins
   .row
     .col-md-6
       .clearfix
-        .npc_ian.pull-left-sm.col-centered
+        div(class="#{env.worldDmg.quests ? 'npc_ian_broken' : 'npc_ian'}").pull-left-sm.col-centered
         .popover.static-popover.fade.right.in.pull-left-sm.col-centered
           .arrow.hidden-xs
           h3.popover-title=env.t('ian')
           .popover-content
-            p=env.t('ianText')
+            p(ng-if='env.worldDmg.quests')=env.t('ianBrokenText')
+            p(ng-if='!env.worldDmg.quests')=env.t('ianText')
 
       h3.equipment-title=env.t('yourQuests')
       +ownedQuests(true,'right')

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

@@ -1,11 +1,12 @@
 .container-fluid
   .stable.row: .col-xs-12
-    .seasonalshop_open.pull-left-sm.col-centered
+    div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_open'}").pull-left-sm.col-centered
     .popover.static-popover.fade.right.in.pull-left-sm.col-centered
       .arrow.hidden-xs
       h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"<a href='http://blog.habitrpg.com/who' target='_blank'>", linkEnd: "</a>"})
       .popover-content
-        p!=env.t('seasonalShopFallText')
+        p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopFallText')
+        p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopFallTextBroken')
 
   .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth')
 

website/views/options/inventory/time-travelers.jade

@@ -12,7 +12,7 @@
         .pull-right
           span.inventory_special_trinket.inline-gems
           b x{{user.purchased.plan.consecutive.trinkets}}
-        p!=env.t('timeTravelersPopover', {linkStart: "<a href='http://habitica.wikia.com/wiki/Mystery_Item' target='_blank'>", linkEnd: "</a>"})
+        p!=env.t('timeTravelersPopover')
 
   .row: .col-md-7
     .alert.alert-info(ng-if='hasAllTimeTravelerItems()')=env.t('timeTravelersAlreadyOwned')