Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/Blocks.java

@@ -3270,6 +3270,7 @@ public class Blocks{
                     height = 12f;
                     ammoMultiplier = 4;
                     lifetime = 60f;
+                    reloadMultiplier = 0.8f;
                     rangeChange = 16f;
 
                     hitEffect = despawnEffect = Fx.hitBulletColor;
@@ -3319,6 +3320,7 @@ public class Blocks{
             inaccuracy = 2f;
             rotateSpeed = 10f;
             coolant = consumeCoolant(0.1f);
+            coolantMultiplier = 10f;
             researchCostMultiplier = 0.05f;
 
             limitRange(5f);
@@ -3514,6 +3516,7 @@ public class Blocks{
             health = 260;
             shootSound = Sounds.shootArtillerySmall;
             coolant = consumeCoolant(0.1f);
+            coolantMultiplier = 10f;
             limitRange(0f);
         }};
 

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

@@ -183,7 +183,8 @@ public class Turret extends ReloadTurret{
         stats.add(Stat.targetsGround, targetGround);
         if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot);
         if(heatRequirement > 0) stats.add(Stat.input, heatRequirement, StatUnit.heatUnits);
-    }
+        if(maxHeatEfficiency > 0) stats.add(Stat.maxEfficiency, (int)(maxHeatEfficiency * 100f), StatUnit.percent);
+    } 
 
     @Override
     public void setBars(){