Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -2494,7 +2494,7 @@ unit.risso.description = Fires a barrage of missiles and bullets at enemy target
 unit.minke.description = Fires shells and standard bullets at enemy ground targets.
 unit.bryde.description = Fires long-range artillery shells and missiles at enemy targets.
 unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemy targets.
-unit.omura.description = Fires a long-range piercing railgun bolt at enemy targets. Constructs flare units.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemy targets.
 unit.alpha.description = Defends the Shard core from enemies. Builds structures.
 unit.beta.description = Defends the Foundation core from enemies. Builds structures.
 unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.

core/src/mindustry/content/Blocks.java

@@ -4220,6 +4220,7 @@ public class Blocks{
             envEnabled |= Env.space;
 
             coolantMultiplier = 0.4f;
+            liquidCapacity = 60f;
             scaledHealth = 150;
 
             coolant = consumeCoolant(1f);
@@ -4275,6 +4276,7 @@ public class Blocks{
             reload = 7f;
             recoilTime = reload * 2f;
             coolantMultiplier = 0.5f;
+            liquidCapacity = 120f;
             ammoUseEffect = Fx.casing3;
             range = 260f;
             inaccuracy = 3f;
@@ -4322,6 +4324,7 @@ public class Blocks{
             }};
 
             scaledHealth = 200;
+            liquidCapacity = 60f;
             coolant = consumeCoolant(0.5f);
             consumePower(17f);
         }};

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

@@ -155,6 +155,7 @@ public class Turret extends ReloadTurret{
 
     public Turret(String name){
         super(name);
+        liquidCapacity = 20f;
         outlinedIcon = 1;
         drawLiquidLight = false;
         sync = true;