Merge remote-tracking branch 'origin/master'

2021-03-09 15:52:29 -05:00
parent 429ff738f9 fc28fbc662
commit 8aba480148
3 changed files with 1043 additions and 1043 deletions
@@ -114,3 +114,5 @@ simba-fs
 RedRadiation
 Marko Zajc
 CPX MC
+nilq
+AsgerHB
@@ -353,7 +353,7 @@ public class Turret extends ReloadTurret{
        }

        protected void updateShooting(){
-            if(reload >= reloadTime){
+            if(reload >= reloadTime && !charging){
                BulletType type = peekAmmo();

                shoot(type);