Merge branch 'Mario/balance_v2' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:03:24 +0000 (07:03 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:03:24 +0000 (07:03 +0000)
commitf34e36384aea3cb5e6c6818de704e6da2ee125b5
tree2c22e8af299051459ca7bc3ed083e8078b11f09e
parenta3eef12f38b05d92af8dbc1bb254ccc7565154e7
parentb0c2a2d4ced4c0be25796d273376bcb975697318
Merge branch 'Mario/balance_v2' into 'master'

Merge branch Mario/balance_v2 (Small merge request)

Some small adjustments to the weapon balance (mainly for the arc).

See merge request !281