Merge

core/src/mindustry/content/Blocks.java

@@ -622,10 +622,6 @@ public class Blocks implements ContentList{
             );
             hasPower = true;
             craftTime = 35f;
-            spinnerLength = 1.5f;
-            spinnerRadius = 3.5f;
-            spinnerThickness = 1.5f;
-            spinnerSpeed = 3f;
             size = 2;
 
             consumes.power(1f);
@@ -881,18 +877,21 @@ public class Blocks implements ContentList{
             requirements(Category.distribution, ItemStack.with(Items.copper, 1), true);
             health = 45;
             speed = 0.03f;
+            displayedSpeed = 4.2f;
         }};
 
         titaniumConveyor = new Conveyor("titanium-conveyor"){{
             requirements(Category.distribution, ItemStack.with(Items.copper, 1, Items.lead, 1, Items.titanium, 1));
             health = 65;
             speed = 0.08f;
+            displayedSpeed = 10f;
         }};
 
         armoredConveyor = new ArmoredConveyor("armored-conveyor"){{
             requirements(Category.distribution, ItemStack.with(Items.plastanium, 1, Items.thorium, 1, Items.metaglass, 1));
             health = 180;
             speed = 0.08f;
+            displayedSpeed = 10f;
         }};
 
         junction = new Junction("junction"){{

core/src/mindustry/content/UnitTypes.java

@@ -1,10 +1,8 @@
 package mindustry.content;
 
 import arc.struct.*;
-import mindustry.ctype.ContentList;
+import mindustry.ctype.*;
 import mindustry.entities.bullet.*;
-import mindustry.entities.type.*;
-import mindustry.entities.type.Bullet;
 import mindustry.entities.type.base.*;
 import mindustry.gen.*;
 import mindustry.type.*;
@@ -100,23 +98,14 @@ public class UnitTypes implements ContentList{
                 reload = 12f;
                 ejectEffect = Fx.none;
                 shootSound = Sounds.explosion;
-                bullet = new BombBulletType(2f, 3f, "clear"){
-                    {
-                        hitEffect = Fx.pulverize;
-                        lifetime = 30f;
-                        speed = 1.1f;
-                        splashDamageRadius = 55f;
-                        splashDamage = 30f;
-                    }
-
-                    @Override
-                    public void init(Bullet b){
-                        if(b.getOwner() instanceof Unit){
-                            ((Unit)b.getOwner()).kill();
-                        }
-                        b.time(b.lifetime());
-                    }
-                };
+                bullet = new BombBulletType(2f, 3f, "clear"){{
+                    hitEffect = Fx.pulverize;
+                    lifetime = 2f;
+                    speed = 1.1f;
+                    splashDamageRadius = 55f;
+                    splashDamage = 30f;
+                    killShooter = true;
+                }};
             }};
         }};