diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/vrux.png b/core/assets-raw/sprites/blocks/turrets/turrets/crux.png
similarity index 100%
rename from core/assets-raw/sprites/blocks/turrets/turrets/vrux.png
rename to core/assets-raw/sprites/blocks/turrets/turrets/crux.png
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 9b110c7930..72b4b598f7 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -237,7 +237,7 @@ liquidtank-top
   index: -1
 multiplexer
   rotate: false
-  xy: 228, 32
+  xy: 209, 14
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1042,28 +1042,28 @@ ripples
   index: -1
 rubble-1-0
   rotate: false
-  xy: 466, 184
+  xy: 463, 166
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-1-1
   rotate: false
-  xy: 463, 166
+  xy: 263, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-0
   rotate: false
-  xy: 263, 109
+  xy: 281, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-1
   rotate: false
-  xy: 281, 109
+  xy: 299, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1259,7 +1259,7 @@ powernode
   index: -1
 powernodelarge
   rotate: false
-  xy: 790, 381
+  xy: 790, 363
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1301,7 +1301,7 @@ shieldgenerator
   index: -1
 shieldprojector
   rotate: false
-  xy: 299, 109
+  xy: 317, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1399,42 +1399,42 @@ centrifuge-liquid
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 736, 396
+  xy: 718, 378
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 718, 378
+  xy: 754, 396
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 754, 396
+  xy: 736, 378
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 736, 378
+  xy: 754, 378
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 754, 378
+  xy: 682, 353
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 682, 353
+  xy: 700, 355
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1504,21 +1504,21 @@ itemvoid
   index: -1
 laserdrill
   rotate: false
-  xy: 192, 34
+  xy: 155, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laserdrill-rotator
   rotate: false
-  xy: 155, 16
+  xy: 173, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laserdrill-top
   rotate: false
-  xy: 173, 16
+  xy: 191, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1637,49 +1637,49 @@ plasmadrill-top
   index: -1
 plasticformer
   rotate: false
-  xy: 209, 14
+  xy: 227, 14
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 plasticformer-top
   rotate: false
-  xy: 227, 14
+  xy: 772, 372
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 poweralloysmelter
   rotate: false
-  xy: 772, 372
+  xy: 772, 354
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 poweralloysmelter-top
   rotate: false
-  xy: 772, 354
+  xy: 790, 381
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 powersmelter
   rotate: false
-  xy: 790, 363
+  xy: 790, 345
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 powersmelter-top
   rotate: false
-  xy: 790, 345
+  xy: 466, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 siliconsmelter-top
   rotate: false
-  xy: 790, 345
+  xy: 466, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1749,7 +1749,7 @@ siliconextractor
   index: -1
 siliconsmelter
   rotate: false
-  xy: 317, 109
+  xy: 335, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1908,27 +1908,34 @@ teslaturret-heat
   orig: 10, 10
   offset: 0, 0
   index: -1
-crux-heat
+crux
   rotate: false
   xy: 700, 391
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-crux-panel-left
+crux-heat
   rotate: false
   xy: 700, 373
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-crux-panel-right
+crux-panel-left
   rotate: false
   xy: 718, 396
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+crux-panel-right
+  rotate: false
+  xy: 736, 396
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 duo
   rotate: false
   xy: 746, 328
@@ -1978,13 +1985,6 @@ scorch-shoot
   orig: 10, 10
   offset: 0, 0
   index: -1
-vrux
-  rotate: false
-  xy: 371, 109
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
 wave
   rotate: false
   xy: 467, 148
@@ -2022,21 +2022,21 @@ fuse
   index: -1
 megarepairturret
   rotate: false
-  xy: 191, 16
+  xy: 210, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 missileturret
   rotate: false
-  xy: 210, 32
+  xy: 228, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 swarmer
   rotate: false
-  xy: 210, 32
+  xy: 228, 32
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2071,42 +2071,42 @@ titancannon
   index: -1
 flierfactory
   rotate: false
-  xy: 754, 360
+  xy: 677, 335
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 walkerfactory
   rotate: false
-  xy: 754, 360
+  xy: 677, 335
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 flierfactory-top
   rotate: false
-  xy: 677, 335
+  xy: 677, 317
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 walkerfactory-top
   rotate: false
-  xy: 677, 335
+  xy: 677, 317
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 flierfactory-top-open
   rotate: false
-  xy: 677, 317
+  xy: 799, 467
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 walkerfactory-top-open
   rotate: false
-  xy: 677, 317
+  xy: 799, 467
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2148,14 +2148,14 @@ door
   index: -1
 door-large
   rotate: false
-  xy: 700, 355
+  xy: 718, 360
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-large-open
   rotate: false
-  xy: 718, 360
+  xy: 736, 360
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2176,7 +2176,7 @@ duriumwall
   index: -1
 duriumwall-large
   rotate: false
-  xy: 736, 360
+  xy: 754, 360
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2197,7 +2197,7 @@ steelwall
   index: -1
 steelwall-large
   rotate: false
-  xy: 335, 109
+  xy: 353, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2225,7 +2225,7 @@ titaniumwall
   index: -1
 titaniumwall-large
   rotate: false
-  xy: 353, 109
+  xy: 371, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2675,7 +2675,7 @@ icon-arrow
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 799, 467
+  xy: 817, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2710,7 +2710,7 @@ icon-arrow-up
   index: -1
 icon-back
   rotate: false
-  xy: 817, 469
+  xy: 835, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2822,14 +2822,14 @@ icon-exit
   index: -1
 icon-file
   rotate: false
-  xy: 835, 469
+  xy: 853, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 853, 469
+  xy: 871, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2843,7 +2843,7 @@ icon-file-text
   index: -1
 icon-fill
   rotate: false
-  xy: 871, 469
+  xy: 889, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2857,7 +2857,7 @@ icon-floppy
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 889, 469
+  xy: 907, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2892,7 +2892,7 @@ icon-google-play
   index: -1
 icon-grid
   rotate: false
-  xy: 907, 469
+  xy: 925, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2948,7 +2948,7 @@ icon-items-none
   index: -1
 icon-line
   rotate: false
-  xy: 925, 469
+  xy: 943, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2976,21 +2976,21 @@ icon-load
   index: -1
 icon-load-image
   rotate: false
-  xy: 943, 469
+  xy: 961, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 961, 469
+  xy: 979, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 979, 469
+  xy: 997, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3011,7 +3011,7 @@ icon-menu
   index: -1
 icon-menu-large
   rotate: false
-  xy: 997, 469
+  xy: 630, 266
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3032,7 +3032,7 @@ icon-pause
   index: -1
 icon-pencil
   rotate: false
-  xy: 630, 266
+  xy: 635, 234
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3046,7 +3046,7 @@ icon-pencil-small
   index: -1
 icon-pick
   rotate: false
-  xy: 635, 234
+  xy: 635, 216
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3095,7 +3095,7 @@ icon-quit
   index: -1
 icon-redo
   rotate: false
-  xy: 635, 216
+  xy: 635, 198
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3116,7 +3116,7 @@ icon-rename
   index: -1
 icon-resize
   rotate: false
-  xy: 635, 198
+  xy: 119, 25
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3158,14 +3158,14 @@ icon-save
   index: -1
 icon-save-image
   rotate: false
-  xy: 119, 25
+  xy: 138, 38
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 138, 38
+  xy: 137, 20
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3179,7 +3179,7 @@ icon-settings
   index: -1
 icon-terrain
   rotate: false
-  xy: 137, 20
+  xy: 131, 2
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3214,7 +3214,7 @@ icon-trash
   index: -1
 icon-trash-16
   rotate: false
-  xy: 131, 2
+  xy: 156, 34
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3235,7 +3235,7 @@ icon-tutorial
   index: -1
 icon-undo
   rotate: false
-  xy: 156, 34
+  xy: 174, 34
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3263,7 +3263,7 @@ icon-wiki
   index: -1
 icon-zoom
   rotate: false
-  xy: 174, 34
+  xy: 192, 34
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index d295c96d9f..3bed0ce35e 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/content/AmmoItems.java b/core/src/io/anuke/mindustry/content/AmmoItems.java
new file mode 100644
index 0000000000..1fca459b3e
--- /dev/null
+++ b/core/src/io/anuke/mindustry/content/AmmoItems.java
@@ -0,0 +1,57 @@
+package io.anuke.mindustry.content;
+
+import com.badlogic.gdx.graphics.Color;
+import io.anuke.mindustry.type.Item;
+import io.anuke.mindustry.type.ItemType;
+
+public class AmmoItems {
+    public static final Item
+
+    leadBullet = new Item("lead-bullet", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    compositeFlak = new Item("composite-flak", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    armorPiercingBullet = new Item("armor-piercing-bullet", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    homingBullet = new Item("homing-bullet", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    tracerBullet = new Item("tracer-bullet", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    explosiveShell = new Item("explosive-shell", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    fragShell = new Item("frag-shell", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    thoriumShell = new Item("thorium-shell", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    swarmMissile = new Item("swarm-missile", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    scytheMissile = new Item("scythe-missile", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    incendiaryMortarShell = new Item("incendiary-mortar-shell", Color.GRAY){{
+        type = ItemType.ammo;
+    }},
+
+    surgeMortarShell = new Item("surge-mortar-shell", Color.GRAY){{
+        type = ItemType.ammo;
+    }};
+}
diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java
index 5cd7c59efe..c4f6302682 100644
--- a/core/src/io/anuke/mindustry/content/AmmoTypes.java
+++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java
@@ -13,27 +13,42 @@ public class AmmoTypes {
         smokeEffect = ShootFx.shootSmallSmoke;
     }},
 
-    basicLead = new AmmoType(Items.iron, TurretBullets.basicIron, 5){{
+    basicLead = new AmmoType(Items.lead, TurretBullets.basicIron, 5){{
         shootEffect = ShootFx.shootSmall;
         smokeEffect = ShootFx.shootSmallSmoke;
     }},
 
-    standardLead = new AmmoType(Items.iron, TurretBullets.basicIron, 5){{
+    basicLeadFlak = new AmmoType(Items.lead, TurretBullets.basicIron, 5){{
         shootEffect = ShootFx.shootSmall;
         smokeEffect = ShootFx.shootSmallSmoke;
     }},
 
-    standardArmorPiercing = new AmmoType(Items.steel, TurretBullets.basicSteel, 5){{
+    standardLead = new AmmoType(AmmoItems.leadBullet, TurretBullets.basicIron, 5){{
+        shootEffect = ShootFx.shootSmall;
+        smokeEffect = ShootFx.shootSmallSmoke;
+    }},
+
+    standardLeadFlak = new AmmoType(AmmoItems.leadBullet, TurretBullets.basicIron, 5){{
+        shootEffect = ShootFx.shootSmall;
+        smokeEffect = ShootFx.shootSmallSmoke;
+    }},
+
+    compositeFlak = new AmmoType(AmmoItems.compositeFlak, TurretBullets.basicIron, 5){{
+        shootEffect = ShootFx.shootSmall;
+        smokeEffect = ShootFx.shootSmallSmoke;
+    }},
+
+    standardArmorPiercing = new AmmoType(AmmoItems.armorPiercingBullet, TurretBullets.basicSteel, 5){{
         shootEffect = ShootFx.shootBig;
         smokeEffect = ShootFx.shootBigSmoke;
     }},
 
-    homing = new AmmoType(Items.steel, TurretBullets.basicSteel, 5){{
+    homing = new AmmoType(AmmoItems.homingBullet, TurretBullets.basicSteel, 5){{
         shootEffect = ShootFx.shootBig;
         smokeEffect = ShootFx.shootBigSmoke;
     }},
 
-    tracer = new AmmoType(Items.steel, TurretBullets.basicSteel, 5){{
+    tracer = new AmmoType(AmmoItems.tracerBullet, TurretBullets.basicSteel, 5){{
         shootEffect = ShootFx.shootBig;
         smokeEffect = ShootFx.shootBigSmoke;
     }},
@@ -47,37 +62,37 @@ public class AmmoTypes {
         smokeEffect = ShootFx.shootBigSmoke2;
     }},
 
-    explosiveFragShell = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1){{
+    explosiveFragShell = new AmmoType(AmmoItems.explosiveShell, TurretBullets.basicLeadFragShell, 1){{
         shootEffect = ShootFx.shootBig2;
         smokeEffect = ShootFx.shootBigSmoke2;
     }},
 
-    fragShell = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1){{
+    fragShell = new AmmoType(AmmoItems.fragShell, TurretBullets.basicLeadFragShell, 1){{
         shootEffect = ShootFx.shootBig2;
         smokeEffect = ShootFx.shootBigSmoke2;
     }},
 
-    standardThoriumShell = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1){{
+    standardThoriumShell = new AmmoType(AmmoItems.thoriumShell, TurretBullets.basicLeadFragShell, 1){{
         shootEffect = ShootFx.shootBig2;
         smokeEffect = ShootFx.shootBigSmoke2;
     }},
 
-    swarmMissile = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1){{
+    swarmMissile = new AmmoType(AmmoItems.swarmMissile, TurretBullets.basicLeadFragShell, 1){{
         shootEffect = ShootFx.shootBig2;
         smokeEffect = ShootFx.shootBigSmoke2;
     }},
 
-    scytheMissile = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1){{
+    scytheMissile = new AmmoType(AmmoItems.scytheMissile, TurretBullets.basicLeadFragShell, 1){{
         shootEffect = ShootFx.shootBig2;
         smokeEffect = ShootFx.shootBigSmoke2;
     }},
 
-    incendiaryMortar = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1){{
+    incendiaryMortar = new AmmoType(AmmoItems.incendiaryMortarShell, TurretBullets.basicLeadFragShell, 1){{
         shootEffect = ShootFx.shootBig2;
         smokeEffect = ShootFx.shootBigSmoke2;
     }},
 
-    surgeMortar = new AmmoType(Items.lead, TurretBullets.basicLeadFragShell, 1){{
+    surgeMortar = new AmmoType(AmmoItems.surgeMortarShell, TurretBullets.basicLeadFragShell, 1){{
         shootEffect = ShootFx.shootBig2;
         smokeEffect = ShootFx.shootBigSmoke2;
     }},
diff --git a/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java
index 080e94211a..6a8ad70aa9 100644
--- a/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java
@@ -15,14 +15,14 @@ public class WeaponBlocks{
 	public static Block
 	
 	duo = new DoubleTurret("duo"){{
-		ammoTypes = new AmmoType[]{AmmoTypes.basicIron};
+		ammoTypes = new AmmoType[]{AmmoTypes.basicIron, AmmoTypes.basicLead, AmmoTypes.standardLead, AmmoTypes.tracer};
 		reload = 25f;
 		restitution = 0.03f;
 		ammoUseEffect = ShootFx.shellEjectSmall;
 	}},
 	
 	scatter = new BurstTurret("scatter") {{
-		ammoTypes = new AmmoType[]{AmmoTypes.basicIron};
+		ammoTypes = new AmmoType[]{AmmoTypes.basicLeadFlak, AmmoTypes.standardLeadFlak, AmmoTypes.compositeFlak};
 		ammoPerShot = 1;
 		shots = 3;
 		reload = 60f;
@@ -67,7 +67,7 @@ public class WeaponBlocks{
 	crux = new ItemTurret("crux"){{
 		size = 2;
 		range = 100f;
-		ammoTypes = new AmmoType[]{AmmoTypes.basicLeadShell};
+		ammoTypes = new AmmoType[]{AmmoTypes.basicLeadShell, AmmoTypes.explosiveFragShell, AmmoTypes.fragShell, AmmoTypes.standardThoriumShell};
 		reload = 70f;
 		restitution = 0.03f;
 		ammoEjectBack = 3f;
@@ -104,6 +104,7 @@ public class WeaponBlocks{
 		chargeEffect = ShootFx.lancerLaserCharge;
 		chargeBeginEffect = ShootFx.lancerLaserChargeBegin;
 		heatColor = Color.RED;
+		size = 2;
 	}},
 	
 	arc = new LaserTurret("arc"){{
@@ -121,11 +122,13 @@ public class WeaponBlocks{
 		size = 2;
 	}},
 
-	swarmer = new PowerTurret("missileturret") {{
+	swarmer = new ItemTurret("missileturret") {{
+		ammoTypes = new AmmoType[]{AmmoTypes.basicLeadShell, AmmoTypes.explosiveFragShell, AmmoTypes.fragShell, AmmoTypes.standardThoriumShell};
 		size = 2;
 	}},
 
-	fuse = new PowerTurret("fornaxcannon") {{
+	fuse = new ItemTurret("fuse") {{
+		ammoTypes = new AmmoType[]{AmmoTypes.basicLeadShell, AmmoTypes.explosiveFragShell, AmmoTypes.fragShell, AmmoTypes.standardThoriumShell};
 		size = 3;
 	}},
 
diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java
index e3c1c120dc..b026352f30 100644
--- a/core/src/io/anuke/mindustry/core/ContentLoader.java
+++ b/core/src/io/anuke/mindustry/core/ContentLoader.java
@@ -30,6 +30,7 @@ public class ContentLoader {
 
             //items
             new Items(),
+            new AmmoItems(),
 
             //liquids
             new Liquids(),
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java
index 16be166321..1e43b2a4cf 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java
@@ -119,7 +119,7 @@ public abstract class Turret extends Block{
 	@Override
     public TextureRegion[] getBlockIcon(){
 	    if(blockIcon == null){
-	        blockIcon = new TextureRegion[]{Draw.region("block-" + size), Draw.region(name)};
+	        blockIcon = Draw.hasRegion(name) ? new TextureRegion[]{Draw.region("block-" + size), Draw.region(name)} : new TextureRegion[0];
         }
         return blockIcon;
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java
index 2a6c5b3235..672525396e 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java
@@ -85,8 +85,8 @@ public class Conveyor extends Block{
 				tr2.trns(rotation * 90, -tilesize / 2, pos.x * tilesize / 2);
 
 				Draw.rect(pos.item.region,
-						tile.x * tilesize + tr1.x * pos.y + tr2.x,
-						tile.y * tilesize + tr1.y * pos.y + tr2.y, itemSize, itemSize);
+						(int)(tile.x * tilesize + tr1.x * pos.y + tr2.x),
+						(int)(tile.y * tilesize + tr1.y * pos.y + tr2.y), itemSize, itemSize);
 			}
 
 		}catch (IndexOutOfBoundsException e){