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

Conflicts: core/src/mindustry/type/UnitType.java
2021-10-01 09:41:33 -04:00
parent 5f3cef251b b265ddac03
commit 10b8a6e4a5
20 changed files with 236 additions and 58 deletions
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1885,6 +1885,7 @@ public class Blocks implements ContentList{
            recoilAmount = 3f;
            shootShake = 1f;
            burstSpacing = 3f;
+            spread = 0f;
            shots = 4;
            ammoUseEffect = Fx.casing2;
            health = 240 * size * size;