Merge remote-tracking branch 'origin/master'

core/src/mindustry/world/blocks/defense/turrets/Turret.java

@@ -66,6 +66,7 @@ public class Turret extends ReloadTurret{
     public boolean targetAir = true;
     public boolean targetGround = true;
     public boolean targetHealing = false;
+    public boolean playerControllable = true;
 
     //charging
     public float chargeTime = -1f;
@@ -157,6 +158,11 @@ public class Turret extends ReloadTurret{
             unit.tile(this);
         }
 
+        @Override
+        public boolean canControl(){
+            return playerControllable;
+        }
+
         @Override
         public void control(LAccess type, double p1, double p2, double p3, double p4){
             if(type == LAccess.shoot && (unit == null || !unit.isPlayer())){