Ported smoke and tought

Sorta fixed the gun bug, although bullets are still not working