diff --git a/core/assets-raw/sprites/items/liquid-slag.png b/core/assets-raw/sprites/items/liquid-slag.png
index aea23bb0b3..af8efaf9ef 100644
Binary files a/core/assets-raw/sprites/items/liquid-slag.png and b/core/assets-raw/sprites/items/liquid-slag.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob-down.png b/core/assets-raw/sprites/ui/slider-knob-down.png
index 38cce86251..1c44f1497d 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob-down.png and b/core/assets-raw/sprites/ui/slider-knob-down.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f106381151..ec6be2e81e 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -235,6 +235,8 @@ editor = Editor
 mapeditor = Map Editor
 donate = Donate
 resume = Resume Zone:\n[LIGHT_GRAY]{0}
+launch = Launch
+launch.title = Launch Successful
 
 connectfail = [crimson]Failed to connect to server:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 3b7c9226d9..5a4bd4e853 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: 1207, 1341
+  xy: 1989, 1375
   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: 1683, 1307
+  xy: 1649, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1717, 1307
+  xy: 1683, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1751, 1307
+  xy: 1717, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1785, 1307
+  xy: 1751, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1819, 1307
+  xy: 1785, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1853, 1307
+  xy: 1819, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1887, 1307
+  xy: 1853, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1921, 1307
+  xy: 1887, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1955, 1307
+  xy: 1921, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1989, 1307
+  xy: 1955, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 777, 951
+  xy: 1989, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 777, 917
+  xy: 777, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 811, 959
+  xy: 777, 917
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 811, 925
+  xy: 811, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 851, 1025
+  xy: 811, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 885, 1025
+  xy: 851, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 975, 1149
+  xy: 885, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 975, 1115
+  xy: 975, 1149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1009, 1157
+  xy: 975, 1115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1009, 1123
+  xy: 1009, 1157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -363,7 +363,7 @@ distributor
   index: -1
 junction
   rotate: false
-  xy: 1657, 1579
+  xy: 1623, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -384,49 +384,49 @@ mass-driver-turret
   index: -1
 overflow-gate
   rotate: false
-  xy: 1241, 1409
+  xy: 1207, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1309, 1375
+  xy: 1309, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1343, 1409
+  xy: 1309, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1343, 1375
+  xy: 1343, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1377, 1409
+  xy: 1343, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1751, 1409
+  xy: 1717, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1683, 1341
+  xy: 1649, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -825,7 +825,7 @@ icerock2
   index: -1
 lava
   rotate: false
-  xy: 1691, 1613
+  xy: 1657, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -839,63 +839,63 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 1759, 1681
+  xy: 1725, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 1793, 1715
+  xy: 1759, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 1827, 1749
+  xy: 1793, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 1623, 1477
+  xy: 1895, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 1657, 1511
+  xy: 1623, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 1691, 1545
+  xy: 1657, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 1725, 1579
+  xy: 1691, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 1759, 1613
+  xy: 1725, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 1793, 1647
+  xy: 1759, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -909,49 +909,49 @@ metalflooredge
   index: -1
 rock1
   rotate: false
-  xy: 1683, 1409
+  xy: 1649, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 1683, 1375
+  xy: 1683, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks1
   rotate: false
-  xy: 1717, 1409
+  xy: 1683, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 1717, 1375
+  xy: 1717, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 1785, 1409
+  xy: 1751, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 1785, 1375
+  xy: 1785, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 1819, 1409
+  xy: 1785, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -965,28 +965,28 @@ sandedge
   index: -1
 shrub
   rotate: false
-  xy: 1275, 1341
+  xy: 1241, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 1343, 1341
+  xy: 1309, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1377, 1341
+  xy: 1343, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1411, 1341
+  xy: 1377, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1007,49 +1007,49 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 1989, 1341
+  xy: 1955, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 1173, 1311
+  xy: 1989, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 1207, 1307
+  xy: 1173, 1311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 1241, 1307
+  xy: 1207, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 1887, 1341
+  xy: 1853, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 1921, 1341
+  xy: 1887, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1955, 1341
+  xy: 1921, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1070,70 +1070,70 @@ taredge
   index: -1
 thorium1
   rotate: false
-  xy: 1445, 1307
+  xy: 1411, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1479, 1307
+  xy: 1445, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1513, 1307
+  xy: 1479, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1581, 1307
+  xy: 1547, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1615, 1307
+  xy: 1581, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1649, 1307
+  xy: 1615, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 667, 278
+  xy: 667, 312
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 667, 244
+  xy: 667, 278
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 667, 210
+  xy: 667, 244
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 667, 176
+  xy: 667, 210
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1217,7 +1217,7 @@ rubble-3-1
   index: -1
 spawn
   rotate: false
-  xy: 1853, 1341
+  xy: 1819, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1364,28 +1364,28 @@ conduit-top-6
   index: -1
 liquid-junction
   rotate: false
-  xy: 1589, 1477
+  xy: 1861, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1657, 1545
+  xy: 1623, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1691, 1579
+  xy: 1657, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1725, 1613
+  xy: 1691, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1413,84 +1413,84 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1861, 1749
+  xy: 1827, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1241, 1375
+  xy: 1241, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1275, 1409
+  xy: 1241, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1275, 1375
+  xy: 1275, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1309, 1409
+  xy: 1275, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1479, 1375
+  xy: 1479, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1513, 1409
+  xy: 1479, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1513, 1375
+  xy: 1513, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1547, 1409
+  xy: 1513, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1547, 1375
+  xy: 1547, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1581, 1409
+  xy: 1547, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1581, 1375
+  xy: 1581, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1651,7 +1651,7 @@ fusion-reactor-top
   index: -1
 power-node
   rotate: false
-  xy: 1411, 1409
+  xy: 1377, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1665,28 +1665,28 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 1411, 1375
+  xy: 1411, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1445, 1409
+  xy: 1411, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 1445, 1375
+  xy: 1445, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 1479, 1409
+  xy: 1445, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1700,14 +1700,14 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1751, 1375
+  xy: 1751, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1581, 1341
+  xy: 1547, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1910,42 +1910,42 @@ incinerator
   index: -1
 item-source
   rotate: false
-  xy: 1759, 1715
+  xy: 1725, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1623, 1545
+  xy: 1589, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lavasmelter
   rotate: false
-  xy: 1725, 1647
+  xy: 1691, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 1793, 1681
+  xy: 1759, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1895, 1783
+  xy: 1861, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 1657, 1477
+  xy: 1929, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1987,14 +1987,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1615, 1409
+  xy: 1581, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1615, 1375
+  xy: 1615, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2008,14 +2008,14 @@ pyratite-mixer
   index: -1
 separator
   rotate: false
-  xy: 1989, 1409
+  xy: 1955, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 1989, 1375
+  xy: 1989, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2029,14 +2029,14 @@ silicon-smelter
   index: -1
 smelter
   rotate: false
-  xy: 1309, 1341
+  xy: 1275, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 1615, 1341
+  xy: 1581, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2078,14 +2078,14 @@ launch-pad
   index: -1
 sortedunloader
   rotate: false
-  xy: 1649, 1341
+  xy: 1615, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 667, 312
+  xy: 1049, 1223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2274,21 +2274,21 @@ salvo-panel-right
   index: -1
 scatter
   rotate: false
-  xy: 1887, 1375
+  xy: 1887, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 1921, 1409
+  xy: 1887, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 1921, 1375
+  xy: 1921, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2456,14 +2456,14 @@ reconstructor-open
   index: -1
 repair-point
   rotate: false
-  xy: 1649, 1409
+  xy: 1615, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-turret
   rotate: false
-  xy: 1649, 1375
+  xy: 1649, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2596,7 +2596,7 @@ door-open
   index: -1
 phase-wall
   rotate: false
-  xy: 1377, 1375
+  xy: 1377, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2610,7 +2610,7 @@ phase-wall-large
   index: -1
 surge-wall
   rotate: false
-  xy: 1275, 1307
+  xy: 1241, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2624,7 +2624,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1547, 1307
+  xy: 1513, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2666,7 +2666,7 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 740, 681
+  xy: 740, 693
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -2820,7 +2820,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 1241, 1341
+  xy: 1207, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2834,7 +2834,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1049, 1223
+  xy: 1009, 1123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3947,770 +3947,770 @@ mech-icon-trident-ship
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 1827, 1681
+  xy: 1793, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 1861, 1715
+  xy: 1827, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 1895, 1749
+  xy: 1861, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 1929, 1783
+  xy: 1895, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 1691, 1511
+  xy: 1657, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 1725, 1545
+  xy: 1691, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 1759, 1579
+  xy: 1725, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 1793, 1613
+  xy: 1759, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 1827, 1647
+  xy: 1793, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 1861, 1681
+  xy: 1827, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 1895, 1715
+  xy: 1861, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 1929, 1749
+  xy: 1895, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 1963, 1783
+  xy: 1929, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 1691, 1477
+  xy: 1963, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 1725, 1511
+  xy: 1691, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 1759, 1545
+  xy: 1725, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 1793, 1579
+  xy: 1759, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 1827, 1613
+  xy: 1793, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 1861, 1647
+  xy: 1827, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 1895, 1681
+  xy: 1861, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 1929, 1715
+  xy: 1895, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 1963, 1749
+  xy: 1929, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 1997, 1783
+  xy: 1963, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 1725, 1477
+  xy: 1997, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 1759, 1511
+  xy: 1725, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 1793, 1545
+  xy: 1759, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 1827, 1579
+  xy: 1793, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 1861, 1613
+  xy: 1827, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 1895, 1647
+  xy: 1861, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 1929, 1681
+  xy: 1895, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 1963, 1715
+  xy: 1929, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 1997, 1749
+  xy: 1963, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 1759, 1477
+  xy: 1997, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 1793, 1511
+  xy: 1759, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 1827, 1545
+  xy: 1793, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 1861, 1579
+  xy: 1827, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 1895, 1613
+  xy: 1861, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 1929, 1647
+  xy: 1895, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 1963, 1681
+  xy: 1929, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 1997, 1715
+  xy: 1963, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 1793, 1477
+  xy: 1997, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 1827, 1511
+  xy: 1793, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 1861, 1545
+  xy: 1827, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 1895, 1579
+  xy: 1861, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 1929, 1613
+  xy: 1895, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 1963, 1647
+  xy: 1929, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 1997, 1681
+  xy: 1963, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 1827, 1477
+  xy: 1997, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 1861, 1511
+  xy: 1827, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 1895, 1545
+  xy: 1861, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 1929, 1579
+  xy: 1895, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 1963, 1613
+  xy: 1929, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 1997, 1647
+  xy: 1963, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 1861, 1477
+  xy: 1997, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 1895, 1511
+  xy: 1861, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 1929, 1545
+  xy: 1895, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 1963, 1579
+  xy: 1929, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 1997, 1613
+  xy: 1963, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 1895, 1477
+  xy: 1997, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 1929, 1511
+  xy: 1895, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 1963, 1545
+  xy: 1929, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 1997, 1579
+  xy: 1963, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 1929, 1477
+  xy: 1997, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 1963, 1511
+  xy: 1929, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 1997, 1545
+  xy: 1963, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 1963, 1477
+  xy: 1997, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 1997, 1511
+  xy: 1963, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 1997, 1477
+  xy: 1997, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 1215, 1443
+  xy: 1997, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 1249, 1443
+  xy: 1215, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 1283, 1443
+  xy: 1249, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 1317, 1443
+  xy: 1283, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 1351, 1443
+  xy: 1317, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 1385, 1443
+  xy: 1351, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 1419, 1443
+  xy: 1385, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 1453, 1443
+  xy: 1419, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 1487, 1443
+  xy: 1453, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 1521, 1443
+  xy: 1487, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 1555, 1443
+  xy: 1521, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 1589, 1443
+  xy: 1555, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 1623, 1443
+  xy: 1589, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 1657, 1443
+  xy: 1623, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 1691, 1443
+  xy: 1657, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 1725, 1443
+  xy: 1691, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 1759, 1443
+  xy: 1725, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 1793, 1443
+  xy: 1759, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 1827, 1443
+  xy: 1793, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 1861, 1443
+  xy: 1827, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 1895, 1443
+  xy: 1861, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 1929, 1443
+  xy: 1895, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 1963, 1443
+  xy: 1929, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 1997, 1443
+  xy: 1963, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 1207, 1409
+  xy: 1997, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 1207, 1375
+  xy: 1207, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 1819, 1375
+  xy: 1819, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 1853, 1409
+  xy: 1819, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 1853, 1375
+  xy: 1853, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 1887, 1409
+  xy: 1853, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 1445, 1341
+  xy: 1411, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 1479, 1341
+  xy: 1445, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 1513, 1341
+  xy: 1479, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 1547, 1341
+  xy: 1513, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 1717, 1341
+  xy: 1683, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 1751, 1341
+  xy: 1717, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 1785, 1341
+  xy: 1751, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 1819, 1341
+  xy: 1785, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge
   rotate: false
-  xy: 1309, 1307
+  xy: 1275, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge-1
   rotate: false
-  xy: 1343, 1307
+  xy: 1309, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge-2
   rotate: false
-  xy: 1377, 1307
+  xy: 1343, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-side
   rotate: false
-  xy: 1411, 1307
+  xy: 1377, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4771,156 +4771,149 @@ unit-icon-wraith
   orig: 48, 48
   offset: 0, 0
   index: -1
-item-bioglass
+item-biomatter
   rotate: false
   xy: 1589, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-biomatter
+item-blast-compound
   rotate: false
   xy: 1623, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-blast-compound
+item-coal
   rotate: false
   xy: 1657, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-coal
+item-copper
   rotate: false
   xy: 1691, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-copper
+item-dense-alloy
   rotate: false
   xy: 1725, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-dense-alloy
+item-graphite
   rotate: false
   xy: 1759, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-graphite
+item-lead
   rotate: false
   xy: 1793, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-lead
+item-metaglass
   rotate: false
   xy: 1521, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-metaglass
+item-phase-fabric
   rotate: false
   xy: 1555, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-phase-fabric
+item-plastanium
   rotate: false
   xy: 1589, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-plastanium
+item-pyratite
   rotate: false
   xy: 1623, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-pyratite
+item-sand
   rotate: false
   xy: 1657, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-sand
+item-silicon
   rotate: false
   xy: 1691, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-silicon
-  rotate: false
-  xy: 1725, 1681
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 item-stone
   rotate: false
-  xy: 1793, 1749
+  xy: 1759, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1827, 1783
+  xy: 1793, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1555, 1477
+  xy: 1827, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1589, 1511
+  xy: 1555, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1861, 1783
+  xy: 1827, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1623, 1511
+  xy: 1589, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1759, 1647
+  xy: 1725, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1827, 1715
+  xy: 1793, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5169,28 +5162,28 @@ button-select
   index: -1
 check-off
   rotate: false
-  xy: 302, 77
+  xy: 271, 76
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on
   rotate: false
-  xy: 332, 77
+  xy: 301, 77
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 362, 77
+  xy: 331, 77
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 392, 77
+  xy: 361, 77
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
@@ -5267,28 +5260,28 @@ icon-power
   index: -1
 icon-production
   rotate: false
-  xy: 440, 93
+  xy: 409, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 476, 93
+  xy: 445, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 494, 93
+  xy: 463, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 512, 93
+  xy: 481, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5442,35 +5435,35 @@ icon-dev-builds
   index: -1
 icon-discord
   rotate: false
-  xy: 422, 77
+  xy: 391, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 548, 95
+  xy: 517, 95
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 438, 77
+  xy: 407, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 564, 95
+  xy: 533, 95
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 454, 77
+  xy: 423, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5491,7 +5484,7 @@ icon-eraser
   index: -1
 icon-exit
   rotate: false
-  xy: 580, 95
+  xy: 549, 95
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5512,7 +5505,7 @@ icon-file-image
   index: -1
 icon-file-text
   rotate: false
-  xy: 470, 77
+  xy: 439, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5526,7 +5519,7 @@ icon-fill
   index: -1
 icon-floppy
   rotate: false
-  xy: 596, 95
+  xy: 565, 95
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5540,14 +5533,14 @@ icon-floppy-16
   index: -1
 icon-folder
   rotate: false
-  xy: 486, 77
+  xy: 455, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 612, 95
+  xy: 581, 95
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5561,14 +5554,14 @@ icon-generated
   index: -1
 icon-github
   rotate: false
-  xy: 502, 77
+  xy: 471, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 518, 77
+  xy: 597, 95
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5589,42 +5582,42 @@ icon-hold
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 606, 1832
+  xy: 801, 825
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 534, 77
+  xy: 613, 95
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 550, 79
+  xy: 487, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 618, 1832
+  xy: 606, 1832
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 566, 79
+  xy: 503, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 210, 4
+  xy: 618, 1832
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5645,21 +5638,21 @@ icon-line
   index: -1
 icon-link
   rotate: false
-  xy: 582, 79
+  xy: 519, 79
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 222, 4
+  xy: 789, 723
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 598, 79
+  xy: 535, 79
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5694,35 +5687,35 @@ icon-locked
   index: -1
 icon-logic
   rotate: false
-  xy: 234, 4
+  xy: 210, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 614, 79
+  xy: 551, 79
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 246, 4
+  xy: 222, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 422, 93
+  xy: 391, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-missing
   rotate: false
-  xy: 258, 4
+  xy: 234, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5736,35 +5729,35 @@ icon-mission-background
   index: -1
 icon-mission-battle
   rotate: false
-  xy: 909, 1105
+  xy: 246, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-defense
   rotate: false
-  xy: 909, 1093
+  xy: 258, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-done
   rotate: false
-  xy: 909, 1081
+  xy: 909, 1105
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 909, 1069
+  xy: 909, 1093
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 752, 701
+  xy: 801, 815
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5778,7 +5771,7 @@ icon-paste
   index: -1
 icon-pause
   rotate: false
-  xy: 1009, 1111
+  xy: 909, 1081
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5792,7 +5785,7 @@ icon-pencil
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 630, 80
+  xy: 567, 79
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5806,35 +5799,35 @@ icon-pick
   index: -1
 icon-play
   rotate: false
-  xy: 1021, 1111
+  xy: 909, 1069
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 646, 80
+  xy: 583, 79
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 1033, 1111
+  xy: 1009, 1111
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 636, 1840
+  xy: 1021, 1111
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 662, 80
+  xy: 599, 79
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5848,14 +5841,14 @@ icon-redo
   index: -1
 icon-refresh
   rotate: false
-  xy: 678, 80
+  xy: 615, 79
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 789, 799
+  xy: 631, 80
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5869,35 +5862,35 @@ icon-resize
   index: -1
 icon-rotate
   rotate: false
-  xy: 789, 783
+  xy: 647, 80
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 789, 767
+  xy: 789, 799
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 789, 751
+  xy: 789, 783
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 789, 735
+  xy: 789, 767
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 729, 636
+  xy: 789, 751
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5911,14 +5904,14 @@ icon-save-image
   index: -1
 icon-save-map
   rotate: false
-  xy: 458, 93
+  xy: 427, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 741, 711
+  xy: 1033, 1111
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5932,28 +5925,28 @@ icon-terrain
   index: -1
 icon-tools
   rotate: false
-  xy: 801, 901
+  xy: 789, 735
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 753, 711
+  xy: 636, 1840
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 740, 699
+  xy: 741, 711
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 801, 885
+  xy: 729, 636
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5967,14 +5960,14 @@ icon-trash-16
   index: -1
 icon-trello
   rotate: false
-  xy: 801, 869
+  xy: 801, 901
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 801, 853
+  xy: 801, 885
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5995,28 +5988,28 @@ icon-unlocked
   index: -1
 icon-unlocks
   rotate: false
-  xy: 801, 837
+  xy: 801, 869
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 801, 821
+  xy: 801, 853
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 530, 93
+  xy: 499, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 789, 719
+  xy: 801, 837
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6093,14 +6086,14 @@ scroll-knob-vertical-black
   index: -1
 sector-edge
   rotate: false
-  xy: 1955, 1409
+  xy: 1921, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sector-select
   rotate: false
-  xy: 1955, 1375
+  xy: 1955, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6121,21 +6114,21 @@ slider
   index: -1
 slider-knob
   rotate: false
-  xy: 667, 136
+  xy: 667, 170
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 667, 96
+  xy: 667, 130
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 271, 70
+  xy: 667, 90
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 9e4c11af19..4681388e83 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/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java
index 03325d4dc6..3fad4e7458 100644
--- a/core/src/io/anuke/mindustry/content/Fx.java
+++ b/core/src/io/anuke/mindustry/content/Fx.java
@@ -24,14 +24,15 @@ public class Fx implements ContentList{
     vtolHover, unitDrop, unitPickup, unitLand, pickup, healWave, heal, landShock, reactorsmoke, nuclearsmoke, nuclearcloud,
     redgeneratespark, generatespark, fuelburn, plasticburn, pulverize, pulverizeRed, pulverizeRedder, pulverizeSmall, pulverizeMedium,
     producesmoke, smeltsmoke, formsmoke, blastsmoke, lava, doorclose, dooropen, dooropenlarge, doorcloselarge, purify, purifyoil, purifystone, generate,
-    mine, mineBig, mineHuge, smelt, teleportActivate, teleport, teleportOut, ripple, bubble, commandSend,
+    mine, mineBig, mineHuge, smelt, teleportActivate, teleport, teleportOut, ripple, bubble, launch,
     healBlock, healBlockFull, healWaveMend, overdriveWave, overdriveBlockFull, shieldBreak, hitBulletSmall, hitFuse,
     hitBulletBig, hitFlameSmall, hitLiquid, hitLaser, hitLancer, hitMeltdown, despawn, flakExplosion, blastExplosion,
     plasticExplosion, artilleryTrail, incendTrail, missileTrail, absorb, flakExplosionBig, plasticExplosionFlak, burning, fire,
     fireSmoke, steam, fireballsmoke, ballfire, freezing, melting, wet, oily, overdriven, dropItem, shockwave,
     bigShockwave, nuclearShockwave, explosion, blockExplosion, blockExplosionSmoke, shootSmall, shootHeal, shootSmallSmoke, shootBig, shootBig2, shootBigSmoke,
     shootBigSmoke2, shootSmallFlame, shootLiquid, shellEjectSmall, shellEjectMedium,
-    shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot;
+    shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot,
+    launchFull;
 
     @Override
     public void load(){
@@ -1060,7 +1061,7 @@ public class Fx implements ContentList{
             Draw.reset();
         });
 
-        commandSend = new Effect(28, e -> {
+        launch = new Effect(28, e -> {
             Draw.color(Palette.command);
             Lines.stroke(e.fout() * 2f);
             Lines.poly(e.x, e.y, 40, 4f + e.finpow() * 120f);
@@ -1108,5 +1109,12 @@ public class Fx implements ContentList{
             Lines.poly(e.x, e.y, 6, e.rotation + e.fin(), 90);
             Draw.reset();
         });
+
+        launchFull = new Effect(60, 9999999999f, e -> {
+            Draw.color();
+            Draw.alpha(e.fslope());
+            Fill.rect(Core.camera.position.x, Core.camera.position.y, Core.camera.width + 10, Core.camera.height + 10);
+            Draw.reset();
+        });
     }
 }
diff --git a/core/src/io/anuke/mindustry/content/Liquids.java b/core/src/io/anuke/mindustry/content/Liquids.java
index 6ee2e641b9..8c6d8746f6 100644
--- a/core/src/io/anuke/mindustry/content/Liquids.java
+++ b/core/src/io/anuke/mindustry/content/Liquids.java
@@ -16,7 +16,7 @@ public class Liquids implements ContentList{
             effect = StatusEffects.wet;
         }};
 
-        slag = new Liquid("slag", Color.valueOf("e37341")){{
+        slag = new Liquid("slag", Color.valueOf("ffcd66")){{
             temperature = 1f;
             viscosity = 0.8f;
             tier = 2;
diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java
index 1d4d3b5153..647e41ac04 100644
--- a/core/src/io/anuke/mindustry/content/Weapons.java
+++ b/core/src/io/anuke/mindustry/content/Weapons.java
@@ -20,7 +20,7 @@ public class Weapons implements ContentList{
 
         blasterSmall = new Weapon("blaster"){{
             length = 1.5f;
-            reload = 15f;
+            reload = 20f;
             roundrobin = true;
             ejectEffect = Fx.shellEjectSmall;
             ammo = Bullets.standardCopper;
@@ -28,7 +28,7 @@ public class Weapons implements ContentList{
 
         glaiveBlaster = new Weapon("bomber"){{
             length = 1.5f;
-            reload = 10f;
+            reload = 13f;
             roundrobin = true;
             ejectEffect = Fx.shellEjectSmall;
             ammo = Bullets.standardGlaive;
@@ -54,7 +54,7 @@ public class Weapons implements ContentList{
 
         missiles = new Weapon("missiles"){{
             length = 1.5f;
-            reload = 60f;
+            reload = 70f;
             shots = 4;
             inaccuracy = 2f;
             roundrobin = true;
diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 1bddfb83cb..0ede955d33 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -18,6 +18,7 @@ public class Zones implements ContentList{
             deployCost = ItemStack.with(Items.copper, 100);
             startingItems = ItemStack.with(Items.copper, 50);
             alwaysUnlocked = true;
+            conditionWave = 10;
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java
index 7df856e83e..eec715bb6d 100644
--- a/core/src/io/anuke/mindustry/core/ContentLoader.java
+++ b/core/src/io/anuke/mindustry/core/ContentLoader.java
@@ -165,7 +165,7 @@ public class ContentLoader{
         }
 
         if(id >= contentMap[type.ordinal()].size || id < 0){
-            throw new RuntimeException("No " + type.name() + " with ID '" + id + "' found!");
+            return null;
         }
         return (T)contentMap[type.ordinal()].get(id);
     }
diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java
index 598a3a268e..97c7326e06 100644
--- a/core/src/io/anuke/mindustry/core/GameState.java
+++ b/core/src/io/anuke/mindustry/core/GameState.java
@@ -16,7 +16,7 @@ public class GameState{
     /**Wave countdown in ticks.*/
     public float wavetime;
     /**Whether the game is in game over state.*/
-    public boolean gameOver = false;
+    public boolean gameOver = false, launched = false;
     /**The current game rules.*/
     public Rules rules = new Rules();
     /**Statistics for this save/game. Displayed after game over.*/
@@ -38,7 +38,7 @@ public class GameState{
     }
 
     public boolean isPaused(){
-        return is(State.paused) && !Net.active();
+        return (is(State.paused) || gameOver) && !Net.active();
     }
 
     public boolean is(State astate){
diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java
index e532a9fa57..657c0f1411 100644
--- a/core/src/io/anuke/mindustry/core/Logic.java
+++ b/core/src/io/anuke/mindustry/core/Logic.java
@@ -62,7 +62,7 @@ public class Logic implements ApplicationListener{
     public void reset(){
         state.wave = 1;
         state.wavetime = state.rules.waveSpacing;
-        state.gameOver = false;
+        state.gameOver = state.launched = false;
         state.teams = new Teams();
         state.rules = new Rules();
         state.stats = new Stats();
diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java
index d72d4c7a4d..83091cd07c 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/io/anuke/mindustry/core/World.java
@@ -5,17 +5,21 @@ import io.anuke.arc.Core;
 import io.anuke.arc.Events;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.IntArray;
+import io.anuke.arc.collection.ObjectSet.ObjectSetIterator;
+import io.anuke.arc.entities.Effects;
 import io.anuke.arc.entities.EntityQuery;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Point2;
 import io.anuke.arc.util.Log;
 import io.anuke.arc.util.Structs;
+import io.anuke.arc.util.Time;
 import io.anuke.arc.util.Tmp;
 import io.anuke.mindustry.ai.BlockIndexer;
 import io.anuke.mindustry.ai.Pathfinder;
 import io.anuke.mindustry.ai.WaveSpawner;
 import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
@@ -27,6 +31,7 @@ import io.anuke.mindustry.maps.MapTileData.TileDataMarker;
 import io.anuke.mindustry.maps.Maps;
 import io.anuke.mindustry.maps.generators.Generator;
 import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.Zone;
 import io.anuke.mindustry.world.Block;
@@ -195,6 +200,24 @@ public class World implements ApplicationListener{
         return generating;
     }
 
+    public void launchZone(){
+        Effects.effect(Fx.launchFull, 0, 0);
+
+        for(Tile tile : new ObjectSetIterator<>(state.teams.get(defaultTeam).cores)){
+            Effects.effect(Fx.launch, tile);
+        }
+
+        Time.runTask(30f, () -> {
+            for(Tile tile : new ObjectSetIterator<>(state.teams.get(defaultTeam).cores)){
+                for(Item item : content.items()){
+                    data.addItem(item, tile.entity.items.get(item));
+                }
+                world.removeBlock(tile);
+            }
+            state.launched = true;
+        });
+    }
+
     public boolean isZone(){
         return getZone() != null;
     }
diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java
index 4353dfa0fc..a3a4f06cff 100644
--- a/core/src/io/anuke/mindustry/type/Zone.java
+++ b/core/src/io/anuke/mindustry/type/Zone.java
@@ -26,7 +26,7 @@ public class Zone extends UnlockableContent{
 
     /**Whether this zone has met its condition; if true, the player can leave.*/
     public boolean metCondition(){
-        return state.wave > conditionWave;
+        return state.wave >= conditionWave;
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java
index cc0c7454b8..0d0dfb3d34 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java
@@ -22,6 +22,7 @@ public class GameOverDialog extends FloatingDialog{
     }
 
     void rebuild(){
+        title.setText(state.launched ? "$launch.title" : "$gameover");
         buttons.clear();
         cont.clear();
 
@@ -56,7 +57,7 @@ public class GameOverDialog extends FloatingDialog{
                     cont.add("$stat.delivered");
                     cont.row();
                     for(Item item : content.items()){
-                        if(state.stats.itemsDelivered.containsKey(item)){
+                        if(state.stats.itemsDelivered.get(item, 0) > 0){
                             cont.table(items -> {
                                 items.add("    [LIGHT_GRAY]" + state.stats.itemsDelivered.get(item, 0));
                                 items.addImage(item.region).size(8 *3).pad(4);
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java
deleted file mode 100644
index 95b5cb6ec9..0000000000
--- a/core/src/io/anuke/mindustry/ui/fragments/BlockConsumeFragment.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package io.anuke.mindustry.ui.fragments;
-
-import io.anuke.arc.Core;
-import io.anuke.arc.collection.ObjectSet;
-import io.anuke.arc.graphics.Color;
-import io.anuke.arc.math.geom.Vector2;
-import io.anuke.arc.scene.Element;
-import io.anuke.arc.scene.Group;
-import io.anuke.arc.scene.ui.layout.Table;
-import io.anuke.arc.util.Align;
-import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.entities.TileEntity;
-import io.anuke.mindustry.graphics.Palette;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
-import io.anuke.mindustry.world.consumers.Consume;
-
-import static io.anuke.mindustry.Vars.*;
-
-public class BlockConsumeFragment extends Fragment{
-    private Table table;
-    private Tile lastTile;
-    private boolean visible;
-
-    @Override
-    public void build(Group parent){
-        table = new Table();
-        table.visible(() -> !state.is(State.menu) && visible);
-        table.setTransform(true);
-
-        parent.addChild(new Element(){{update(() -> {
-            if(!Core.scene.hasMouse()){
-                Tile tile = world.tileWorld(Core.input.mouseWorld().x, Core.input.mouseWorld().y);
-                if(tile == null) return;
-                tile = tile.target();
-
-                if(tile != lastTile){
-                    if(tile.getTeam() == players[0].getTeam() && tile.block().consumes.hasAny()){
-                        show(tile);
-                    }else if(visible){
-                        hide();
-                    }
-                    lastTile = tile;
-                }
-            }
-        });}});
-
-        parent.setTransform(true);
-        parent.addChild(table);
-    }
-
-    public void show(Tile tile){
-        ObjectSet<Consume> consumers = new ObjectSet<>();
-        TileEntity entity = tile.entity;
-        Block block = tile.block();
-
-        table.clearChildren();
-
-        rebuild(block, entity);
-        visible = true;
-
-        table.update(() -> {
-
-            if(tile.entity == null || state.is(State.menu)){
-                hide();
-                return;
-            }
-
-            boolean rebuild = false;
-
-            for(Consume c : block.consumes.array()){
-                boolean valid = c.isOptional() || c.valid(block, entity);
-
-                if(consumers.contains(c) == valid){
-                    if(valid){
-                        consumers.remove(c);
-                    }else{
-                        consumers.add(c);
-                    }
-                    rebuild = true;
-                }
-            }
-
-            if(rebuild){
-                rebuild(block, entity);
-            }
-
-            Vector2 v = Core.input.mouseScreen(tile.drawx() - tile.block().size * tilesize / 2f + 0.25f, tile.drawy() + tile.block().size * tilesize / 2f);
-            table.pack();
-            table.setPosition(v.x, v.y, Align.topRight);
-        });
-
-        table.act(Core.graphics.getDeltaTime());
-    }
-
-    public void hide(){
-        table.clear();
-        table.update(() -> {});
-        visible = false;
-    }
-
-    private void rebuild(Block block, TileEntity entity){
-        table.clearChildren();
-        table.left();
-
-        int scale = mobile ? 4 : 3;
-
-        for(Consume c : block.consumes.array()){
-            if(!c.isOptional() && !c.valid(block, entity)){
-                boolean[] hovered = {false};
-
-                table.table("inventory", c::buildTooltip).visible(() -> hovered[0]).height(scale * 10 + 6).padBottom(-4).right().update(t -> {
-                    if(t.getChildren().size == 0) t.remove();
-                }).get().act(0);
-
-                Table result = table.table(out -> {
-                    out.addImage(c.getIcon()).size(10 * scale).color(Color.DARK_GRAY).padRight(-10 * scale).padBottom(-scale * 2);
-                    out.addImage(c.getIcon()).size(10 * scale).color(Palette.accent);
-                    out.addImage("icon-missing").size(10 * scale).color(Palette.remove).padLeft(-10 * scale);
-                }).size(10 * scale).get();
-
-                result.hovered(() -> hovered[0] = true);
-                if(!mobile){
-                    result.exited(() -> hovered[0] = false);
-                }
-
-                table.row();
-            }
-        }
-    }
-}
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 17e46b96a6..3cc43c86e8 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -196,6 +196,9 @@ public class HudFragment extends Fragment{
                 .update(label -> label.getColor().set(Color.ORANGE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 2f, 1f))));
         });
 
+        parent.fill(t -> t.top().right().addRowImageTextButton("$launch", "icon-arrow-up", 8*3, () -> world.launchZone())
+            .size(94f, 70f).visible(() -> world.isZone() && world.getZone().metCondition()));
+
         //'saving' indicator
         parent.fill(t -> {
             t.bottom().visible(() -> !state.is(State.menu) && control.saves.isSaving());
diff --git a/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java b/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java
index 89ea27ab5e..f69986634d 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/OverlayFragment.java
@@ -3,20 +3,16 @@ package io.anuke.mindustry.ui.fragments;
 import io.anuke.mindustry.input.InputHandler;
 import io.anuke.arc.scene.Group;
 
-/**
- * Fragment for displaying overlays such as block inventories. One is created for each input handler.
- */
+/**Fragment for displaying overlays such as block inventories. One is created for each input handler.*/
 public class OverlayFragment extends Fragment{
     public final BlockInventoryFragment inv;
     public final BlockConfigFragment config;
-    public final BlockConsumeFragment consume;
 
     private Group group = new Group();
 
     public OverlayFragment(InputHandler input){
         inv = new BlockInventoryFragment(input);
         config = new BlockConfigFragment(input);
-        consume = new BlockConsumeFragment();
     }
 
     @Override
@@ -26,9 +22,6 @@ public class OverlayFragment extends Fragment{
 
         inv.build(group);
         config.build(group);
-        consume.build(group);
-
-        //input.buildUI(group);
     }
 
     public void remove(){