Fix shit with ending turn while weapons is active
Return correction of minor lint issues
Merge pull request #86 from DoumanAsh/weapon_end_turn_shit

Fix shit with ending turn while weapons is active