Should be able to choose self-damage during build-mode now
Fixed bugs in self-damage commit