OnShipFiring(ship) added
Merge branch 'onShipFiring'