Merge branch 'Mario/vaporizer_damage' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 24 Sep 2015 22:31:33 +0000 (22:31 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 24 Sep 2015 22:31:33 +0000 (22:31 +0000)
commit8da45596c76bb645e864b4ec8ff5a3ee13bbf27c
treeb5b56c89c9f7974559565057600ef601d212469b
parenta4594d94df1eb60aca616cccd45df07e561ffa01
parent86c9dc7c3696c329496b06375c1e79fb407401ce
Merge branch 'Mario/vaporizer_damage' into 'master'

Merge branch Mario/vaporizer_damage (S merge request)

Adds a damage option to the vaporizer, fixes support for bonus nades

See merge request !215