* New Guns (hopefully conflict free)
* solving conflicts
* forgot to delete old laser gun png
* Revert "forgot to delete old laser gun png"
This reverts commit 6273aff7a411f24484fdbde0757446ab7ab5f873.
* small corrections
* carbine
* uplink correction
* cog meta.json correction
* replace laser pistol
* svalinn inhands
* getting rid of my old lasergun
* forgot to delete the old lasergun from yml
* Revert "getting rid of my old lasergun"
This reverts commit 763caefd64f1497da5ff6ac5239e3c64b0a892c2.
* Revert "forgot to delete the old lasergun from yml"
This reverts commit 144f4533c44d29e56e5356389d498a437180fa1e.
* base.png and taser fire cost corrections
* last changes for this PR. the c20 and predator sprites. and corrected meta.json
* lowercased
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
e5bf2192cf