More branch merging

2021-10-14 20:58:03 -04:00
parent ad1c75d050
commit 6b59c1cd83
108 changed files with 1018 additions and 380 deletions
--- a/core/src/mindustry/entities/abilities/Ability.java
+++ b/core/src/mindustry/entities/abilities/Ability.java
@@ -7,6 +7,7 @@ import mindustry.gen.*;
 public abstract class Ability implements Cloneable{
    public void update(Unit unit){}
    public void draw(Unit unit){}
+    public void death(Unit unit){}

    public Ability copy(){
        try{