Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics

2019-10-17 21:58:55 -04:00
parent 4977f598fd 25cacbb28d
commit 0095d89543
29 changed files with 1937 additions and 1416 deletions
--- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
@@ -47,7 +47,7 @@ public abstract class BulletType extends Content{
    /** Status effect applied on hit. */
    public StatusEffect status = StatusEffects.none;
    /** Intensity of applied status effect in terms of duration. */
-    public float statusDuration = 60 * 1f;
+    public float statusDuration = 60 * 10f;
    /** Whether this bullet type collides with tiles. */
    public boolean collidesTiles = true;
    /** Whether this bullet type collides with tiles that are of the same team. */