Fix shit with ending turn while weapons is active

Not sure if anyone already fixed that, but i do not see on latest master