Merge branch 'TimePath/issues/1415' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:09:55 +0000 (11:09 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 14 Dec 2014 11:09:55 +0000 (11:09 +0000)
commitc6de5cf2639fc8c982b3ed82523b062ab65bacbd
treed28b74e27b530b3dcb41071412241871eb6fca34
parente3c9859a793a28cc209319becdb467b711d761d0
parent1b3630b4f10355738093ffd044caab84e2d5b2b5
Merge branch 'TimePath/issues/1415' into 'master'

Issue 1415

When plasma is ready, increment `AMMO_COUNT` by 1

See merge request !51