Did those mech changes I wanted to do a while ago, reverted gamma armory to old behavior.
Merge branch 'master' of https://github.com/ZomgPonies/Paradise