diff --git a/build.gradle b/build.gradle
index 4549a1c0ac..8fb24f284b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,10 @@ allprojects{
         gdxVersion = '1.9.9'
         roboVMVersion = '2.3.0'
         arcHash = null
+        
+        debugged = {
+            return new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null
+        }
 
         localArc = {
             return (System.properties["release"] == null || System.properties["release"] == "false") && new File(projectDir.parent, '../Arc').exists()
@@ -117,7 +121,7 @@ project(":desktop"){
         compile project(":core")
         compile project(":net")
         
-        if(new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null) compile project(":debug")
+        if(debugged()) compile project(":debug")
 
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
@@ -194,7 +198,7 @@ project(":core"){
 
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
-        if(localArc()) compile arcModule("extensions:recorder")
+        if(localArc() && debugged()) compile arcModule("extensions:recorder")
 
         compileOnly project(":annotations")
         annotationProcessor project(":annotations")
diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/duo.png
index d520c6e4f5..40d21d0fb0 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/duo.png and b/core/assets-raw/sprites/blocks/turrets/duo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png
index 32218df362..c03bad9cba 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/fuse.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/turrets/duo.png b/core/assets-raw/sprites_replacement/blocks/turrets/duo.png
index 128b9c684b..efcdb60832 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/turrets/duo.png and b/core/assets-raw/sprites_replacement/blocks/turrets/duo.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/turrets/lancer.png b/core/assets-raw/sprites_replacement/blocks/turrets/lancer.png
deleted file mode 100644
index 955b6b5f6a..0000000000
Binary files a/core/assets-raw/sprites_replacement/blocks/turrets/lancer.png and /dev/null differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index cc6f8e3700..ea8d3926a0 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -469,7 +469,7 @@ item.metaglass.description = A super-tough glass compound. Extensively used for
 item.scrap.name = Scrap
 item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
 liquid.water.name = Water
-liquid.lava.name = Lava
+liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
 mech.alpha-mech.name = Alpha
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index d198280c80..3218083b9f 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -48,7 +48,7 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1421, 363
+  xy: 1421, 329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -216,140 +216,140 @@ conveyor-4-3
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1523, 170
+  xy: 1557, 204
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1557, 204
+  xy: 1557, 170
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1557, 170
+  xy: 1489, 136
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1489, 136
+  xy: 1523, 136
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1523, 136
+  xy: 1557, 136
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1557, 136
+  xy: 1591, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1591, 499
+  xy: 1591, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1591, 465
+  xy: 1591, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1591, 431
+  xy: 1591, 397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1591, 397
+  xy: 1591, 363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1591, 363
+  xy: 1591, 329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1591, 329
+  xy: 1591, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1591, 295
+  xy: 1591, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1591, 261
+  xy: 1591, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1591, 227
+  xy: 1591, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1591, 193
+  xy: 1591, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1591, 159
+  xy: 1591, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1591, 125
+  xy: 1625, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1625, 485
+  xy: 1659, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1659, 485
+  xy: 1625, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -370,14 +370,7 @@ junction
   index: -1
 mass-driver
   rotate: false
-  xy: 1261, 1494
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-mass-driver-turret
-  rotate: false
-  xy: 1457, 1494
+  xy: 1359, 1494
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -419,14 +412,14 @@ phase-conveyor-end
   index: -1
 router
   rotate: false
-  xy: 1847, 510
+  xy: 1881, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1429, 57
+  xy: 1429, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1084,84 +1077,84 @@ rocks-large
   index: -1
 rocks1
   rotate: false
-  xy: 1745, 510
+  xy: 1779, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 1779, 510
+  xy: 1813, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water
   rotate: false
-  xy: 1387, 431
+  xy: 1387, 397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 1983, 510
+  xy: 1387, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 1387, 499
+  xy: 1387, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 1387, 465
+  xy: 1387, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 1387, 397
+  xy: 1387, 363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 1387, 363
+  xy: 1387, 329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 1387, 329
+  xy: 1387, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 1421, 227
+  xy: 1421, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1421, 193
+  xy: 1421, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1421, 159
+  xy: 1421, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1175,14 +1168,14 @@ snowrocks-large
   index: -1
 snowrocks1
   rotate: false
-  xy: 1421, 125
+  xy: 1395, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 1395, 91
+  xy: 1395, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1210,14 +1203,14 @@ spore-cluster3
   index: -1
 stained-boulder1
   rotate: false
-  xy: 1455, 413
+  xy: 1455, 379
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-boulder2
   rotate: false
-  xy: 1455, 379
+  xy: 1455, 345
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1238,14 +1231,14 @@ stained-rocks-red-large
   index: -1
 stained-rocks-red1
   rotate: false
-  xy: 1455, 277
+  xy: 1455, 243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-red2
   rotate: false
-  xy: 1455, 243
+  xy: 1455, 209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1259,91 +1252,91 @@ stained-rocks-yellow-large
   index: -1
 stained-rocks-yellow1
   rotate: false
-  xy: 1455, 209
+  xy: 1455, 175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-yellow2
   rotate: false
-  xy: 1455, 175
+  xy: 1455, 141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks1
   rotate: false
-  xy: 1455, 345
+  xy: 1455, 311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks2
   rotate: false
-  xy: 1455, 311
+  xy: 1455, 277
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red1
   rotate: false
-  xy: 1523, 510
+  xy: 1489, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red2
   rotate: false
-  xy: 1489, 442
+  xy: 1523, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red3
   rotate: false
-  xy: 1523, 476
+  xy: 1557, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow1
   rotate: false
-  xy: 1557, 510
+  xy: 1489, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow2
   rotate: false
-  xy: 1489, 408
+  xy: 1523, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow3
   rotate: false
-  xy: 1523, 442
+  xy: 1557, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone1
   rotate: false
-  xy: 1455, 141
+  xy: 1489, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone2
   rotate: false
-  xy: 1489, 510
+  xy: 1489, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone3
   rotate: false
-  xy: 1489, 476
+  xy: 1523, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1357,77 +1350,77 @@ stainedrocks-large
   index: -1
 stainedrocks1
   rotate: false
-  xy: 1557, 476
+  xy: 1489, 374
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stainedrocks2
   rotate: false
-  xy: 1489, 374
+  xy: 1523, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1523, 408
+  xy: 1557, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 1489, 306
+  xy: 1523, 340
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 1523, 306
+  xy: 1557, 340
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1557, 340
+  xy: 1489, 238
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1489, 238
+  xy: 1523, 272
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1489, 170
+  xy: 1523, 204
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1523, 204
+  xy: 1557, 238
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1557, 238
+  xy: 1523, 170
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 1625, 315
+  xy: 1659, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1539,7 +1532,7 @@ rubble-4-1
   index: -1
 spawn
   rotate: false
-  xy: 1429, 23
+  xy: 1455, 515
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2015,14 +2008,14 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1915, 510
+  xy: 1949, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1395, 57
+  xy: 1395, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2337,7 +2330,7 @@ separator
   index: -1
 separator-liquid
   rotate: false
-  xy: 1421, 397
+  xy: 1421, 363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2351,7 +2344,7 @@ silicon-smelter
   index: -1
 smelter
   rotate: false
-  xy: 1421, 261
+  xy: 1421, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2400,14 +2393,14 @@ launch-pad
   index: -1
 sortedunloader
   rotate: false
-  xy: 1429, 91
+  xy: 1429, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1625, 349
+  xy: 1659, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2419,13 +2412,6 @@ vault
   orig: 96, 96
   offset: 0, 0
   index: -1
-arc
-  rotate: false
-  xy: 2013, 1570
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 arc-heat
   rotate: false
   xy: 2013, 1536
@@ -2461,34 +2447,6 @@ block-4
   orig: 128, 128
   offset: 0, 0
   index: -1
-cyclone
-  rotate: false
-  xy: 291, 12
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-duo
-  rotate: false
-  xy: 1081, 404
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-fuse
-  rotate: false
-  xy: 771, 1462
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-hail
-  rotate: false
-  xy: 1115, 498
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 hail-heat
   rotate: false
   xy: 581, 896
@@ -2496,13 +2454,6 @@ hail-heat
   orig: 40, 40
   offset: 0, 0
   index: -1
-lancer
-  rotate: false
-  xy: 775, 1004
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 lancer-heat
   rotate: false
   xy: 581, 938
@@ -2510,13 +2461,6 @@ lancer-heat
   orig: 64, 64
   offset: 0, 0
   index: -1
-meltdown
-  rotate: false
-  xy: 1826, 1820
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
 meltdown-heat
   rotate: false
   xy: 509, 766
@@ -2524,13 +2468,6 @@ meltdown-heat
   orig: 128, 128
   offset: 0, 0
   index: -1
-ripple
-  rotate: false
-  xy: 389, 12
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
 ripple-heat
   rotate: false
   xy: 583, 440
@@ -2538,13 +2475,6 @@ ripple-heat
   orig: 96, 96
   offset: 0, 0
   index: -1
-salvo
-  rotate: false
-  xy: 879, 443
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 salvo-heat
   rotate: false
   xy: 879, 377
@@ -2566,27 +2496,6 @@ salvo-panel-right
   orig: 64, 64
   offset: 0, 0
   index: -1
-spectre
-  rotate: false
-  xy: 1826, 1690
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
-swarmer
-  rotate: false
-  xy: 1591, 1198
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-wave
-  rotate: false
-  xy: 1909, 1132
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 wave-liquid
   rotate: false
   xy: 1051, 1066
@@ -2707,13 +2616,6 @@ phantom-factory-top-open
   offset: 0, 0
   index: -1
 repair-point
-  rotate: false
-  xy: 1983, 612
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-repair-point-turret
   rotate: false
   xy: 1949, 544
   size: 32, 32
@@ -2890,42 +2792,42 @@ scrap-wall-large4
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1387, 295
+  xy: 1387, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1387, 261
+  xy: 1387, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1387, 227
+  xy: 1387, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1387, 193
+  xy: 1387, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1387, 193
+  xy: 1387, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1489, 340
+  xy: 1523, 374
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2939,7 +2841,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1557, 306
+  xy: 1489, 204
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2960,7 +2862,7 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1625, 451
+  xy: 1625, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3002,7 +2904,7 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 2039, 490
+  xy: 1891, 190
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -3072,7 +2974,7 @@ laserfull
   index: -1
 minelaser
   rotate: false
-  xy: 2043, 1084
+  xy: 2043, 484
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -3128,14 +3030,14 @@ scorch3
   index: -1
 scorch4
   rotate: false
-  xy: 1625, 105
+  xy: 1723, 408
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 1723, 408
+  xy: 1753, 408
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
@@ -3156,21 +3058,21 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 1421, 329
+  xy: 1421, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 479, 124
+  xy: 2043, 434
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1659, 451
+  xy: 1625, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3224,6 +3126,13 @@ alpha-dart-mech-pad-icon-small
   orig: 24, 24
   offset: 0, 0
   index: -1
+arc
+  rotate: false
+  xy: 2013, 1570
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 arc-icon-full
   rotate: false
   xy: 2013, 1502
@@ -3275,7 +3184,7 @@ battery-large-icon-medium
   index: -1
 battery-large-icon-small
   rotate: false
-  xy: 1693, 288
+  xy: 1659, 215
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3303,7 +3212,7 @@ biomattercompressor-icon-medium
   index: -1
 biomattercompressor-icon-small
   rotate: false
-  xy: 1753, 484
+  xy: 1693, 288
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3331,7 +3240,7 @@ blast-drill-icon-medium
   index: -1
 blast-drill-icon-small
   rotate: false
-  xy: 1723, 319
+  xy: 1783, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3352,7 +3261,7 @@ blast-mixer-icon-medium
   index: -1
 blast-mixer-icon-small
   rotate: false
-  xy: 1047, 4
+  xy: 1723, 319
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3366,7 +3275,7 @@ bridge-conduit-icon-large
   index: -1
 bridge-conduit-icon-small
   rotate: false
-  xy: 1753, 458
+  xy: 1752, 382
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3380,7 +3289,7 @@ bridge-conveyor-icon-large
   index: -1
 bridge-conveyor-icon-small
   rotate: false
-  xy: 1779, 484
+  xy: 1047, 4
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3394,7 +3303,7 @@ char-icon-large
   index: -1
 char-icon-small
   rotate: false
-  xy: 1779, 458
+  xy: 1809, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3408,7 +3317,7 @@ cliffs-icon-large
   index: -1
 cliffs-icon-small
   rotate: false
-  xy: 1805, 484
+  xy: 1752, 356
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3422,7 +3331,7 @@ combustion-generator-icon-large
   index: -1
 combustion-generator-icon-small
   rotate: false
-  xy: 1779, 432
+  xy: 1783, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3443,7 +3352,7 @@ conduit-icon-large
   index: -1
 conduit-icon-small
   rotate: false
-  xy: 1805, 458
+  xy: 1809, 458
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3464,7 +3373,7 @@ container-icon-medium
   index: -1
 container-icon-small
   rotate: false
-  xy: 1831, 484
+  xy: 1835, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3478,7 +3387,7 @@ conveyor-icon-large
   index: -1
 conveyor-icon-small
   rotate: false
-  xy: 1805, 432
+  xy: 1809, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3492,7 +3401,7 @@ copper-wall-icon-large
   index: -1
 copper-wall-icon-small
   rotate: false
-  xy: 1831, 458
+  xy: 1835, 458
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3513,7 +3422,7 @@ copper-wall-large-icon-medium
   index: -1
 copper-wall-large-icon-small
   rotate: false
-  xy: 1857, 484
+  xy: 1861, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3534,7 +3443,7 @@ core-foundation-icon-medium
   index: -1
 core-foundation-icon-small
   rotate: false
-  xy: 1831, 432
+  xy: 1835, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3555,7 +3464,7 @@ core-nucleus-icon-medium
   index: -1
 core-nucleus-icon-small
   rotate: false
-  xy: 1857, 458
+  xy: 1861, 458
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3576,7 +3485,7 @@ core-shard-icon-medium
   index: -1
 core-shard-icon-small
   rotate: false
-  xy: 1883, 484
+  xy: 1887, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3590,7 +3499,7 @@ craters-icon-large
   index: -1
 craters-icon-small
   rotate: false
-  xy: 1857, 432
+  xy: 1861, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3618,7 +3527,7 @@ cryofluidmixer-icon-medium
   index: -1
 cryofluidmixer-icon-small
   rotate: false
-  xy: 1883, 458
+  xy: 1887, 458
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3646,11 +3555,18 @@ cultivator-icon-medium
   index: -1
 cultivator-icon-small
   rotate: false
-  xy: 1909, 484
+  xy: 1913, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+cyclone
+  rotate: false
+  xy: 291, 12
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 cyclone-icon-full
   rotate: false
   xy: 583, 538
@@ -3674,7 +3590,7 @@ cyclone-icon-medium
   index: -1
 cyclone-icon-small
   rotate: false
-  xy: 1883, 432
+  xy: 1887, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3702,7 +3618,7 @@ dagger-factory-icon-medium
   index: -1
 dagger-factory-icon-small
   rotate: false
-  xy: 1909, 458
+  xy: 1913, 458
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3723,7 +3639,7 @@ deepwater-icon-large
   index: -1
 deepwater-icon-small
   rotate: false
-  xy: 1935, 484
+  xy: 1939, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3744,7 +3660,7 @@ delta-mech-pad-icon-medium
   index: -1
 delta-mech-pad-icon-small
   rotate: false
-  xy: 1909, 432
+  xy: 1913, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3765,7 +3681,7 @@ differential-generator-icon-medium
   index: -1
 differential-generator-icon-small
   rotate: false
-  xy: 1935, 458
+  xy: 1939, 458
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3786,7 +3702,7 @@ distributor-icon-medium
   index: -1
 distributor-icon-small
   rotate: false
-  xy: 1961, 484
+  xy: 1965, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3800,7 +3716,7 @@ door-icon-large
   index: -1
 door-icon-small
   rotate: false
-  xy: 1935, 432
+  xy: 1939, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3821,7 +3737,7 @@ door-large-icon-medium
   index: -1
 door-large-icon-small
   rotate: false
-  xy: 1961, 458
+  xy: 1965, 458
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3835,11 +3751,18 @@ dunerocks-icon-large
   index: -1
 dunerocks-icon-small
   rotate: false
-  xy: 1987, 484
+  xy: 1991, 484
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+duo
+  rotate: false
+  xy: 1081, 404
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 duo-icon-full
   rotate: false
   xy: 1047, 336
@@ -3856,7 +3779,7 @@ duo-icon-large
   index: -1
 duo-icon-small
   rotate: false
-  xy: 1961, 432
+  xy: 2017, 508
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3877,7 +3800,7 @@ force-projector-icon-medium
   index: -1
 force-projector-icon-small
   rotate: false
-  xy: 1987, 458
+  xy: 1965, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3905,11 +3828,18 @@ fortress-factory-icon-medium
   index: -1
 fortress-factory-icon-small
   rotate: false
-  xy: 1987, 432
+  xy: 1991, 458
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+fuse
+  rotate: false
+  xy: 771, 1462
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 fuse-icon-full
   rotate: false
   xy: 747, 1364
@@ -3933,7 +3863,7 @@ fuse-icon-medium
   index: -1
 fuse-icon-small
   rotate: false
-  xy: 2017, 508
+  xy: 2017, 482
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3961,7 +3891,7 @@ ghoul-factory-icon-medium
   index: -1
 ghoul-factory-icon-small
   rotate: false
-  xy: 1753, 406
+  xy: 1991, 432
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3982,7 +3912,7 @@ glaive-ship-pad-icon-medium
   index: -1
 glaive-ship-pad-icon-small
   rotate: false
-  xy: 1779, 406
+  xy: 2017, 456
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4003,11 +3933,18 @@ graphite-press-icon-medium
   index: -1
 graphite-press-icon-small
   rotate: false
-  xy: 1805, 406
+  xy: 1783, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+hail
+  rotate: false
+  xy: 1115, 498
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 hail-icon-full
   rotate: false
   xy: 1115, 464
@@ -4024,7 +3961,7 @@ hail-icon-large
   index: -1
 hail-icon-small
   rotate: false
-  xy: 1831, 406
+  xy: 1809, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4045,7 +3982,7 @@ holostone-icon-large
   index: -1
 holostone-icon-small
   rotate: false
-  xy: 1857, 406
+  xy: 1835, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4059,7 +3996,7 @@ hotrock-icon-large
   index: -1
 hotrock-icon-small
   rotate: false
-  xy: 1883, 406
+  xy: 1861, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4073,7 +4010,7 @@ ice-icon-large
   index: -1
 ice-icon-small
   rotate: false
-  xy: 1909, 406
+  xy: 1887, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4094,7 +4031,7 @@ ice-snow-icon-large
   index: -1
 ice-snow-icon-small
   rotate: false
-  xy: 1935, 406
+  xy: 1913, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4108,7 +4045,7 @@ icerocks-icon-large
   index: -1
 icerocks-icon-small
   rotate: false
-  xy: 1961, 406
+  xy: 1939, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4122,7 +4059,7 @@ ignarock-icon-large
   index: -1
 ignarock-icon-small
   rotate: false
-  xy: 1778, 380
+  xy: 2017, 404
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4150,7 +4087,7 @@ impact-reactor-icon-medium
   index: -1
 impact-reactor-icon-small
   rotate: false
-  xy: 1778, 354
+  xy: 1778, 380
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4178,7 +4115,7 @@ item-source-icon-large
   index: -1
 item-source-icon-small
   rotate: false
-  xy: 1804, 354
+  xy: 1830, 380
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4192,7 +4129,7 @@ item-void-icon-large
   index: -1
 item-void-icon-small
   rotate: false
-  xy: 1830, 380
+  xy: 1463, 73
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4213,7 +4150,7 @@ javelin-ship-pad-icon-medium
   index: -1
 javelin-ship-pad-icon-small
   rotate: false
-  xy: 2013, 440
+  xy: 1489, 110
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4227,7 +4164,7 @@ junction-icon-large
   index: -1
 junction-icon-small
   rotate: false
-  xy: 1830, 354
+  xy: 1856, 380
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4248,11 +4185,18 @@ kiln-icon-medium
   index: -1
 kiln-icon-small
   rotate: false
-  xy: 1856, 380
+  xy: 1463, 47
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+lancer
+  rotate: false
+  xy: 775, 1004
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 lancer-icon-full
   rotate: false
   xy: 647, 938
@@ -4276,7 +4220,7 @@ lancer-icon-medium
   index: -1
 lancer-icon-small
   rotate: false
-  xy: 2013, 414
+  xy: 1489, 84
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4304,7 +4248,7 @@ laser-drill-icon-medium
   index: -1
 laser-drill-icon-small
   rotate: false
-  xy: 1856, 354
+  xy: 1515, 110
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4339,7 +4283,7 @@ liquid-junction-icon-large
   index: -1
 liquid-junction-icon-small
   rotate: false
-  xy: 1882, 354
+  xy: 1489, 58
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4360,7 +4304,7 @@ liquid-router-icon-large
   index: -1
 liquid-router-icon-small
   rotate: false
-  xy: 1908, 380
+  xy: 1515, 84
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4374,7 +4318,7 @@ liquid-source-icon-large
   index: -1
 liquid-source-icon-small
   rotate: false
-  xy: 1908, 354
+  xy: 1541, 110
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4402,7 +4346,7 @@ liquid-tank-icon-medium
   index: -1
 liquid-tank-icon-small
   rotate: false
-  xy: 1934, 380
+  xy: 1908, 380
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4416,14 +4360,21 @@ magmarock-icon-large
   index: -1
 magmarock-icon-small
   rotate: false
-  xy: 1934, 354
+  xy: 1515, 58
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+mass-driver
+  rotate: false
+  xy: 1261, 1494
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 mass-driver-icon-full
   rotate: false
-  xy: 1359, 1494
+  xy: 1457, 1494
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -4444,7 +4395,7 @@ mass-driver-icon-medium
   index: -1
 mass-driver-icon-small
   rotate: false
-  xy: 1960, 380
+  xy: 1541, 84
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4528,7 +4479,7 @@ mechanical-drill-icon-medium
   index: -1
 mechanical-drill-icon-small
   rotate: false
-  xy: 1960, 354
+  xy: 1934, 380
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4542,11 +4493,18 @@ mechanical-pump-icon-large
   index: -1
 mechanical-pump-icon-small
   rotate: false
-  xy: 1986, 380
+  xy: 1541, 58
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+meltdown
+  rotate: false
+  xy: 1826, 1820
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
 meltdown-icon-full
   rotate: false
   xy: 509, 636
@@ -4570,7 +4528,7 @@ meltdown-icon-medium
   index: -1
 meltdown-icon-small
   rotate: false
-  xy: 1986, 354
+  xy: 1960, 380
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4584,7 +4542,7 @@ melter-icon-large
   index: -1
 melter-icon-small
   rotate: false
-  xy: 787, 1
+  xy: 1986, 380
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4605,7 +4563,7 @@ mend-projector-icon-medium
   index: -1
 mend-projector-icon-small
   rotate: false
-  xy: 813, 1
+  xy: 1778, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4619,7 +4577,7 @@ metal-floor-2-icon-large
   index: -1
 metal-floor-2-icon-small
   rotate: false
-  xy: 839, 1
+  xy: 1804, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4633,7 +4591,7 @@ metal-floor-3-icon-large
   index: -1
 metal-floor-3-icon-small
   rotate: false
-  xy: 865, 1
+  xy: 1830, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4647,7 +4605,7 @@ metal-floor-5-icon-large
   index: -1
 metal-floor-5-icon-small
   rotate: false
-  xy: 891, 1
+  xy: 1856, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4661,7 +4619,7 @@ metal-floor-damaged-icon-large
   index: -1
 metal-floor-damaged-icon-small
   rotate: false
-  xy: 917, 1
+  xy: 1882, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4682,7 +4640,7 @@ metal-floor-icon-large
   index: -1
 metal-floor-icon-small
   rotate: false
-  xy: 943, 1
+  xy: 1908, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4703,7 +4661,7 @@ multi-press-icon-medium
   index: -1
 multi-press-icon-small
   rotate: false
-  xy: 553, 446
+  xy: 1934, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4731,7 +4689,7 @@ oil-extractor-icon-medium
   index: -1
 oil-extractor-icon-small
   rotate: false
-  xy: 1463, 115
+  xy: 1960, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4752,7 +4710,7 @@ omega-mech-pad-icon-medium
   index: -1
 omega-mech-pad-icon-small
   rotate: false
-  xy: 1463, 89
+  xy: 1986, 354
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4766,7 +4724,7 @@ ore-coal-holostone-icon-large
   index: -1
 ore-coal-holostone-icon-small
   rotate: false
-  xy: 1489, 110
+  xy: 1463, 21
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4815,7 +4773,7 @@ ore-coal-sand-icon-large
   index: -1
 ore-coal-sand-icon-small
   rotate: false
-  xy: 1463, 63
+  xy: 1489, 32
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4864,7 +4822,7 @@ ore-coal-stained-stone-icon-large
   index: -1
 ore-coal-stained-stone-icon-small
   rotate: false
-  xy: 1515, 110
+  xy: 1515, 32
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4878,7 +4836,7 @@ ore-coal-stained-stone-red-icon-large
   index: -1
 ore-coal-stained-stone-red-icon-small
   rotate: false
-  xy: 1489, 84
+  xy: 1541, 32
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4962,7 +4920,7 @@ ore-coal-stone-icon-large
   index: -1
 ore-coal-stone-icon-small
   rotate: false
-  xy: 1463, 37
+  xy: 2012, 378
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5011,7 +4969,7 @@ ore-copper-holostone-icon-large
   index: -1
 ore-copper-holostone-icon-small
   rotate: false
-  xy: 1541, 110
+  xy: 2012, 352
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5060,7 +5018,7 @@ ore-copper-sand-icon-large
   index: -1
 ore-copper-sand-icon-small
   rotate: false
-  xy: 1489, 58
+  xy: 787, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5109,7 +5067,7 @@ ore-copper-stained-stone-icon-large
   index: -1
 ore-copper-stained-stone-icon-small
   rotate: false
-  xy: 1515, 84
+  xy: 813, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5123,7 +5081,7 @@ ore-copper-stained-stone-red-icon-large
   index: -1
 ore-copper-stained-stone-red-icon-small
   rotate: false
-  xy: 1515, 58
+  xy: 839, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5207,7 +5165,7 @@ ore-copper-stone-icon-large
   index: -1
 ore-copper-stone-icon-small
   rotate: false
-  xy: 1541, 84
+  xy: 865, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5256,7 +5214,7 @@ ore-lead-holostone-icon-large
   index: -1
 ore-lead-holostone-icon-small
   rotate: false
-  xy: 1541, 58
+  xy: 891, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5305,7 +5263,7 @@ ore-lead-sand-icon-large
   index: -1
 ore-lead-sand-icon-small
   rotate: false
-  xy: 1489, 32
+  xy: 917, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5354,7 +5312,7 @@ ore-lead-stained-stone-icon-large
   index: -1
 ore-lead-stained-stone-icon-small
   rotate: false
-  xy: 1515, 32
+  xy: 943, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5368,7 +5326,7 @@ ore-lead-stained-stone-red-icon-large
   index: -1
 ore-lead-stained-stone-red-icon-small
   rotate: false
-  xy: 1541, 32
+  xy: 553, 446
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5452,7 +5410,7 @@ ore-lead-stone-icon-large
   index: -1
 ore-lead-stone-icon-small
   rotate: false
-  xy: 1463, 11
+  xy: 1625, 115
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5501,7 +5459,7 @@ ore-scrap-holostone-icon-large
   index: -1
 ore-scrap-holostone-icon-small
   rotate: false
-  xy: 1489, 6
+  xy: 1752, 330
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5550,7 +5508,7 @@ ore-scrap-sand-icon-large
   index: -1
 ore-scrap-sand-icon-small
   rotate: false
-  xy: 1515, 6
+  xy: 1778, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5599,7 +5557,7 @@ ore-scrap-snow-icon-large
   index: -1
 ore-scrap-snow-icon-small
   rotate: false
-  xy: 1541, 6
+  xy: 1804, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5648,7 +5606,7 @@ ore-scrap-stained-stone-icon-large
   index: -1
 ore-scrap-stained-stone-icon-small
   rotate: false
-  xy: 1752, 328
+  xy: 1830, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5662,7 +5620,7 @@ ore-scrap-stained-stone-red-icon-large
   index: -1
 ore-scrap-stained-stone-red-icon-small
   rotate: false
-  xy: 1778, 328
+  xy: 1856, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5746,7 +5704,7 @@ ore-scrap-stone-icon-large
   index: -1
 ore-scrap-stone-icon-small
   rotate: false
-  xy: 1804, 328
+  xy: 1882, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5795,7 +5753,7 @@ ore-thorium-holostone-icon-large
   index: -1
 ore-thorium-holostone-icon-small
   rotate: false
-  xy: 1830, 328
+  xy: 1908, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5844,7 +5802,7 @@ ore-thorium-sand-icon-large
   index: -1
 ore-thorium-sand-icon-small
   rotate: false
-  xy: 1856, 328
+  xy: 1934, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5893,7 +5851,7 @@ ore-thorium-stained-stone-icon-large
   index: -1
 ore-thorium-stained-stone-icon-small
   rotate: false
-  xy: 1882, 328
+  xy: 1960, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5907,7 +5865,7 @@ ore-thorium-stained-stone-red-icon-large
   index: -1
 ore-thorium-stained-stone-red-icon-small
   rotate: false
-  xy: 1908, 328
+  xy: 1986, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5991,7 +5949,7 @@ ore-thorium-stone-icon-large
   index: -1
 ore-thorium-stone-icon-small
   rotate: false
-  xy: 1934, 328
+  xy: 2012, 326
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6040,7 +5998,7 @@ ore-titanium-holostone-icon-large
   index: -1
 ore-titanium-holostone-icon-small
   rotate: false
-  xy: 1960, 328
+  xy: 1489, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6089,7 +6047,7 @@ ore-titanium-sand-icon-large
   index: -1
 ore-titanium-sand-icon-small
   rotate: false
-  xy: 1986, 328
+  xy: 1515, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6138,7 +6096,7 @@ ore-titanium-stained-stone-icon-large
   index: -1
 ore-titanium-stained-stone-icon-small
   rotate: false
-  xy: 2022, 1702
+  xy: 1541, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6152,7 +6110,7 @@ ore-titanium-stained-stone-red-icon-large
   index: -1
 ore-titanium-stained-stone-red-icon-small
   rotate: false
-  xy: 2022, 1676
+  xy: 2022, 1702
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6236,7 +6194,7 @@ ore-titanium-stone-icon-large
   index: -1
 ore-titanium-stone-icon-small
   rotate: false
-  xy: 2013, 388
+  xy: 2022, 1676
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6292,7 +6250,7 @@ overdrive-projector-icon-medium
   index: -1
 overdrive-projector-icon-small
   rotate: false
-  xy: 2012, 362
+  xy: 1749, 304
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6306,7 +6264,7 @@ overflow-gate-icon-large
   index: -1
 overflow-gate-icon-small
   rotate: false
-  xy: 2012, 336
+  xy: 1775, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6334,7 +6292,7 @@ phantom-factory-icon-medium
   index: -1
 phantom-factory-icon-small
   rotate: false
-  xy: 2012, 310
+  xy: 1801, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6348,7 +6306,7 @@ phase-conduit-icon-large
   index: -1
 phase-conduit-icon-small
   rotate: false
-  xy: 1693, 262
+  xy: 1827, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6362,7 +6320,7 @@ phase-conveyor-icon-large
   index: -1
 phase-conveyor-icon-small
   rotate: false
-  xy: 1689, 236
+  xy: 1853, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6376,7 +6334,7 @@ phase-wall-icon-large
   index: -1
 phase-wall-icon-small
   rotate: false
-  xy: 1685, 210
+  xy: 1879, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6397,7 +6355,7 @@ phase-wall-large-icon-medium
   index: -1
 phase-wall-large-icon-small
   rotate: false
-  xy: 1749, 302
+  xy: 1905, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6425,7 +6383,7 @@ phase-weaver-icon-medium
   index: -1
 phase-weaver-icon-small
   rotate: false
-  xy: 1775, 302
+  xy: 1931, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6439,7 +6397,7 @@ pine-icon-large
   index: -1
 pine-icon-small
   rotate: false
-  xy: 1801, 302
+  xy: 1957, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6467,7 +6425,7 @@ plasma-drill-icon-medium
   index: -1
 plasma-drill-icon-small
   rotate: false
-  xy: 1827, 302
+  xy: 1983, 302
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6488,7 +6446,7 @@ plastanium-compressor-icon-medium
   index: -1
 plastanium-compressor-icon-small
   rotate: false
-  xy: 1853, 302
+  xy: 2009, 300
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6516,7 +6474,7 @@ pneumatic-drill-icon-medium
   index: -1
 pneumatic-drill-icon-small
   rotate: false
-  xy: 1879, 302
+  xy: 1723, 293
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6530,7 +6488,7 @@ power-node-icon-large
   index: -1
 power-node-icon-small
   rotate: false
-  xy: 1905, 302
+  xy: 1749, 278
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6551,7 +6509,7 @@ power-node-large-icon-medium
   index: -1
 power-node-large-icon-small
   rotate: false
-  xy: 1931, 302
+  xy: 1775, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6565,7 +6523,7 @@ power-source-icon-large
   index: -1
 power-source-icon-small
   rotate: false
-  xy: 1957, 302
+  xy: 1801, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6579,7 +6537,7 @@ power-void-icon-large
   index: -1
 power-void-icon-small
   rotate: false
-  xy: 1983, 302
+  xy: 1827, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6600,7 +6558,7 @@ pulse-conduit-icon-large
   index: -1
 pulse-conduit-icon-small
   rotate: false
-  xy: 1723, 293
+  xy: 1853, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6621,7 +6579,7 @@ pulverizer-icon-large
   index: -1
 pulverizer-icon-small
   rotate: false
-  xy: 1719, 267
+  xy: 1879, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6642,11 +6600,25 @@ pyratite-mixer-icon-medium
   index: -1
 pyratite-mixer-icon-small
   rotate: false
-  xy: 1749, 276
+  xy: 1905, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+repair-point
+  rotate: false
+  xy: 1983, 612
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+repair-point-icon-full
+  rotate: false
+  xy: 1983, 578
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 repair-point-icon-large
   rotate: false
   xy: 1219, 700
@@ -6656,7 +6628,7 @@ repair-point-icon-large
   index: -1
 repair-point-icon-small
   rotate: false
-  xy: 1775, 276
+  xy: 1931, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6677,18 +6649,25 @@ revenant-factory-icon-large
   index: -1
 revenant-factory-icon-medium
   rotate: false
-  xy: 1983, 578
+  xy: 1983, 544
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 revenant-factory-icon-small
   rotate: false
-  xy: 1801, 276
+  xy: 1957, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+ripple
+  rotate: false
+  xy: 389, 12
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
 ripple-icon-full
   rotate: false
   xy: 869, 1396
@@ -6705,14 +6684,14 @@ ripple-icon-large
   index: -1
 ripple-icon-medium
   rotate: false
-  xy: 1983, 544
+  xy: 1745, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ripple-icon-small
   rotate: false
-  xy: 1827, 276
+  xy: 1983, 276
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6726,7 +6705,7 @@ rocks-icon-large
   index: -1
 rocks-icon-small
   rotate: false
-  xy: 1853, 276
+  xy: 2009, 274
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6740,14 +6719,14 @@ rotary-pump-icon-large
   index: -1
 rotary-pump-icon-medium
   rotate: false
-  xy: 1813, 510
+  xy: 1847, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-icon-small
   rotate: false
-  xy: 1879, 276
+  xy: 1693, 262
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6761,7 +6740,7 @@ router-icon-large
   index: -1
 router-icon-small
   rotate: false
-  xy: 1905, 276
+  xy: 1719, 267
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6775,18 +6754,25 @@ rtg-generator-icon-large
   index: -1
 rtg-generator-icon-medium
   rotate: false
-  xy: 1881, 510
+  xy: 1915, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-icon-small
   rotate: false
-  xy: 1931, 276
+  xy: 1690, 236
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+salvo
+  rotate: false
+  xy: 879, 443
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 salvo-icon-full
   rotate: false
   xy: 1933, 1264
@@ -6803,14 +6789,14 @@ salvo-icon-large
   index: -1
 salvo-icon-medium
   rotate: false
-  xy: 1949, 510
+  xy: 1983, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salvo-icon-small
   rotate: false
-  xy: 1957, 276
+  xy: 1685, 210
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6831,7 +6817,7 @@ sand-icon-large
   index: -1
 sand-icon-small
   rotate: false
-  xy: 1983, 276
+  xy: 1745, 252
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6852,7 +6838,7 @@ sand-water-icon-large
   index: -1
 sand-water-icon-small
   rotate: false
-  xy: 2009, 284
+  xy: 1719, 241
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6866,14 +6852,14 @@ scrap-wall-gigantic-icon-large
   index: -1
 scrap-wall-gigantic-icon-medium
   rotate: false
-  xy: 1387, 159
+  xy: 1387, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-gigantic-icon-small
   rotate: false
-  xy: 2009, 258
+  xy: 1771, 250
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6887,14 +6873,14 @@ scrap-wall-huge-icon-large
   index: -1
 scrap-wall-huge-icon-medium
   rotate: false
-  xy: 1387, 125
+  xy: 1421, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-huge-icon-small
   rotate: false
-  xy: 1719, 241
+  xy: 1797, 250
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6908,7 +6894,7 @@ scrap-wall-icon-large
   index: -1
 scrap-wall-icon-small
   rotate: false
-  xy: 1745, 250
+  xy: 1823, 250
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6922,14 +6908,14 @@ scrap-wall-large-icon-large
   index: -1
 scrap-wall-large-icon-medium
   rotate: false
-  xy: 1421, 499
+  xy: 1421, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-large-icon-small
   rotate: false
-  xy: 1771, 250
+  xy: 1849, 250
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6943,14 +6929,14 @@ separator-icon-large
   index: -1
 separator-icon-medium
   rotate: false
-  xy: 1421, 431
+  xy: 1421, 397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-icon-small
   rotate: false
-  xy: 1849, 250
+  xy: 1927, 250
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6964,7 +6950,7 @@ shock-mine-icon-large
   index: -1
 shock-mine-icon-small
   rotate: false
-  xy: 1875, 250
+  xy: 1953, 250
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6978,14 +6964,14 @@ silicon-smelter-icon-large
   index: -1
 silicon-smelter-icon-medium
   rotate: false
-  xy: 1421, 295
+  xy: 1421, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 silicon-smelter-icon-small
   rotate: false
-  xy: 1901, 250
+  xy: 1979, 250
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7006,7 +6992,7 @@ snow-icon-large
   index: -1
 snow-icon-small
   rotate: false
-  xy: 1927, 250
+  xy: 2005, 248
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7020,7 +7006,7 @@ snowrocks-icon-large
   index: -1
 snowrocks-icon-small
   rotate: false
-  xy: 1953, 250
+  xy: 1745, 226
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7034,7 +7020,7 @@ solar-panel-icon-large
   index: -1
 solar-panel-icon-small
   rotate: false
-  xy: 1979, 250
+  xy: 1771, 224
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7048,14 +7034,14 @@ solar-panel-large-icon-large
   index: -1
 solar-panel-large-icon-medium
   rotate: false
-  xy: 1395, 23
+  xy: 1429, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-large-icon-small
   rotate: false
-  xy: 1849, 224
+  xy: 1797, 224
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7069,7 +7055,7 @@ sorter-icon-large
   index: -1
 sorter-icon-small
   rotate: false
-  xy: 1875, 224
+  xy: 1823, 224
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7083,11 +7069,18 @@ spawn-icon-large
   index: -1
 spawn-icon-small
   rotate: false
-  xy: 1901, 224
+  xy: 1849, 224
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+spectre
+  rotate: false
+  xy: 1826, 1690
+  size: 128, 128
+  orig: 128, 128
+  offset: 0, 0
+  index: -1
 spectre-icon-full
   rotate: false
   xy: 477, 1560
@@ -7104,7 +7097,7 @@ spectre-icon-large
   index: -1
 spectre-icon-medium
   rotate: false
-  xy: 1455, 515
+  xy: 1455, 481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7132,7 +7125,7 @@ spirit-factory-icon-large
   index: -1
 spirit-factory-icon-medium
   rotate: false
-  xy: 1455, 481
+  xy: 1455, 447
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7153,7 +7146,7 @@ spore-cluster-icon-large
   index: -1
 spore-cluster-icon-medium
   rotate: false
-  xy: 1455, 447
+  xy: 1455, 413
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7174,7 +7167,7 @@ stained-boulder-icon-large
   index: -1
 stained-boulder-icon-small
   rotate: false
-  xy: 2005, 232
+  xy: 2005, 222
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7188,7 +7181,7 @@ stained-rocks-icon-large
   index: -1
 stained-rocks-icon-small
   rotate: false
-  xy: 1823, 213
+  xy: 1901, 213
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7202,7 +7195,7 @@ stained-rocks-red-icon-large
   index: -1
 stained-rocks-red-icon-small
   rotate: false
-  xy: 1849, 198
+  xy: 1875, 208
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7216,7 +7209,7 @@ stained-rocks-yellow-icon-large
   index: -1
 stained-rocks-yellow-icon-small
   rotate: false
-  xy: 1875, 198
+  xy: 1927, 198
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7237,7 +7230,7 @@ stained-stone-icon-large
   index: -1
 stained-stone-icon-small
   rotate: false
-  xy: 1901, 198
+  xy: 1953, 198
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7258,7 +7251,7 @@ stained-stone-red-icon-large
   index: -1
 stained-stone-red-icon-small
   rotate: false
-  xy: 1927, 198
+  xy: 1979, 198
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7279,7 +7272,7 @@ stained-stone-yellow-icon-large
   index: -1
 stained-stone-yellow-icon-small
   rotate: false
-  xy: 1953, 198
+  xy: 2005, 196
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7300,7 +7293,7 @@ stone-icon-large
   index: -1
 stone-icon-small
   rotate: false
-  xy: 1979, 198
+  xy: 1901, 187
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7314,14 +7307,14 @@ surge-tower-icon-large
   index: -1
 surge-tower-icon-medium
   rotate: false
-  xy: 1557, 442
+  xy: 1489, 340
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-tower-icon-small
   rotate: false
-  xy: 2005, 206
+  xy: 1927, 172
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7335,7 +7328,7 @@ surge-wall-icon-large
   index: -1
 surge-wall-icon-small
   rotate: false
-  xy: 1745, 224
+  xy: 1953, 172
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7349,18 +7342,25 @@ surge-wall-large-icon-large
   index: -1
 surge-wall-large-icon-medium
   rotate: false
-  xy: 1523, 374
+  xy: 1557, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large-icon-small
   rotate: false
-  xy: 1771, 224
+  xy: 1979, 172
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+swarmer
+  rotate: false
+  xy: 1591, 1198
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 swarmer-icon-full
   rotate: false
   xy: 1657, 1198
@@ -7377,14 +7377,14 @@ swarmer-icon-large
   index: -1
 swarmer-icon-medium
   rotate: false
-  xy: 1557, 408
+  xy: 1489, 306
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 swarmer-icon-small
   rotate: false
-  xy: 1797, 208
+  xy: 2005, 170
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7405,7 +7405,7 @@ tar-icon-large
   index: -1
 tar-icon-small
   rotate: false
-  xy: 1823, 187
+  xy: 1659, 189
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7419,14 +7419,14 @@ tau-mech-pad-icon-large
   index: -1
 tau-mech-pad-icon-medium
   rotate: false
-  xy: 1523, 340
+  xy: 1557, 374
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-small
   rotate: false
-  xy: 1849, 172
+  xy: 1685, 184
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7440,14 +7440,14 @@ thermal-generator-icon-large
   index: -1
 thermal-generator-icon-medium
   rotate: false
-  xy: 1557, 374
+  xy: 1489, 272
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-generator-icon-small
   rotate: false
-  xy: 1875, 172
+  xy: 1655, 163
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7461,14 +7461,14 @@ thermal-pump-icon-large
   index: -1
 thermal-pump-icon-medium
   rotate: false
-  xy: 1489, 272
+  xy: 1523, 306
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-icon-small
   rotate: false
-  xy: 1901, 172
+  xy: 1654, 137
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7482,14 +7482,14 @@ thorium-reactor-icon-large
   index: -1
 thorium-reactor-icon-medium
   rotate: false
-  xy: 1523, 272
+  xy: 1557, 306
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-reactor-icon-small
   rotate: false
-  xy: 1927, 172
+  xy: 1651, 111
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7503,7 +7503,7 @@ thorium-wall-icon-large
   index: -1
 thorium-wall-icon-small
   rotate: false
-  xy: 1953, 172
+  xy: 1681, 158
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7517,14 +7517,14 @@ thorium-wall-large-icon-large
   index: -1
 thorium-wall-large-icon-medium
   rotate: false
-  xy: 1489, 204
+  xy: 1523, 238
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-small
   rotate: false
-  xy: 1979, 172
+  xy: 1680, 132
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7538,14 +7538,14 @@ thruster-icon-large
   index: -1
 thruster-icon-medium
   rotate: false
-  xy: 1523, 238
+  xy: 1557, 272
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thruster-icon-small
   rotate: false
-  xy: 2005, 180
+  xy: 1677, 106
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7566,14 +7566,14 @@ titan-factory-icon-large
   index: -1
 titan-factory-icon-medium
   rotate: false
-  xy: 1557, 272
+  xy: 1489, 170
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titan-factory-icon-small
   rotate: false
-  xy: 2005, 154
+  xy: 1711, 210
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7587,7 +7587,7 @@ titanium-conveyor-icon-large
   index: -1
 titanium-conveyor-icon-small
   rotate: false
-  xy: 1711, 210
+  xy: 1711, 184
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7601,7 +7601,7 @@ titanium-wall-icon-large
   index: -1
 titanium-wall-icon-small
   rotate: false
-  xy: 1737, 198
+  xy: 1707, 158
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7615,14 +7615,14 @@ titanium-wall-large-icon-large
   index: -1
 titanium-wall-large-icon-medium
   rotate: false
-  xy: 1625, 417
+  xy: 1659, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-small
   rotate: false
-  xy: 1763, 198
+  xy: 1706, 132
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7636,14 +7636,14 @@ trident-ship-pad-icon-large
   index: -1
 trident-ship-pad-icon-medium
   rotate: false
-  xy: 1625, 383
+  xy: 1659, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-small
   rotate: false
-  xy: 1567, 99
+  xy: 1703, 106
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7657,14 +7657,14 @@ turbine-generator-icon-large
   index: -1
 turbine-generator-icon-medium
   rotate: false
-  xy: 1659, 417
+  xy: 1625, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 turbine-generator-icon-small
   rotate: false
-  xy: 1593, 99
+  xy: 1737, 200
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7727,7 +7727,7 @@ unloader-icon-large
   index: -1
 unloader-icon-small
   rotate: false
-  xy: 1567, 73
+  xy: 1763, 198
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7741,14 +7741,14 @@ vault-icon-large
   index: -1
 vault-icon-medium
   rotate: false
-  xy: 1659, 383
+  xy: 1625, 315
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault-icon-small
   rotate: false
-  xy: 1567, 47
+  xy: 1789, 198
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7776,14 +7776,14 @@ water-extractor-icon-large
   index: -1
 water-extractor-icon-medium
   rotate: false
-  xy: 1659, 349
+  xy: 1625, 281
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-extractor-icon-small
   rotate: false
-  xy: 1593, 73
+  xy: 1815, 198
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7797,11 +7797,18 @@ water-icon-large
   index: -1
 water-icon-small
   rotate: false
-  xy: 1567, 21
+  xy: 1841, 198
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+wave
+  rotate: false
+  xy: 1909, 1132
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 wave-icon-full
   rotate: false
   xy: 985, 1066
@@ -7818,14 +7825,14 @@ wave-icon-large
   index: -1
 wave-icon-medium
   rotate: false
-  xy: 1625, 281
+  xy: 1659, 315
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-icon-small
   rotate: false
-  xy: 1593, 47
+  xy: 1737, 174
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7839,14 +7846,14 @@ white-tree-dead-icon-large
   index: -1
 white-tree-dead-icon-medium
   rotate: false
-  xy: 1659, 315
+  xy: 1625, 247
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-dead-icon-small
   rotate: false
-  xy: 1593, 21
+  xy: 1763, 172
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7860,14 +7867,14 @@ white-tree-icon-large
   index: -1
 white-tree-icon-medium
   rotate: false
-  xy: 1625, 247
+  xy: 1659, 281
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-icon-small
   rotate: false
-  xy: 1619, 79
+  xy: 1789, 172
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7888,14 +7895,14 @@ wraith-factory-icon-large
   index: -1
 wraith-factory-icon-medium
   rotate: false
-  xy: 1659, 281
+  xy: 1625, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wraith-factory-icon-small
   rotate: false
-  xy: 1619, 53
+  xy: 1815, 172
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8231,7 +8238,7 @@ circle
   index: -1
 clear
   rotate: false
-  xy: 2009, 325
+  xy: 1690, 278
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -8253,7 +8260,7 @@ bar
   index: -1
 bar-top
   rotate: false
-  xy: 1656, 209
+  xy: 1625, 141
   size: 27, 36
   split: 9, 10, 9, 10
   orig: 27, 36
@@ -8341,7 +8348,7 @@ button-right-over
   index: -1
 button-select
   rotate: false
-  xy: 1753, 432
+  xy: 1783, 458
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -8370,7 +8377,7 @@ check-on-over
   index: -1
 check-over
   rotate: false
-  xy: 1659, 247
+  xy: 1625, 179
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
@@ -8429,28 +8436,28 @@ empty-sector
   index: -1
 icon-crafting
   rotate: false
-  xy: 2031, 204
+  xy: 2031, 220
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 2031, 186
+  xy: 2031, 202
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 2031, 168
+  xy: 2031, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-effect
   rotate: false
-  xy: 2031, 150
+  xy: 2031, 166
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -8464,35 +8471,35 @@ icon-liquid
   index: -1
 icon-power
   rotate: false
-  xy: 1603, 3
+  xy: 1567, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 2025, 1164
+  xy: 1567, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 1645, 87
+  xy: 2024, 1074
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 1645, 51
+  xy: 2024, 1038
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 1413, 5
+  xy: 1732, 138
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -8611,7 +8618,7 @@ icon-cancel
   index: -1
 icon-cancel-2
   rotate: false
-  xy: 1987, 406
+  xy: 1965, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8625,21 +8632,21 @@ icon-chat
   index: -1
 icon-check
   rotate: false
-  xy: 2031, 240
+  xy: 2031, 256
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-check-2
   rotate: false
-  xy: 1752, 380
+  xy: 1991, 406
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icon-copy
   rotate: false
-  xy: 2031, 222
+  xy: 2031, 238
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -8758,14 +8765,14 @@ icon-floppy-16
   index: -1
 icon-folder
   rotate: false
-  xy: 2032, 2016
+  xy: 1603, 109
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 2032, 2000
+  xy: 1585, 91
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -8779,14 +8786,14 @@ icon-generated
   index: -1
 icon-github
   rotate: false
-  xy: 2032, 1984
+  xy: 2032, 2016
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 2032, 1968
+  xy: 1585, 75
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -8814,28 +8821,28 @@ icon-holdDelete
   index: -1
 icon-home
   rotate: false
-  xy: 2032, 1952
+  xy: 2032, 2000
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 1643, 724
+  xy: 1585, 59
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 1637, 35
+  xy: 2032, 1984
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 1653, 35
+  xy: 1585, 43
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -8863,7 +8870,7 @@ icon-line
   index: -1
 icon-link
   rotate: false
-  xy: 1089, 6
+  xy: 2032, 1968
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -8877,35 +8884,35 @@ icon-liquid-small
   index: -1
 icon-load
   rotate: false
-  xy: 1105, 6
+  xy: 1585, 27
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 1619, 35
+  xy: 1567, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 453, 1469
+  xy: 1841, 180
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 845, 1426
+  xy: 453, 1469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 495, 1695
+  xy: 845, 1426
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -8919,7 +8926,7 @@ icon-logic
   index: -1
 icon-map
   rotate: false
-  xy: 2030, 1934
+  xy: 2032, 1952
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -8933,7 +8940,7 @@ icon-menu
   index: -1
 icon-menu-large
   rotate: false
-  xy: 963, 184
+  xy: 495, 1695
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -8975,224 +8982,224 @@ icon-mission-done
   index: -1
 icon-none
   rotate: false
-  xy: 1, 2
+  xy: 1751, 162
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-paste
   rotate: false
-  xy: 845, 1408
+  xy: 963, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 1625, 521
+  xy: 1, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 1567, 3
+  xy: 1567, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 2030, 1918
+  xy: 1585, 11
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 1585, 3
+  xy: 845, 1408
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 2022, 1664
+  xy: 1625, 521
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 2030, 1902
+  xy: 1643, 724
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-play-custom
   rotate: false
-  xy: 2030, 1886
+  xy: 613, 6
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 795, 380
+  xy: 2022, 1664
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 813, 644
+  xy: 795, 380
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 2030, 1870
+  xy: 1395, 7
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 2025, 1146
+  xy: 1567, 46
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 2030, 1854
+  xy: 1411, 7
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 2030, 1838
+  xy: 1427, 7
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 2025, 1128
+  xy: 1567, 28
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 2030, 1822
+  xy: 1443, 7
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 2030, 1806
+  xy: 1459, 5
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 2030, 1790
+  xy: 1841, 164
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 2030, 1774
+  xy: 1859, 182
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 2030, 1758
+  xy: 1089, 6
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 2024, 1110
+  xy: 1567, 10
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 2024, 1092
+  xy: 2025, 1164
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 825, 644
+  xy: 813, 644
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-spray
   rotate: false
-  xy: 2024, 1074
+  xy: 2025, 1146
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 2024, 1056
+  xy: 2025, 1128
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 2030, 1742
+  xy: 1105, 6
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 1405, 546
+  xy: 825, 644
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 1449, 11
+  xy: 1405, 546
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 1789, 192
+  xy: 1732, 122
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 2024, 1038
+  xy: 2024, 1110
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tree
   rotate: false
-  xy: 613, 4
+  xy: 2024, 1092
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -9206,49 +9213,49 @@ icon-tree-locked
   index: -1
 icon-trello
   rotate: false
-  xy: 1805, 192
+  xy: 1729, 106
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 1621, 19
+  xy: 1875, 192
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 1645, 69
+  xy: 2024, 1056
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocked
   rotate: false
-  xy: 1395, 5
+  xy: 1733, 156
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 1621, 3
+  xy: 1875, 176
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 1637, 19
+  xy: 1859, 166
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zone
   rotate: false
-  xy: 1752, 354
+  xy: 2017, 430
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9262,14 +9269,14 @@ icon-zone-locked
   index: -1
 icon-zoom
   rotate: false
-  xy: 1431, 5
+  xy: 1585, 107
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 1637, 3
+  xy: 1875, 160
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -9283,7 +9290,7 @@ info-banner
   index: -1
 inventory
   rotate: false
-  xy: 2013, 466
+  xy: 1463, 99
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -9314,7 +9321,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 1823, 239
+  xy: 1901, 239
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -9338,7 +9345,7 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 1797, 234
+  xy: 1875, 234
   size: 24, 40
   split: 10, 10, 6, 10
   orig: 24, 40
@@ -9346,21 +9353,21 @@ scroll-knob-vertical-black
   index: -1
 sector-select
   rotate: false
-  xy: 1421, 465
+  xy: 1421, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 selection
   rotate: false
-  xy: 1637, 737
+  xy: 1651, 138
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 1749, 332
+  xy: 1729, 122
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
@@ -9374,14 +9381,14 @@ slider-knob
   index: -1
 slider-knob-down
   rotate: false
-  xy: 1625, 207
+  xy: 1659, 241
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 1625, 207
+  xy: 1659, 241
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
@@ -9411,7 +9418,7 @@ underline-2
   index: -1
 white
   rotate: false
-  xy: 521, 1752
+  xy: 1685, 236
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index f9524a71ec..a2b60390dd 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/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 34e3e9dbec..f017280836 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -457,7 +457,7 @@ public class Blocks implements ContentList{
             spinnerSpeed = 3f;
             size = 2;
 
-            consumes.liquid(Liquids.slag, 0.3f);
+            consumes.liquid(Liquids.slag, 0.1f);
         }};
 
         cultivator = new Cultivator("cultivator"){{
@@ -467,6 +467,7 @@ public class Blocks implements ContentList{
             size = 2;
             hasLiquids = true;
             hasPower = true;
+            hasItems = true;
 
             consumes.power(0.80f);
             consumes.liquid(Liquids.water, 0.15f);
@@ -848,12 +849,12 @@ public class Blocks implements ContentList{
 
         differentialGenerator = new DifferentialGenerator("differential-generator"){{
             requirements(Category.power, ItemStack.with(Items.copper, 140, Items.titanium, 100, Items.lead, 200, Items.silicon, 130, Items.metaglass, 100));
-            powerProduction = 24f;
-            itemDuration = 60f;
+            powerProduction = 16f;
+            itemDuration = 50f;
             consumes.remove(ConsumeItemFilter.class);
             consumes.remove(ConsumeLiquidFilter.class);
             consumes.item(Items.pyratite);
-            consumes.liquid(Liquids.cryofluid, 0.06f);
+            consumes.liquid(Liquids.cryofluid, 0.12f);
             size = 3;
         }};
 
@@ -991,7 +992,7 @@ public class Blocks implements ContentList{
             alwaysUnlocked = true;
 
             health = 1100;
-            itemCapacity = 4000;
+            itemCapacity = 5000;
             size = 3;
         }};
 
@@ -999,15 +1000,15 @@ public class Blocks implements ContentList{
             requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000));
 
             health = 2000;
-            itemCapacity = 7000;
+            itemCapacity = 8000;
             size = 4;
         }};
 
         coreNucleus = new CoreBlock("core-nucleus"){{
             requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 8000, Items.silicon, 4000, Items.surgealloy, 2000));
 
-            health = 3000;
-            itemCapacity = 10000;
+            health = 4000;
+            itemCapacity = 12000;
             size = 5;
         }};
 
@@ -1102,7 +1103,7 @@ public class Blocks implements ContentList{
 
         lancer = new ChargeTurret("lancer"){{
             requirements(Category.turret, ItemStack.with(Items.copper, 50, Items.lead, 100, Items.silicon, 90));
-            range = 135f;
+            range = 155f;
             chargeTime = 50f;
             chargeMaxDelay = 30f;
             chargeEffects = 7;
@@ -1130,7 +1131,7 @@ public class Blocks implements ContentList{
             shootCone = 40f;
             rotatespeed = 8f;
             powerUsed = 1f / 2f;
-            consumes.powerBuffered(50f);
+            consumes.powerBuffered(80f);
             range = 80f;
             shootEffect = Fx.lightningShoot;
             heatColor = Color.RED;
diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java
index bb2d653937..bcc7a59e52 100644
--- a/core/src/io/anuke/mindustry/content/Bullets.java
+++ b/core/src/io/anuke/mindustry/content/Bullets.java
@@ -455,7 +455,7 @@ public class Bullets implements ContentList{
             Color[] colors = {Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.WHITE};
             float[] tscales = {1f, 0.7f, 0.5f, 0.2f};
             float[] lenscales = {1f, 1.1f, 1.13f, 1.14f};
-            float length = 140f;
+            float length = 160f;
 
             {
                 hitEffect = Fx.hitLancer;
diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java
index 7301715f7f..f9b85f5f97 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/io/anuke/mindustry/core/World.java
@@ -185,7 +185,9 @@ public class World implements ApplicationListener{
 
         addDarkness(tiles);
 
-        EntityQuery.resizeTree(0, 0, tiles.length * tilesize, tiles[0].length * tilesize);
+        int padding = 50;
+
+        EntityQuery.resizeTree(-padding * tilesize, -padding * tilesize, (tiles.length + padding) * tilesize, (tiles[0].length + padding) * tilesize);
 
         generating = false;
         Events.fire(new WorldLoadEvent());
diff --git a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
index 58aa066d06..b9a4d35f84 100644
--- a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
+++ b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
@@ -7,6 +7,7 @@ import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.mindustry.world.Tile;
 
+import static io.anuke.mindustry.Vars.headless;
 import static io.anuke.mindustry.Vars.world;
 
 public class ScorchDecal extends Decal{
@@ -14,6 +15,7 @@ public class ScorchDecal extends Decal{
     private static final TextureRegion[] regions = new TextureRegion[scorches];
 
     public static void create(float x, float y){
+        if(headless) return;
         if(regions[0] == null){
             for(int i = 0; i < regions.length; i++){
                 regions[i] = Core.atlas.find("scorch" + (i + 1));
diff --git a/core/src/io/anuke/mindustry/entities/type/base/Drone.java b/core/src/io/anuke/mindustry/entities/type/base/Drone.java
index 74fbaa964c..384d302d84 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/Drone.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Drone.java
@@ -32,8 +32,6 @@ import static io.anuke.mindustry.Vars.unitGroups;
 import static io.anuke.mindustry.Vars.world;
 
 public class Drone extends FlyingUnit implements BuilderTrait{
-    protected static int timerRepairEffect = timerIndex++;
-
     protected Item targetItem;
     protected Tile mineTile;
     protected Queue<BuildRequest> placeQueue = new Queue<>();
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index 7606689732..a9016972ee 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -96,12 +96,14 @@ public class Block extends BlockStorage{
     /** Whether this block consumes touchDown events when tapped. */
     public boolean consumesTap;
     /** The color of this block when displayed on the minimap or map preview.
-     *  Do not set manually! This is overriden when loading.*/
+     *  Do not set manually! This is overriden when loading for most blocks.*/
     public Color color = new Color(0, 0, 0, 1);
     /**Whether units target this block.*/
     public boolean targetable = true;
     /**Whether the overdrive core has any effect on this block.*/
     public boolean canOverdrive = true;
+    /**Whether the icon region has an outline added.*/
+    public boolean outlineIcon = false;
 
     /**Cost of constructing this block.*/
     public ItemStack[] buildRequirements = new ItemStack[]{};
@@ -380,11 +382,6 @@ public class Block extends BlockStorage{
     public void update(Tile tile){
     }
 
-    /**Called when this tile is randomly updated. This only happens on a client, and should be used for effects only.
-     * TODO currently unimplemented*/
-    public void randomUpdate(Tile tile){
-    }
-
     public boolean isAccessible(){
         return (hasItems && itemCapacity > 0);
     }
@@ -402,11 +399,10 @@ public class Block extends BlockStorage{
         float power = 0f;
 
         if(hasItems){
-            float scaling = inventoryScaling(tile);
             for(Item item : content.items()){
                 int amount = tile.entity.items.get(item);
-                explosiveness += item.explosiveness * amount * scaling;
-                flammability += item.flammability * amount * scaling;
+                explosiveness += item.explosiveness * amount;
+                flammability += item.flammability * amount;
             }
         }
 
@@ -441,11 +437,6 @@ public class Block extends BlockStorage{
         }
     }
 
-    /**Returns scaled # of inventories in this block.*/
-    public float inventoryScaling(Tile tile){
-        return 1f;
-    }
-
     /**
      * Returns the flammability of the tile. Used for fire calculations.
      * Takes flammability of floor liquid into account.
diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java
index 84ed8fc01b..a7f4430371 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Floor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java
@@ -1,17 +1,15 @@
 package io.anuke.mindustry.world.blocks;
 
 import io.anuke.arc.Core;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.Effects.Effect;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Point2;
-import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.content.StatusEffects;
+import io.anuke.mindustry.entities.Effects.Effect;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.type.StatusEffect;
@@ -98,13 +96,6 @@ public class Floor extends Block{
         return new TextureRegion[]{Core.atlas.find(Core.atlas.has(name) ? name : name + "1")};
     }
 
-    @Override
-    public void randomUpdate(Tile tile){
-        if(tile.block() == Blocks.air){
-            Effects.effect(updateEffect, tile.worldx() + Mathf.range(tilesize/2f), tile.worldy() + Mathf.range(tilesize/2f));
-        }
-    }
-
     @Override
     public void init(){
         super.init();
diff --git a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
index 22dbf4c293..bd1cb012ea 100644
--- a/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
+++ b/core/src/io/anuke/mindustry/world/blocks/SelectionTrait.java
@@ -25,7 +25,7 @@ public interface SelectionTrait{
         int i = 0;
 
         for(Item item : items){
-            if(!data.isUnlocked(item)) continue;
+            if(!data.isUnlocked(item) && world.isZone()) continue;
 
             ImageButton button = cont.addImageButton("white", "clear-toggle", 24, () -> {}).group(group).get();
             button.changed(() -> consumer.accept(button.isChecked() ? item : null));
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
index b4cc5f0c49..29fe2bab9a 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
@@ -62,8 +62,7 @@ public abstract class Turret extends Block{
     protected Vector2 tr = new Vector2();
     protected Vector2 tr2 = new Vector2();
 
-    protected TextureRegion baseRegion;
-    protected TextureRegion heatRegion;
+    protected TextureRegion baseRegion, heatRegion;
 
     protected BiConsumer<Tile, TurretEntity> drawer = (tile, entity) ->
         Draw.rect(region, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90);
@@ -83,6 +82,7 @@ public abstract class Turret extends Block{
         layer = Layer.turret;
         group = BlockGroup.turrets;
         flags = EnumSet.of(BlockFlag.turret);
+        outlineIcon = true;
     }
 
     @Override
@@ -94,6 +94,7 @@ public abstract class Turret extends Block{
     public void load(){
         super.load();
 
+        region = Core.atlas.find(name);
         baseRegion = Core.atlas.find("block-" + size);
         heatRegion = Core.atlas.find(name + "-heat");
     }
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
index 2d092a0180..5328621390 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
@@ -47,7 +47,7 @@ public class MassDriver extends Block{
     protected Effect smokeEffect = Fx.shootBigSmoke2;
     protected Effect recieveEffect = Fx.mineBig;
     protected float shake = 3f;
-    protected final static float powerPercentageUsed = 1.0f;
+    protected float powerPercentageUsed = 0.95f;
     protected TextureRegion turretRegion;
 
     public MassDriver(String name){
@@ -59,6 +59,7 @@ public class MassDriver extends Block{
         layer = Layer.turret;
         hasPower = true;
         consumes.powerBuffered(30f);
+        outlineIcon = true;
     }
 
     @Remote(targets = Loc.both, called = Loc.server, forward = true)
@@ -79,7 +80,7 @@ public class MassDriver extends Block{
 
         entity.reload = 1f;
 
-        entity.power.satisfaction -= Math.min(entity.power.satisfaction, powerPercentageUsed);
+        entity.power.satisfaction -= Math.min(entity.power.satisfaction, driver.powerPercentageUsed);
 
         DriverBulletData data = Pools.obtain(DriverBulletData.class, DriverBulletData::new);
         data.from = entity;
@@ -117,7 +118,7 @@ public class MassDriver extends Block{
     public void load(){
         super.load();
 
-        turretRegion = Core.atlas.find(name + "-turret");
+        turretRegion = Core.atlas.find(name);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
index 157c7899e4..379d0ab083 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
@@ -44,13 +44,14 @@ public class RepairPoint extends Block{
         layer2 = Layer.laser;
         hasPower = true;
         consumePower = consumes.powerBuffered(20f);
+        outlineIcon = true;
     }
 
     @Override
     public void load(){
         super.load();
 
-        topRegion = Core.atlas.find(name + "-turret");
+        topRegion = Core.atlas.find(name);
     }
 
     @Override
@@ -90,6 +91,11 @@ public class RepairPoint extends Block{
         }
     }
 
+    @Override
+    public TextureRegion[] generateIcons(){
+        return new TextureRegion[]{Core.atlas.find(name), Core.atlas.find(name + "-turret")};
+    }
+
     @Override
     public void update(Tile tile){
         RepairPointEntity entity = tile.entity();
diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
index 1ca8f6c301..752598b7eb 100644
--- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
@@ -42,7 +42,7 @@ public class UnitFactory extends Block{
     protected float produceTime = 1000f;
     protected float launchVelocity = 0f;
     protected TextureRegion topRegion;
-    protected int maxSpawn = 4;
+    protected int maxSpawn = 2;
 
     public UnitFactory(String name){
         super(name);
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 55849d4765..29d4ee64f5 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -260,7 +260,7 @@ public class ServerControl implements ApplicationListener{
                 info("Status: &rserver closed");
             }else{
                 info("Status:");
-                info("  &lyPlaying on map &fi{0}&fb &lb/&ly Wave {1} &lb/&ly {2} &lb/&ly {3}", Strings.capitalize(world.getMap().name), state.wave);
+                info("  &lyPlaying on map &fi{0}&fb &lb/&ly Wave {1}", Strings.capitalize(world.getMap().name), state.wave);
 
                 if(!state.rules.waves){
                     info("&ly  {0} enemies.", unitGroups[Team.red.ordinal()].size());
diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java
index 059a1b4519..28446cf210 100644
--- a/tests/src/test/java/ApplicationTests.java
+++ b/tests/src/test/java/ApplicationTests.java
@@ -114,6 +114,11 @@ public class ApplicationTests{
     void spawnWaves(){
         world.loadMap(testMap);
         logic.runWave();
+        //force trigger delayed spawns
+        Time.setDeltaProvider(() -> 1000f);
+        Time.update();
+        Time.update();
+        Time.setDeltaProvider(() -> 1f);
         unitGroups[waveTeam.ordinal()].updateEvents();
         assertFalse(unitGroups[waveTeam.ordinal()].isEmpty());
     }
diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java
index 37b34465e6..37b4b23172 100644
--- a/tools/src/io/anuke/mindustry/Generators.java
+++ b/tools/src/io/anuke/mindustry/Generators.java
@@ -2,16 +2,21 @@ package io.anuke.mindustry;
 
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.TextureRegion;
+import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Log;
-import io.anuke.mindustry.type.UnitType;
+import io.anuke.mindustry.ImagePacker.GenRegion;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Mech;
+import io.anuke.mindustry.type.UnitType;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Block.Icon;
 import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.blocks.OreBlock;
 
+import java.io.IOException;
+import java.nio.file.Files;
+
 import static io.anuke.mindustry.Vars.content;
 import static io.anuke.mindustry.Vars.tilesize;
 
@@ -21,6 +26,7 @@ public class Generators {
 
         ImagePacker.generate("block-icons", () -> {
             Image colors = new Image(256, 1);
+            Color outlineColor = new Color(0, 0, 0, 0.3f);
 
             for(Block block : content.blocks()){
                 TextureRegion[] regions = block.getGeneratedIcons();
@@ -47,6 +53,45 @@ public class Generators {
                         scaled.save(block.name + "-icon-" + icon.name());
                     }
 
+                    if(block.outlineIcon){
+                        int radius = 3;
+                        GenRegion region = (GenRegion)regions[regions.length-1];
+                        Image base = ImagePacker.get(region);
+                        Image out = new Image(region.getWidth(), region.getHeight());
+                        for(int x = 0; x < out.width(); x++){
+                            for(int y = 0; y < out.height(); y++){
+
+                                Color color = base.getColor(x, y);
+                                if(color.a >= 0.01f){
+                                    out.draw(x, y, color);
+                                }else{
+                                    boolean found = false;
+                                    outer:
+                                    for(int rx = -radius; rx <= radius; rx++){
+                                        for(int ry = -radius; ry <= radius; ry++){
+                                            if(Mathf.dst(rx, ry) <= radius && base.getColor(rx + x, ry + y).a > 0.01f){
+                                                found = true;
+                                                break outer;
+                                            }
+                                        }
+                                    }
+                                    if(found){
+                                        out.draw(x, y, outlineColor);
+                                    }
+                                }
+
+                            }
+                        }
+
+                        try{
+                            Files.delete(region.path);
+                        }catch(IOException e){
+                            e.printStackTrace();
+                        }
+
+                        out.save(block.name);
+                    }
+
                     Color average = new Color();
                     for(int x = 0; x < image.width(); x++){
                         for(int y = 0; y < image.height(); y++){
diff --git a/tools/src/io/anuke/mindustry/Image.java b/tools/src/io/anuke/mindustry/Image.java
index e97babec9b..5d975200cd 100644
--- a/tools/src/io/anuke/mindustry/Image.java
+++ b/tools/src/io/anuke/mindustry/Image.java
@@ -52,6 +52,7 @@ class Image {
     }
 
     Color getColor(int x, int y){
+        if(!Structs.inBounds(x, y, width(), height())) return color.set(0, 0, 0, 0);
         int i = image.getRGB(x, y);
         Color.argb8888ToColor(color, i);
         return color;
diff --git a/tools/src/io/anuke/mindustry/ImagePacker.java b/tools/src/io/anuke/mindustry/ImagePacker.java
index 15c94c63ba..ee1a00b811 100644
--- a/tools/src/io/anuke/mindustry/ImagePacker.java
+++ b/tools/src/io/anuke/mindustry/ImagePacker.java
@@ -16,6 +16,7 @@ import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 
 public class ImagePacker{
@@ -38,7 +39,7 @@ public class ImagePacker{
                 fname = fname.substring(0, fname.length() - 4);
 
                 BufferedImage image = ImageIO.read(path.toFile());
-                GenRegion region = new GenRegion(fname){
+                GenRegion region = new GenRegion(fname, path){
 
                     @Override
                     public int getX(){
@@ -73,7 +74,7 @@ public class ImagePacker{
             @Override
             public AtlasRegion find(String name){
                 if(!regionCache.containsKey(name)){
-                    GenRegion region = new GenRegion(name);
+                    GenRegion region = new GenRegion(name, null);
                     region.invalid = true;
                     return region;
                 }
@@ -136,9 +137,11 @@ public class ImagePacker{
     static class GenRegion extends AtlasRegion{
         String name;
         boolean invalid;
+        Path path;
 
-        GenRegion(String name){
+        GenRegion(String name, Path path){
             this.name = name;
+            this.path = path;
         }
 
         static void validate(TextureRegion region){