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

Conflicts: core/src/mindustry/core/ContentLoader.java core/src/mindustry/world/Block.java
2022-01-27 14:58:44 -05:00
parent 7cdd9edb5f 0b9483cffc
commit e4595b6831
16 changed files with 152 additions and 54 deletions
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -2062,6 +2062,7 @@ public class UnitTypes{
                        weaveMag = 4;
                        weaveScale = 4;
                        lifetime = 60f;
+                        keepVelocity = false;
                        shootEffect = Fx.shootHeal;
                        smokeEffect = Fx.hitLaser;
                        splashDamage = 13f;