Merge branch 'master' of https://github.com/Anuken/Mindustry

core/src/mindustry/world/blocks/defense/turrets/PayloadAmmoTurret.java

@@ -26,6 +26,7 @@ public class PayloadAmmoTurret extends Turret{
         super(name);
 
         maxAmmo = 3;
+        acceptsPayload = true;
     }
 
     /** Initializes accepted ammo map. Format: [block1, bullet1, block2, bullet2...] */

core/src/mindustry/world/blocks/defense/turrets/Turret.java

@@ -343,7 +343,7 @@ public class Turret extends ReloadTurret{
         public void updateTile(){
             if(!validateTarget()) target = null;
 
-            float warmupTarget = isShooting() && canConsume() ? 1f : 0f;
+            float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f;
             if(linearWarmup){
                 shootWarmup = Mathf.approachDelta(shootWarmup, warmupTarget, shootWarmupSpeed * (warmupTarget > 0 ? efficiency : 1f));
             }else{