Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

core/src/mindustry/content/Fx.java

@@ -369,13 +369,13 @@ public class Fx{
 
         Fill.circle(e.x, e.y, e.fin() * 10);
         Drawf.light(e.x, e.y, e.fin() * 20f, Pal.heal, 0.7f);
-    }),
+    }).followParent(true),
 
     greenLaserChargeSmall = new Effect(40f, 100f, e -> {
         color(Pal.heal);
         stroke(e.fin() * 2f);
         Lines.circle(e.x, e.y, e.fout() * 50f);
-    }),
+    }).followParent(true),
 
     greenCloud = new Effect(80f, e -> {
         color(Pal.heal);

core/src/mindustry/content/UnitTypes.java

@@ -452,6 +452,7 @@ public class UnitTypes implements ContentList{
                 x = y = 0f;
 
                 firstShotDelay = Fx.greenLaserChargeSmall.lifetime - 1f;
+                parentizeEffects = true;
 
                 reload = 155f;
                 recoil = 0f;
@@ -541,6 +542,7 @@ public class UnitTypes implements ContentList{
                 shootStatusDuration = 60f * 2f;
                 shootStatus = StatusEffects.unmoving;
                 firstShotDelay = Fx.greenLaserCharge.lifetime;
+                parentizeEffects = true;
 
                 bullet = new LaserBulletType(){{
                     length = 460f;