Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-03-09 15:52:29 -05:00
parent 429ff738f9 fc28fbc662
commit 8aba480148
3 changed files with 1043 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/bundles/bundle_da.properties
+1040 -1042
View File
File diff suppressed because it is too large Load Diff
core/assets/contributors
+2
View File
@@ -114,3 +114,5 @@ simba-fs
RedRadiation RedRadiation
Marko Zajc Marko Zajc
CPX MC CPX MC
nilq
AsgerHB
core/src/mindustry/world/blocks/defense/turrets/Turret.java
+1 -1
View File
@@ -353,7 +353,7 @@ public class Turret extends ReloadTurret{
} }
protected void updateShooting(){ protected void updateShooting(){
if(reload >= reloadTime){ if(reload >= reloadTime && !charging){
BulletType type = peekAmmo(); BulletType type = peekAmmo();
shoot(type); shoot(type);