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
2023-08-12 10:47:40 -04:00
parent 45d205f0ef 585104a7f7
commit 7999eb4c4d
35 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -4537,7 +4537,7 @@ public class Blocks{
}};
scathe = new ItemTurret("scathe"){{
requirements(Category.turret, with(Items.silicon, 450, Items.graphite, 400, Items.tungsten, 500, Items.carbide, 300));
requirements(Category.turret, with(Items.silicon, 450, Items.graphite, 400, Items.tungsten, 500, Items.oxide, 100, Items.carbide, 200));
ammo(
Items.carbide, new BasicBulletType(0f, 1){{
@@ -4680,7 +4680,7 @@ public class Blocks{
targetUnderBlocks = false;
shake = 6f;
ammoPerShot = 20;
ammoPerShot = 15;
maxAmmo = 30;
shootY = -1;
outlineColor = Pal.darkOutline;