Revert "Cleaned up weapon base"

This reverts commit f74ac04088ae5ffc46a653ec67c86b6e5b748722.