Merge branch 'sabe/attributes' into develop

Conflicts:
	dist/habitrpg-shared.js
	locales/en/main.json
This commit is contained in:
Cole Gleason
2014-01-30 10:44:49 -06:00
2 changed files with 14 additions and 0 deletions
+6
View File
@@ -467,6 +467,12 @@ api.wrap = (user, main=true) ->
user.achievements.rebirthLevel = lvl
cb? null, user
allocateNow: (req, cb) ->
_.times user.stats.points, user.fns.autoAllocate
user.stats.points = 0
user.markModified? 'stats'
cb? null, user.stats
# ------
# Tasks
# ------