WIP: integrate alex's gun branch into develop
this is an MR for testing alex's gun branch and merging it into develop. i had to do a little bit of surgery to clean it up.
Closes #945 (closed).
Edited by kaniini
this is an MR for testing alex's gun branch and merging it into develop. i had to do a little bit of surgery to clean it up.
Closes #945 (closed).