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

core/src/io/anuke/mindustry/resource/Weapon.java

@@ -117,6 +117,10 @@ public class Weapon extends Upgrade{
 		Effects.sound(shootsound, x, y);
 	}
 
+	public float getReload(){
+		return reload;
+	}
+
 	public void shoot(Player p, float x, float y, float angle){
 		shootInternal(p, x, y, angle);