Merge remote-tracking branch 'origin/master'

core/assets/shaders/cryofluid.frag

@@ -14,8 +14,6 @@ uniform float u_time;
 
 varying vec2 v_texCoords;
 
-const float shakeScl = 20.0;
-
 void main(){
     vec2 c = v_texCoords.xy;
     vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);

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

@@ -67,7 +67,7 @@ public class LaserTurret extends PowerTurret{
                 Liquid liquid = liquids.current();
                 float maxUsed = consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount;
 
-                float used = (cheating() ? maxUsed * Time.delta : Math.min(liquids.get(liquid), maxUsed * Time.delta));
+                float used = (cheating() ? maxUsed : Math.min(liquids.get(liquid), maxUsed)) * Time.delta;
                 reload -= used * liquid.heatCapacity * coolantMultiplier;
                 liquids.remove(liquid, used);