Merge branch 'develop'

This commit is contained in:
Tyler Renelle
2013-06-20 20:39:13 -04:00
3 changed files with 14 additions and 11 deletions
+1 -5
View File
@@ -1,12 +1,8 @@
moment = require('moment')
_ = require('lodash')
helpers = require('./helpers.coffee')
items = require('./items.coffee')
{helpers, items} = require('../index')
{pets, hatchingPotions} = items.items
# Very strange bug where `require(./script/helpers.coffee)` is returning a blank object under certain circumsntances I haven't yet figured out
helpers = require('habitrpg-shared/script/helpers') if _.isEmpty(helpers)
XP = 15
HP = 2
obj = module.exports = {}