Revert "Merge branch 'weapons' of https://github.com/GraspinglySilver/cslabfinal into weapons"

This reverts commit 80339f691985b3cb4fd9448ccac381ffa262404c, reversing
changes made to 7190a59424cec8bfa21a4b449a8c4f41f84e73c7.