Added Festive variants of weapons to weapon code
-Also re-organized part of it