Merge branch 'develop' into refactor-content

This commit is contained in:
Blade Barringer
2015-09-23 07:52:36 -05:00
193 changed files with 4855 additions and 4069 deletions

View File

@@ -80,6 +80,7 @@ export var armor = {
str: 5,
con: 6
}),
value: 100,
int: 6,
str: 5,
con: 6,