Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/UnitTypes.java

@@ -431,7 +431,7 @@ public class UnitTypes implements ContentList{
 
                 firstShotDelay = Fx.greenLaserChargeSmall.lifetime - 1f;
 
-                reload = 320f;
+                reload = 160f;
                 recoil = 0f;
                 chargeSound = Sounds.lasercharge2;
                 shootSound = Sounds.beam;

core/src/mindustry/entities/comp/WeaponsComp.java

@@ -117,6 +117,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
                 }else{
                     mount.bullet.rotation(weaponRotation + 90);
                     mount.bullet.set(shootX, shootY);
+                    mount.reload = weapon.reload;
                     vel.add(Tmp.v1.trns(rotation + 180f, mount.bullet.type.recoil));
                     if(weapon.shootSound != Sounds.none && !headless){
                         if(mount.sound == null) mount.sound = new SoundLoop(weapon.shootSound, 1f);