Merge branch 'feature/fixes' into feature/bug-fixes

This commit is contained in:
felixlinker
2018-09-29 15:59:19 +01:00

View File

@@ -3,8 +3,8 @@
{ {
"ammo": 16, "ammo": 16,
"breachdmg": 20, "breachdmg": 20,
"breachmax": 0, "breachmax": 1,
"breachmin": 0, "breachmin": 1,
"class": 1, "class": 1,
"clip": 8, "clip": 8,
"cost": 32180, "cost": 32180,
@@ -63,8 +63,8 @@
{ {
"ammo": 48, "ammo": 48,
"breachdmg": 20, "breachdmg": 20,
"breachmax": 0, "breachmax": 1,
"breachmin": 0, "breachmin": 1,
"class": 2, "class": 2,
"clip": 12, "clip": 12,
"cost": 240400, "cost": 240400,
@@ -127,8 +127,8 @@
{ {
"ammo": 48, "ammo": 48,
"breachdmg": 16, "breachdmg": 16,
"breachmax": 0, "breachmax": 1,
"breachmin": 0, "breachmin": 1,
"class": 2, "class": 2,
"clip": 12, "clip": 12,
"cost": 1951040, "cost": 1951040,