Merge branch 'develop' of github.com:lefnire/habitrpg into develop

src/app/scoring.coffee

@@ -258,6 +258,7 @@ updateStats = (model, newStats, batch) ->
 cron = (model) ->
   user = model.at '_user'
   today = +new Date
+  return if user.get 'flags.rest'
   daysPassed = helpers.daysBetween(user.get('lastCron'), today, user.get('preferences.dayStart'))
   if daysPassed > 0
 

views/app/avatar.html

@@ -9,6 +9,7 @@
                 <ul class="nav nav-tabs">
                     <li class="active"><a data-toggle='tab' href="#profileCustomize">Avatar</a></li>
                     <li><a data-toggle='tab' href="#profileEdit">Profile</a></li>
+                    <li><a data-toggle='tab' data-target="#rest">Rest</a></li>
                     {#if _user.flags.dropsEnabled}
                         <li><a data-toggle='tab' data-target="#profileInventory">Inventory</a></li>
                         <li><a data-toggle='tab' data-target="#profileMarket">Market</a></li>
@@ -25,6 +26,10 @@
                         <app:avatar:profile user="{_user}" main="true" />
                     </div>
 
+                    <div class="tab-pane" id="rest">
+                        <app:avatar:rest />
+                    </div>
+
                     <div class="tab-pane" id="profileInventory">
                         <app:avatar:inventory />
                     </div>
@@ -214,6 +219,9 @@
 
     </div>
 
+<rest:>
+    <input type="checkbox" name="rest" checked={_user.flags.rest} >Rest</input>
+
 <achievements:>
     <!--TODO replce this in the future with HTML from BrowserQuest's index.html, which properly handles the achievements
         sprite-sheets (see BQ's achievements.css, main.css) -->