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

2021-08-19 23:52:06 -04:00
parent efb4a643e4 3a3622bb58
commit 946bba63d0
32 changed files with 166 additions and 121 deletions
--- a/core/src/mindustry/content/StatusEffects.java
+++ b/core/src/mindustry/content/StatusEffects.java
@@ -164,7 +164,7 @@ public class StatusEffects implements ContentList{
        }};

        boss = new StatusEffect("boss"){{
-            color = Team.sharded.color;
+            color = Team.crux.color;
            permanent = true;
            damageMultiplier = 1.3f;
            healthMultiplier = 1.5f;