Merge remote-tracking branch 'origin/master'

core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java

@@ -30,15 +30,15 @@ public class ContinuousLaserBulletType extends BulletType{
         hitSize = 4;
         drawSize = 420f;
         lifetime = 16f;
-        keepVelocity = false;
-        pierce = true;
-        hittable = false;
         hitColor = colors[2];
-        collidesTiles = false;
         incendAmount = 1;
         incendSpread = 5;
         incendChance = 0.4f;
         lightColor = Color.orange;
+        keepVelocity = false;
+        collides = false;
+        pierce = true;
+        hittable = false;
         absorbable = false;
     }
 

core/src/mindustry/entities/bullet/LaserBulletType.java

@@ -23,16 +23,17 @@ public class LaserBulletType extends BulletType{
     public LaserBulletType(float damage){
         super(0.01f, damage);
 
-        keepVelocity = false;
         hitEffect = Fx.hitLancer;
         despawnEffect = Fx.none;
         shootEffect = Fx.hitLancer;
         smokeEffect = Fx.none;
-        collides = false;
         hitSize = 4;
         lifetime = 16f;
+        keepVelocity = false;
+        collides = false;
         pierce = true;
         hittable = false;
+        absorbable = false;
     }
 
     public LaserBulletType(){

core/src/mindustry/entities/bullet/ShrapnelBulletType.java

@@ -24,9 +24,11 @@ public class ShrapnelBulletType extends BulletType{
         shootEffect = smokeEffect = Fx.lightningShoot;
         lifetime = 10f;
         despawnEffect = Fx.none;
-        pierce = true;
         keepVelocity = false;
+        collides = false;
+        pierce = true;
         hittable = false;
+        absorbable = false;
     }
 
     @Override