diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties
index ae501a61b5..a9c2e0f02c 100644
--- a/annotations/src/main/resources/classids.properties
+++ b/annotations/src/main/resources/classids.properties
@@ -8,5 +8,6 @@ mindustry.entities.AllEntities.GroundEffectDef=9
 mindustry.entities.AllEntities.EffectDef=2
 mindustry.entities.AllEntities.GenericUnitDef=5
 mindustry.entities.AllEntities.TileDef=3
+vanguard=10
 dagger2=8
 mindustry.entities.AllEntities.DecalDef=1
\ No newline at end of file
diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png b/core/assets-raw/sprites/units/alpha-base.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png
rename to core/assets-raw/sprites/units/alpha-base.png
diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png b/core/assets-raw/sprites/units/alpha-leg.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png
rename to core/assets-raw/sprites/units/alpha-leg.png
diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png b/core/assets-raw/sprites/units/alpha.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/alpha-mech.png
rename to core/assets-raw/sprites/units/alpha.png
diff --git a/core/assets-raw/sprites/mechs/ships/dart-ship.png b/core/assets-raw/sprites/units/dart.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/ships/dart-ship.png
rename to core/assets-raw/sprites/units/dart.png
diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png b/core/assets-raw/sprites/units/delta-base.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/delta-mech-base.png
rename to core/assets-raw/sprites/units/delta-base.png
diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png b/core/assets-raw/sprites/units/delta-leg.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png
rename to core/assets-raw/sprites/units/delta-leg.png
diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech.png b/core/assets-raw/sprites/units/delta.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/delta-mech.png
rename to core/assets-raw/sprites/units/delta.png
diff --git a/core/assets-raw/sprites/mechs/ships/glaive-ship.png b/core/assets-raw/sprites/units/glaive.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/ships/glaive-ship.png
rename to core/assets-raw/sprites/units/glaive.png
diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png b/core/assets-raw/sprites/units/javelin-shield.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png
rename to core/assets-raw/sprites/units/javelin-shield.png
diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship.png b/core/assets-raw/sprites/units/javelin.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/ships/javelin-ship.png
rename to core/assets-raw/sprites/units/javelin.png
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png b/core/assets-raw/sprites/units/omega-armor.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png
rename to core/assets-raw/sprites/units/omega-armor.png
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png b/core/assets-raw/sprites/units/omega-base.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/omega-mech-base.png
rename to core/assets-raw/sprites/units/omega-base.png
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png b/core/assets-raw/sprites/units/omega-leg.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png
rename to core/assets-raw/sprites/units/omega-leg.png
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech.png b/core/assets-raw/sprites/units/omega.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/omega-mech.png
rename to core/assets-raw/sprites/units/omega.png
diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png b/core/assets-raw/sprites/units/tau-base.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/tau-mech-base.png
rename to core/assets-raw/sprites/units/tau-base.png
diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png b/core/assets-raw/sprites/units/tau-leg.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png
rename to core/assets-raw/sprites/units/tau-leg.png
diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech.png b/core/assets-raw/sprites/units/tau.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/mechs/tau-mech.png
rename to core/assets-raw/sprites/units/tau.png
diff --git a/core/assets-raw/sprites/mechs/ships/trident-ship.png b/core/assets-raw/sprites/units/trident.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/ships/trident-ship.png
rename to core/assets-raw/sprites/units/trident.png
diff --git a/core/assets-raw/sprites/mechs/ships/vanguard-ship.png b/core/assets-raw/sprites/units/vanguard.png
similarity index 100%
rename from core/assets-raw/sprites/mechs/ships/vanguard-ship.png
rename to core/assets-raw/sprites/units/vanguard.png
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index db21569368..2cc018a6f3 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -20,7 +20,7 @@ mend-projector-top
   index: -1
 mender-top
   rotate: false
-  xy: 1243, 71
+  xy: 1262, 1063
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -34,35 +34,35 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1265, 785
+  xy: 1284, 893
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1916, 979
+  xy: 1130, 1125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1984, 961
+  xy: 1148, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1984, 927
+  xy: 1148, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1576, 995
+  xy: 1163, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -132,350 +132,350 @@ armored-conveyor-1-3
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 1012, 927
+  xy: 1758, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 1012, 893
+  xy: 1012, 927
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 489, 3
+  xy: 1012, 893
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 523, 3
+  xy: 489, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 557, 3
+  xy: 523, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 591, 3
+  xy: 557, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 625, 3
+  xy: 591, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 1792, 1071
+  xy: 625, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 1758, 1045
+  xy: 1792, 1071
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 1792, 1037
+  xy: 1758, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 2009, 1573
+  xy: 1792, 1037
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 2009, 1539
+  xy: 1792, 1003
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1122, 989
+  xy: 1211, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1130, 1091
+  xy: 1211, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1130, 1125
+  xy: 1219, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1148, 955
+  xy: 1219, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1148, 921
+  xy: 1219, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1148, 887
+  xy: 1219, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1148, 853
+  xy: 1156, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1148, 819
+  xy: 1156, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1163, 785
+  xy: 1160, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1163, 751
+  xy: 1164, 1091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1163, 717
+  xy: 1198, 1091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1163, 683
+  xy: 1194, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1163, 649
+  xy: 1190, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1163, 615
+  xy: 1190, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1163, 581
+  xy: 1182, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1181, 547
+  xy: 1182, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1181, 513
+  xy: 1182, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1181, 479
+  xy: 1182, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1209, 445
+  xy: 1182, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1265, 717
+  xy: 1318, 927
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1265, 683
+  xy: 1284, 859
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1265, 649
+  xy: 1386, 961
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1265, 615
+  xy: 1352, 927
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1265, 581
+  xy: 1318, 893
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1283, 547
+  xy: 1284, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1283, 513
+  xy: 1386, 927
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1283, 479
+  xy: 1352, 893
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1262, 1029
+  xy: 1318, 859
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1296, 1029
+  xy: 1386, 893
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1330, 1029
+  xy: 1352, 859
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1364, 1029
+  xy: 1318, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1398, 1029
+  xy: 1386, 859
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1258, 995
+  xy: 1352, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1292, 995
+  xy: 1386, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1326, 995
+  xy: 1299, 791
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1360, 995
+  xy: 1299, 757
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1394, 995
+  xy: 1333, 791
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1284, 961
+  xy: 1299, 723
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -489,28 +489,28 @@ mass-driver-base
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1277, 445
+  xy: 1398, 1063
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1277, 411
+  xy: 1250, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1277, 377
+  xy: 1250, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 1284, 893
+  xy: 1333, 757
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -685,28 +685,28 @@ water-extractor-top
   index: -1
 block-border
   rotate: false
-  xy: 1046, 973
+  xy: 1826, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1113, 513
+  xy: 1061, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1143, 309
+  xy: 1141, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1814, 927
+  xy: 1181, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -832,175 +832,175 @@ rubble-8-1
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1950, 979
+  xy: 1148, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1950, 979
+  xy: 1148, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1916, 945
+  xy: 1148, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1950, 945
+  xy: 1148, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1644, 987
+  xy: 1163, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1678, 987
+  xy: 1163, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1712, 961
+  xy: 1163, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1746, 943
+  xy: 1163, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1746, 943
+  xy: 1163, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1746, 943
+  xy: 1163, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1746, 943
+  xy: 1163, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1780, 935
+  xy: 1163, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1848, 927
+  xy: 1181, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1882, 919
+  xy: 1181, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1916, 911
+  xy: 1209, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1950, 911
+  xy: 1209, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1950, 911
+  xy: 1209, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1984, 893
+  xy: 1209, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1126, 1057
+  xy: 1211, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1122, 1023
+  xy: 1211, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1243, 377
+  xy: 1287, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1245, 343
+  xy: 1311, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1245, 309
+  xy: 1311, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1245, 275
+  xy: 1243, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1245, 241
+  xy: 1277, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1028,119 +1028,119 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1243, 37
+  xy: 1296, 1063
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1277, 71
+  xy: 1330, 1063
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1277, 37
+  xy: 1364, 1063
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1279, 343
+  xy: 1250, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1279, 309
+  xy: 1250, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1279, 275
+  xy: 1250, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1279, 241
+  xy: 1265, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1287, 207
+  xy: 1265, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1287, 173
+  xy: 1265, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1287, 139
+  xy: 1265, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1287, 105
+  xy: 1265, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1311, 37
+  xy: 1265, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1243, 3
+  xy: 1283, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1277, 3
+  xy: 1283, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1311, 3
+  xy: 1283, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1228, 1057
+  xy: 1262, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1224, 1023
+  xy: 1296, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1161,14 +1161,14 @@ block-alpha-mech-pad-full
   index: -1
 battery
   rotate: false
-  xy: 257, 11
+  xy: 2009, 1573
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-battery-full
   rotate: false
-  xy: 257, 11
+  xy: 2009, 1573
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1189,7 +1189,7 @@ block-battery-large-full
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1610, 995
+  xy: 1163, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1210,14 +1210,14 @@ differential-generator-top
   index: -1
 diode-arrow
   rotate: false
-  xy: 1219, 139
+  xy: 1215, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1160, 1057
+  xy: 1216, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1273,14 +1273,14 @@ impact-reactor-plasma-3
   index: -1
 power-source
   rotate: false
-  xy: 1311, 71
+  xy: 1265, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1398, 1063
+  xy: 1326, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1427,21 +1427,21 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1224, 989
+  xy: 1330, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1262, 1063
+  xy: 1364, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1296, 1063
+  xy: 1398, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1504,7 +1504,7 @@ spore-press-top
   index: -1
 unloader-center
   rotate: false
-  xy: 1284, 859
+  xy: 1299, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1518,7 +1518,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 1096, 1091
+  xy: 2009, 1539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1595,7 +1595,7 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 1250, 921
+  xy: 1394, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1721,7 +1721,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1364, 1063
+  xy: 1292, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1770,14 +1770,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1219, 105
+  xy: 1215, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 insulator-wall
   rotate: false
-  xy: 1164, 1091
+  xy: 1216, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1833,28 +1833,28 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1250, 887
+  xy: 1284, 961
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1250, 853
+  xy: 1284, 927
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1250, 819
+  xy: 1318, 961
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1250, 819
+  xy: 1318, 961
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1875,7 +1875,7 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 1984, 995
+  xy: 2039, 1771
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -1959,35 +1959,35 @@ scale_marker
   index: -1
 scorch1
   rotate: false
-  xy: 1318, 893
+  xy: 1678, 953
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 1348, 893
+  xy: 1299, 587
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 1378, 893
+  xy: 1311, 377
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 2018, 893
+  xy: 1313, 275
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 1408, 893
+  xy: 1420, 893
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
@@ -2008,7 +2008,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 1265, 751
+  xy: 1352, 961
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2022,7 +2022,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1284, 927
+  xy: 1367, 791
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2050,7 +2050,7 @@ arc
   index: -1
 block-arc-full
   rotate: false
-  xy: 1054, 1007
+  xy: 257, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2064,42 +2064,42 @@ block-blast-drill-full
   index: -1
 block-bridge-conduit-full
   rotate: false
-  xy: 1046, 939
+  xy: 1860, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1046, 939
+  xy: 1860, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-bridge-conveyor-full
   rotate: false
-  xy: 1046, 905
+  xy: 1826, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1046, 905
+  xy: 1826, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-char-full
   rotate: false
-  xy: 2009, 1505
+  xy: 1860, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 2001, 1471
+  xy: 1894, 1021
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2120,14 +2120,14 @@ coal-centrifuge
   index: -1
 block-combustion-generator-full
   rotate: false
-  xy: 2001, 1437
+  xy: 1894, 987
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 2001, 1437
+  xy: 1894, 987
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2148,7 +2148,7 @@ command-center
   index: -1
 block-conduit-full
   rotate: false
-  xy: 2001, 1403
+  xy: 1096, 1091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2169,28 +2169,28 @@ container
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 1092, 1057
+  xy: 1054, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1092, 1057
+  xy: 1054, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-full
   rotate: false
-  xy: 1088, 1023
+  xy: 1046, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 1088, 1023
+  xy: 1046, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2253,7 +2253,7 @@ core-shard
   index: -1
 block-craters-full
   rotate: false
-  xy: 1088, 989
+  xy: 1046, 939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2295,70 +2295,70 @@ block-dagger-factory-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 1080, 955
+  xy: 1046, 905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-1-full
   rotate: false
-  xy: 1080, 921
+  xy: 2009, 1505
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-2-full
   rotate: false
-  xy: 1080, 887
+  xy: 2001, 1471
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-3-full
   rotate: false
-  xy: 1046, 871
+  xy: 2001, 1437
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-4-full
   rotate: false
-  xy: 1012, 859
+  xy: 2001, 1403
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-5-full
   rotate: false
-  xy: 1080, 853
+  xy: 1092, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-6-full
   rotate: false
-  xy: 1046, 837
+  xy: 1088, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 1080, 819
+  xy: 1088, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-full
   rotate: false
-  xy: 993, 825
+  xy: 1080, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-water-full
   rotate: false
-  xy: 993, 791
+  xy: 1080, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2379,7 +2379,7 @@ dart-ship-pad
   index: -1
 block-deepwater-full
   rotate: false
-  xy: 993, 757
+  xy: 1080, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2414,14 +2414,14 @@ differential-generator
   index: -1
 block-diode-full
   rotate: false
-  xy: 993, 723
+  xy: 1046, 871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode
   rotate: false
-  xy: 993, 723
+  xy: 1046, 871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2442,14 +2442,14 @@ distributor
   index: -1
 block-door-full
   rotate: false
-  xy: 993, 689
+  xy: 1012, 859
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 993, 689
+  xy: 1012, 859
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2477,14 +2477,14 @@ block-draug-factory-full
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 993, 655
+  xy: 1080, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 993, 621
+  xy: 1046, 837
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2554,70 +2554,70 @@ graphite-press
   index: -1
 block-grass-full
   rotate: false
-  xy: 993, 587
+  xy: 1080, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hail-full
   rotate: false
-  xy: 1027, 803
+  xy: 993, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1027, 769
+  xy: 993, 791
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 1027, 735
+  xy: 993, 757
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 1027, 701
+  xy: 993, 723
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 1027, 667
+  xy: 993, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 1027, 633
+  xy: 993, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 1027, 599
+  xy: 993, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-illuminator-full
   rotate: false
-  xy: 1061, 785
+  xy: 993, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1061, 785
+  xy: 993, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2631,56 +2631,56 @@ block-impact-reactor-full
   index: -1
 block-incinerator-full
   rotate: false
-  xy: 1061, 751
+  xy: 1027, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 1061, 751
+  xy: 1027, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-inverted-sorter-full
   rotate: false
-  xy: 1061, 717
+  xy: 1027, 769
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1061, 717
+  xy: 1027, 769
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-source-full
   rotate: false
-  xy: 1061, 683
+  xy: 1027, 735
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1061, 683
+  xy: 1027, 735
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-void-full
   rotate: false
-  xy: 1061, 649
+  xy: 1027, 701
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1061, 649
+  xy: 1027, 701
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2701,14 +2701,14 @@ javelin-ship-pad
   index: -1
 block-junction-full
   rotate: false
-  xy: 1061, 615
+  xy: 1027, 667
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1061, 615
+  xy: 1027, 667
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2771,35 +2771,35 @@ launch-pad-large
   index: -1
 block-liquid-junction-full
   rotate: false
-  xy: 1095, 785
+  xy: 1027, 633
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1095, 785
+  xy: 1027, 633
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 1095, 751
+  xy: 1027, 599
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-source-full
   rotate: false
-  xy: 1095, 717
+  xy: 1061, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 1095, 717
+  xy: 1061, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2813,21 +2813,21 @@ block-liquid-tank-full
   index: -1
 block-liquid-void-full
   rotate: false
-  xy: 1095, 683
+  xy: 1061, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1095, 683
+  xy: 1061, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 1095, 649
+  xy: 1061, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2848,14 +2848,14 @@ block-mechanical-drill-full
   index: -1
 block-mechanical-pump-full
   rotate: false
-  xy: 1095, 615
+  xy: 1061, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1095, 615
+  xy: 1061, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2869,14 +2869,14 @@ block-meltdown-full
   index: -1
 block-melter-full
   rotate: false
-  xy: 1061, 581
+  xy: 1061, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1061, 581
+  xy: 1061, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2897,70 +2897,70 @@ mend-projector
   index: -1
 block-mender-full
   rotate: false
-  xy: 1095, 581
+  xy: 1061, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender
   rotate: false
-  xy: 1095, 581
+  xy: 1061, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-message-full
   rotate: false
-  xy: 1027, 565
+  xy: 1095, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1027, 565
+  xy: 1095, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-2-full
   rotate: false
-  xy: 715, 1247
+  xy: 1095, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-3-full
   rotate: false
-  xy: 1079, 547
+  xy: 1095, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-5-full
   rotate: false
-  xy: 1079, 513
+  xy: 1095, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 1079, 479
+  xy: 1095, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-full
   rotate: false
-  xy: 1113, 547
+  xy: 1095, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1113, 479
+  xy: 1095, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3002,42 +3002,42 @@ omega-mech-pad
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 1508, 1025
+  xy: 1027, 565
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1542, 1025
+  xy: 715, 1247
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1576, 1029
+  xy: 1928, 979
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1610, 1029
+  xy: 1079, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1644, 1021
+  xy: 1079, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1678, 1021
+  xy: 1079, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3058,21 +3058,21 @@ overdrive-projector
   index: -1
 block-overflow-gate-full
   rotate: false
-  xy: 1712, 1029
+  xy: 1113, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 1712, 1029
+  xy: 1113, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1826, 1029
+  xy: 1113, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3086,42 +3086,42 @@ block-phantom-factory-full
   index: -1
 block-phase-conduit-full
   rotate: false
-  xy: 1860, 1029
+  xy: 1113, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1860, 1029
+  xy: 1113, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conveyor-full
   rotate: false
-  xy: 1894, 1021
+  xy: 1508, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1894, 1021
+  xy: 1508, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-full
   rotate: false
-  xy: 1114, 955
+  xy: 1542, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1114, 955
+  xy: 1542, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3170,14 +3170,14 @@ plastanium-compressor
   index: -1
 block-plastanium-wall-full
   rotate: false
-  xy: 1114, 921
+  xy: 1576, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1114, 921
+  xy: 1576, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3198,7 +3198,7 @@ plastanium-wall-large
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1114, 887
+  xy: 1610, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3212,14 +3212,14 @@ block-pneumatic-drill-full
   index: -1
 block-power-node-full
   rotate: false
-  xy: 1114, 853
+  xy: 1644, 1021
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 1114, 853
+  xy: 1644, 1021
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3240,35 +3240,35 @@ power-node-large
   index: -1
 block-power-source-full
   rotate: false
-  xy: 1114, 819
+  xy: 1114, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-void-full
   rotate: false
-  xy: 1129, 785
+  xy: 1114, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1129, 785
+  xy: 1114, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1129, 751
+  xy: 1114, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1129, 717
+  xy: 1114, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3289,7 +3289,7 @@ pyratite-mixer
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1129, 683
+  xy: 1114, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3317,7 +3317,7 @@ block-rock-full
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1129, 649
+  xy: 1129, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3338,14 +3338,14 @@ rotary-pump
   index: -1
 block-router-full
   rotate: false
-  xy: 1129, 615
+  xy: 1129, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1129, 615
+  xy: 1129, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3366,14 +3366,14 @@ rtg-generator
   index: -1
 block-salt-full
   rotate: false
-  xy: 1129, 581
+  xy: 1129, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1147, 547
+  xy: 1129, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3387,28 +3387,28 @@ block-salvo-full
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1147, 513
+  xy: 1129, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1147, 479
+  xy: 1129, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-water-full
   rotate: false
-  xy: 1141, 445
+  xy: 1129, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1141, 411
+  xy: 1147, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3422,21 +3422,21 @@ block-scatter-full
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1141, 377
+  xy: 1147, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1143, 343
+  xy: 1147, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1143, 343
+  xy: 1147, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3492,35 +3492,35 @@ separator
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1143, 275
+  xy: 1141, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1143, 241
+  xy: 1141, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1712, 995
+  xy: 1143, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shock-mine-full
   rotate: false
-  xy: 1746, 1011
+  xy: 1143, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1746, 977
+  xy: 1143, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3541,14 +3541,14 @@ silicon-smelter
   index: -1
 block-slag-full
   rotate: false
-  xy: 1780, 1003
+  xy: 1143, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 1780, 969
+  xy: 1175, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3569,21 +3569,21 @@ block-snowrock-full
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1814, 995
+  xy: 1175, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-solar-panel-full
   rotate: false
-  xy: 1848, 995
+  xy: 1175, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1848, 995
+  xy: 1175, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3604,21 +3604,21 @@ solar-panel-large
   index: -1
 block-sorter-full
   rotate: false
-  xy: 1814, 961
+  xy: 1177, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1814, 961
+  xy: 1177, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spawn-full
   rotate: false
-  xy: 1848, 961
+  xy: 1177, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3646,7 +3646,7 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1882, 987
+  xy: 1177, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3667,14 +3667,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1882, 953
+  xy: 1177, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1175, 445
+  xy: 1185, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3695,14 +3695,14 @@ surge-tower
   index: -1
 block-surge-wall-full
   rotate: false
-  xy: 1175, 411
+  xy: 1185, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1175, 411
+  xy: 1185, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3730,14 +3730,14 @@ block-swarmer-full
   index: -1
 block-tainted-water-full
   rotate: false
-  xy: 1175, 377
+  xy: 1185, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tar-full
   rotate: false
-  xy: 1177, 343
+  xy: 1185, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3758,7 +3758,7 @@ tau-mech-pad
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1177, 309
+  xy: 1576, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3807,14 +3807,14 @@ thorium-reactor
   index: -1
 block-thorium-wall-full
   rotate: false
-  xy: 1177, 275
+  xy: 1610, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 1177, 275
+  xy: 1610, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3856,28 +3856,28 @@ block-titan-factory-full
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1177, 241
+  xy: 1644, 987
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1177, 241
+  xy: 1644, 987
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-full
   rotate: false
-  xy: 1185, 207
+  xy: 1126, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall
   rotate: false
-  xy: 1185, 207
+  xy: 1126, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3926,21 +3926,21 @@ turbine-generator
   index: -1
 block-underflow-gate-full
   rotate: false
-  xy: 1185, 173
+  xy: 1122, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-unloader-full
   rotate: false
-  xy: 1185, 139
+  xy: 1122, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1185, 139
+  xy: 1122, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3968,7 +3968,7 @@ block-water-extractor-full
   index: -1
 block-water-full
   rotate: false
-  xy: 1185, 105
+  xy: 1130, 1091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4003,56 +4003,56 @@ block-wraith-factory-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1209, 411
+  xy: 1197, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1209, 377
+  xy: 1197, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1211, 343
+  xy: 1197, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1211, 309
+  xy: 1197, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1211, 275
+  xy: 1197, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1211, 241
+  xy: 1197, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 1219, 207
+  xy: 1197, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 1219, 173
+  xy: 1215, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4290,7 +4290,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1156, 1023
+  xy: 1216, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4304,7 +4304,7 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1156, 989
+  xy: 1216, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4318,7 +4318,7 @@ item-blast-compound-large
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1194, 1057
+  xy: 1231, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4332,7 +4332,7 @@ item-blast-compound-small
   index: -1
 item-blast-compound-tiny
   rotate: false
-  xy: 1061, 819
+  xy: 1826, 1087
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4353,7 +4353,7 @@ item-coal-large
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1190, 989
+  xy: 1231, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4367,7 +4367,7 @@ item-coal-small
   index: -1
 item-coal-tiny
   rotate: false
-  xy: 1826, 1087
+  xy: 1061, 819
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4388,7 +4388,7 @@ item-copper-large
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1182, 921
+  xy: 1231, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4423,7 +4423,7 @@ item-graphite-large
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1182, 853
+  xy: 1231, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4458,7 +4458,7 @@ item-lead-large
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1197, 785
+  xy: 1249, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4493,7 +4493,7 @@ item-metaglass-large
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1197, 717
+  xy: 1243, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4528,7 +4528,7 @@ item-phase-fabric-large
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1197, 649
+  xy: 1243, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4563,7 +4563,7 @@ item-plastanium-large
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1197, 581
+  xy: 1245, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4598,7 +4598,7 @@ item-pyratite-large
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1215, 513
+  xy: 1245, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4633,7 +4633,7 @@ item-sand-large
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1216, 955
+  xy: 1253, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4668,7 +4668,7 @@ item-scrap-large
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1216, 887
+  xy: 1253, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4703,7 +4703,7 @@ item-silicon-large
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1216, 819
+  xy: 1243, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4738,7 +4738,7 @@ item-spore-pod-large
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1231, 751
+  xy: 1277, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4773,7 +4773,7 @@ item-surge-alloy-large
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1231, 683
+  xy: 1277, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4808,7 +4808,7 @@ item-thorium-large
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1231, 615
+  xy: 1279, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4843,7 +4843,7 @@ item-titanium-large
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1249, 547
+  xy: 1279, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4857,7 +4857,7 @@ item-titanium-small
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 449, 215
+  xy: 1401, 807
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4885,21 +4885,21 @@ liquid-cryofluid-large
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1249, 479
+  xy: 1287, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 1284, 833
+  xy: 1962, 987
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 579, 345
+  xy: 1333, 739
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4920,21 +4920,21 @@ liquid-oil-large
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1243, 411
+  xy: 1287, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 1318, 867
+  xy: 1367, 765
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 651, 417
+  xy: 1313, 257
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4955,21 +4955,21 @@ liquid-slag-large
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1253, 173
+  xy: 1228, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 285, 1379
+  xy: 1708, 987
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 871, 735
+  xy: 1420, 875
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4990,21 +4990,21 @@ liquid-water-large
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1253, 105
+  xy: 1224, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 230, 1121
+  xy: 1708, 961
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 1344, 875
+  xy: 285, 1387
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5032,7 +5032,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1330, 1063
+  xy: 1258, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5060,7 +5060,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 1250, 955
+  xy: 1360, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5086,6 +5086,13 @@ unit-dagger-full
   orig: 48, 48
   offset: 0, 0
   index: -1
+unit-vanguard-full
+  rotate: false
+  xy: 1658, 1105
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 wave
   rotate: false
   xy: 937, 1222
@@ -5095,277 +5102,144 @@ wave
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1198, 1091
+  xy: 1216, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1190, 1023
+  xy: 1231, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1182, 955
+  xy: 1231, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1182, 887
+  xy: 1231, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1182, 819
+  xy: 1249, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1197, 751
+  xy: 1249, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1197, 683
+  xy: 1243, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1197, 615
+  xy: 1245, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1215, 547
+  xy: 1245, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1215, 479
+  xy: 1253, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1216, 921
+  xy: 1253, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1216, 853
+  xy: 1243, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1231, 785
+  xy: 1277, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1231, 717
+  xy: 1277, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1231, 649
+  xy: 1277, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1231, 581
+  xy: 1279, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1249, 513
+  xy: 1279, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1243, 445
+  xy: 1287, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1253, 207
+  xy: 1311, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1253, 139
+  xy: 1224, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-alpha-mech
-  rotate: false
-  xy: 1544, 1213
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-alpha-mech-base
-  rotate: false
-  xy: 1594, 1213
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-alpha-mech-leg
-  rotate: false
-  xy: 1644, 1213
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-delta-mech
-  rotate: false
-  xy: 920, 1022
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-delta-mech-base
-  rotate: false
-  xy: 920, 972
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-delta-mech-leg
-  rotate: false
-  xy: 920, 922
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-omega-mech
-  rotate: false
-  xy: 1258, 1205
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-omega-mech-armor
-  rotate: false
-  xy: 1275, 1395
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-omega-mech-base
-  rotate: false
-  xy: 1258, 1147
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-omega-mech-leg
-  rotate: false
-  xy: 1316, 1205
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-tau-mech
-  rotate: false
-  xy: 1374, 1147
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-tau-mech-base
-  rotate: false
-  xy: 1558, 1063
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-tau-mech-leg
-  rotate: false
-  xy: 1608, 1063
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-dart-ship
-  rotate: false
-  xy: 920, 1072
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-glaive-ship
-  rotate: false
-  xy: 99, 44
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-javelin-ship
-  rotate: false
-  xy: 1694, 1155
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-javelin-ship-shield
-  rotate: false
-  xy: 1744, 1113
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-trident-ship
-  rotate: false
-  xy: 1432, 1205
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-vanguard-ship
-  rotate: false
-  xy: 1658, 1055
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
 blank
   rotate: false
   xy: 1, 1
@@ -5387,6 +5261,27 @@ shape-3
   orig: 63, 63
   offset: 0, 0
   index: -1
+alpha
+  rotate: false
+  xy: 1544, 1213
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+alpha-base
+  rotate: false
+  xy: 1594, 1213
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+alpha-leg
+  rotate: false
+  xy: 1644, 1213
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 chaos-array
   rotate: false
   xy: 204, 859
@@ -5450,6 +5345,34 @@ dagger-leg
   orig: 48, 48
   offset: 0, 0
   index: -1
+dart
+  rotate: false
+  xy: 920, 1072
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+delta
+  rotate: false
+  xy: 920, 1022
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+delta-base
+  rotate: false
+  xy: 920, 972
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+delta-leg
+  rotate: false
+  xy: 920, 922
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 draug
   rotate: false
   xy: 920, 872
@@ -5534,6 +5457,27 @@ ghoul
   orig: 72, 72
   offset: 0, 0
   index: -1
+glaive
+  rotate: false
+  xy: 99, 44
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+javelin
+  rotate: false
+  xy: 1694, 1155
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+javelin-shield
+  rotate: false
+  xy: 1744, 1113
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 lich
   rotate: false
   xy: 645, 1807
@@ -5541,6 +5485,34 @@ lich
   orig: 216, 240
   offset: 0, 0
   index: -1
+omega
+  rotate: false
+  xy: 1258, 1205
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+omega-armor
+  rotate: false
+  xy: 1275, 1395
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+omega-base
+  rotate: false
+  xy: 1258, 1147
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+omega-leg
+  rotate: false
+  xy: 1316, 1205
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
 phantom
   rotate: false
   xy: 1316, 1147
@@ -5576,6 +5548,27 @@ spirit
   orig: 48, 48
   offset: 0, 0
   index: -1
+tau
+  rotate: false
+  xy: 1374, 1147
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+tau-base
+  rotate: false
+  xy: 1558, 1063
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+tau-leg
+  rotate: false
+  xy: 1608, 1063
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 titan
   rotate: false
   xy: 1531, 1263
@@ -5590,9 +5583,23 @@ titan-leg
   orig: 64, 64
   offset: 0, 0
   index: -1
+trident
+  rotate: false
+  xy: 1432, 1205
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+vanguard
+  rotate: false
+  xy: 1658, 1055
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 wraith
   rotate: false
-  xy: 1708, 1063
+  xy: 1708, 1013
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5711,7 +5718,7 @@ swarmer-equip
   index: -1
 vanguard-blaster-equip
   rotate: false
-  xy: 1658, 1105
+  xy: 1708, 1063
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 4aff639e00..03a97978c1 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 36aa6d9bed..5f68deb5eb 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -12,8 +12,9 @@ public class UnitTypes implements ContentList{
     crawler, titan, fortress, eruptor, chaosArray, eradicator;
 
     public static @EntityDef({Unitc.class, Legsc.class}) UnitDef dagger;
+    public static @EntityDef({Unitc.class, WaterMovec.class}) UnitDef vanguard;
 
-    public static UnitDef vanguard, alpha, delta, tau, omega, dart, javelin, trident, glaive;
+    public static UnitDef alpha, delta, tau, omega, dart, javelin, trident, glaive;
     public static UnitDef starter;
 
 
@@ -35,6 +36,22 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        vanguard = new UnitDef("vanguard"){{
+            speed = 0.3f;
+            drag = 0.1f;
+            hitsize = 8f;
+            mass = 1.75f;
+            health = 130;
+            weapons.add(new Weapon("chain-blaster"){{
+                reload = 10f;
+                x = 1.25f;
+                alternate = true;
+                rotate = true;
+                ejectEffect = Fx.shellEjectSmall;
+                bullet = Bullets.standardCopper;
+            }});
+        }};
+
         /*
         draug = new UnitDef("draug", MinerDrone::new){{
             flying = true;
diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java
index bb20ad8b2e..40953d1847 100644
--- a/core/src/mindustry/entities/EntityGroup.java
+++ b/core/src/mindustry/entities/EntityGroup.java
@@ -54,16 +54,14 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
     }
 
     public void each(Cons<T> cons){
-        T[] items = array.items;
         for(index = 0; index < array.size; index++){
-            cons.get(items[index]);
+            cons.get(array.items[index]);
         }
     }
 
     public void each(Boolf<T> filter, Cons<T> cons){
-        T[] items = array.items;
         for(index = 0; index < array.size; index++){
-            if(filter.get(items[index])) cons.get(items[index]);
+            if(filter.get(array.items[index])) cons.get(array.items[index]);
         }
     }
 
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 1f809b08fc..e8028ce8c2 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -3,6 +3,7 @@ package mindustry.entities.bullet;
 import arc.audio.*;
 import arc.math.*;
 import arc.util.ArcAnnotate.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.ctype.*;
@@ -198,30 +199,22 @@ public abstract class BulletType extends Content{
     }
 
     public Bulletc create(@Nullable Entityc owner, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data){
-
-        //TODO assign type damage is damage <0, else assign provided damage
-
-        //TODO implement
-        return null;
-        /*
-        Bullet bullet = Pools.obtain(Bullet.class, Bullet::new);
-        bullet.type = type;
-        bullet.owner = owner;
-        bullet.data = data;
-
-        bullet.velocity.set(0, type.speed).setAngle(angle).scl(velocityScl);
-        if(type.keepVelocity){
-            bullet.velocity.add(owner instanceof VelocityTrait ? ((VelocityTrait)owner).vel() : Vec2.ZERO);
-        }
-
-        bullet.team = team;
-        bullet.type = type;
-        bullet.lifeScl = lifetimeScl;
-
-        bullet.set(x - bullet.velocity.x * Time.delta(), y - bullet.velocity.y * Time.delta());
+        Bulletc bullet = BulletEntity.create();
+        bullet.type(this);
+        bullet.owner(owner);
+        bullet.team(team);
+        bullet.vel().trns(angle, speed * velocityScl);
+        bullet.set(x - bullet.vel().x * Time.delta(), y - bullet.vel().y * Time.delta());
+        bullet.lifetime(lifetime * lifetimeScl);
+        bullet.data(data);
+        bullet.drag(drag);
+        bullet.hitSize(hitSize);
+        bullet.damage(damage < 0 ? this.damage : damage);
         bullet.add();
 
-        return bullet;*/
+        //if(keepVelocity && owner instanceof Velc) bullet.vel().add(((Velc)owner).vel());
+        return bullet;
+
     }
 
     public void createNet(Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl){
diff --git a/core/src/mindustry/entities/def/BulletComp.java b/core/src/mindustry/entities/def/BulletComp.java
index ef4d1e3b03..a22a83281e 100644
--- a/core/src/mindustry/entities/def/BulletComp.java
+++ b/core/src/mindustry/entities/def/BulletComp.java
@@ -11,20 +11,19 @@ import mindustry.world.*;
 import static mindustry.Vars.*;
 
 @Component
-abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Drawc, Shielderc, Ownerc, Velc, Bulletc, Timerc{
-    private float lifeScl;
-
+abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Drawc, Shielderc, Ownerc, Velc, Bulletc, Timerc, DrawLayerBulletsc{
     Object data;
     BulletType type;
     float damage;
 
+    @Override
+    public void drawBullets(){
+        type.draw(this);
+    }
+
     @Override
     public void add(){
         type.init(this);
-
-        drag(type.drag);
-        hitSize(type.hitSize);
-        lifetime(lifeScl * type.lifetime);
     }
 
     @Override
@@ -32,11 +31,6 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
         type.despawned(this);
     }
 
-    @Override
-    public float getLifetime(){
-        return type.lifetime;
-    }
-
     @Override
     public float damageMultiplier(){
         if(owner() instanceof Unitc){
@@ -58,7 +52,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
 
     @Override
     public float damage(){
-        return type.damage * damageMultiplier();
+        return damage * damageMultiplier();
     }
 
     @Override
diff --git a/core/src/mindustry/entities/def/FlyingComp.java b/core/src/mindustry/entities/def/FlyingComp.java
index 8a9f48fd0b..f5035ab55e 100644
--- a/core/src/mindustry/entities/def/FlyingComp.java
+++ b/core/src/mindustry/entities/def/FlyingComp.java
@@ -10,7 +10,7 @@ import mindustry.world.blocks.*;
 import static mindustry.Vars.net;
 
 @Component
-abstract class FlyingComp implements Posc, Velc, Healthc{
+abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
     transient float x, y;
     transient Vec2 vel;
 
@@ -34,8 +34,8 @@ abstract class FlyingComp implements Posc, Velc, Healthc{
     public void update(){
         Floor floor = floorOn();
 
-        if(isGrounded() && floor.isLiquid && !vel.isZero(0.01f)){
-            if((splashTimer += vel.len()) >= 7f){
+        if(isGrounded() && floor.isLiquid){
+            if((splashTimer += Mathf.dst(deltaX(), deltaY())) >= 7f){
                 floor.walkEffect.at(x, y, 0, floor.color);
                 splashTimer = 0f;
             }
diff --git a/core/src/mindustry/entities/def/TimedComp.java b/core/src/mindustry/entities/def/TimedComp.java
index 3e33dd7622..f3b5f97317 100644
--- a/core/src/mindustry/entities/def/TimedComp.java
+++ b/core/src/mindustry/entities/def/TimedComp.java
@@ -9,6 +9,8 @@ import mindustry.gen.*;
 abstract class TimedComp implements Entityc, Scaled{
     float time, lifetime;
 
+    //called last so pooling and removal happens then.
+    @MethodPriority(100)
     @Override
     public void update(){
         time = Math.min(time + Time.delta(), lifetime);
diff --git a/core/src/mindustry/entities/def/WeaponsComp.java b/core/src/mindustry/entities/def/WeaponsComp.java
index b22a66c8cc..5012de6281 100644
--- a/core/src/mindustry/entities/def/WeaponsComp.java
+++ b/core/src/mindustry/entities/def/WeaponsComp.java
@@ -1,6 +1,7 @@
 package mindustry.entities.def;
 
 import arc.math.*;
+import arc.math.geom.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.entities.*;
@@ -28,8 +29,19 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
         }
     }
 
+    void controlWeapons(boolean rotate, boolean shoot){
+        for(WeaponMount mount : mounts){
+            mount.rotate = rotate;
+            mount.shoot = shoot;
+        }
+    }
+
+    void aim(Position pos){
+        aim(pos.getX(), pos.getY());
+    }
+
     /** Aim at something. This will make all mounts point at it. */
-    void aim(Unitc unit, float x, float y){
+    void aim(float x, float y){
         Tmp.v1.set(x, y).sub(this.x, this.y);
         if(Tmp.v1.len() < minAimDst) Tmp.v1.setLength(minAimDst);
 
@@ -49,18 +61,18 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
             Weapon weapon = mount.weapon;
             mount.reload = Math.max(mount.reload - Time.delta(), 0);
 
+            //rotate if applicable
+            if(weapon.rotate && (mount.rotate || mount.shoot)){
+                float axisXOffset = weapon.mirror ? 0f : weapon.x;
+                float axisX = this.x + Angles.trnsx(rotation, axisXOffset, weapon.y),
+                axisY = this.y + Angles.trnsy(rotation, axisXOffset, weapon.y);
+
+                mount.rotation = Angles.moveToward(mount.rotation, Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - rotation(), weapon.rotateSpeed);
+            }
+
             if(mount.shoot){
                 float rotation = this.rotation - 90;
 
-                //rotate if applicable
-                if(weapon.rotate){
-                    float axisXOffset = weapon.mirror ? 0f : weapon.x;
-                    float axisX = this.x + Angles.trnsx(rotation, axisXOffset, weapon.y),
-                    axisY = this.y + Angles.trnsy(rotation, axisXOffset, weapon.y);
-
-                    mount.rotation = Angles.moveToward(mount.rotation, Angles.angle(axisX, axisY, mount.aimX, mount.aimY), weapon.rotateSpeed);
-                }
-
                 //shoot if applicable
                 //TODO only shoot if angle is reached, don't shoot inaccurately
                 if(mount.reload <= 0.0001f){
@@ -73,7 +85,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
                         mountY = this.y + Angles.trnsy(rotation, weapon.x * i, weapon.y);
                         float shootX = mountX + Angles.trnsx(weaponRotation, weapon.shootX * i, weapon.shootY),
                         shootY = mountY + Angles.trnsy(weaponRotation, weapon.shootX * i, weapon.shootY);
-                        float shootAngle = weapon.rotate ? weaponRotation : Angles.angle(shootX, shootY, mount.aimX, mount.aimY);
+                        float shootAngle = weapon.rotate ? weaponRotation + 90 : Angles.angle(shootX, shootY, mount.aimX, mount.aimY);
 
                         shoot(weapon, shootX, shootY, shootAngle);
                     }
diff --git a/core/src/mindustry/entities/units/WeaponMount.java b/core/src/mindustry/entities/units/WeaponMount.java
index c4340afab8..35858de595 100644
--- a/core/src/mindustry/entities/units/WeaponMount.java
+++ b/core/src/mindustry/entities/units/WeaponMount.java
@@ -15,6 +15,8 @@ public class WeaponMount{
     public boolean side;
     /** whether to shoot right now */
     public boolean shoot = false;
+    /** whether to rotate to face the target right now */
+    public boolean rotate = false;
 
     public WeaponMount(Weapon weapon){
         this.weapon = weapon;
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index 6669a024bb..9d140ce8e9 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -5,6 +5,7 @@ import arc.Graphics.*;
 import arc.Graphics.Cursor.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.math.geom.*;
 import arc.scene.*;
 import arc.scene.event.*;
 import arc.scene.ui.*;
@@ -163,7 +164,7 @@ public class DesktopInput extends InputHandler{
             }
         }
 
-        if(!player.dead() && !state.isPaused()){
+        if(!player.dead() && !state.isPaused() && !(Core.scene.getKeyboardFocus() instanceof TextField)){
             updateMovement(player.unit());
         }
 
@@ -495,14 +496,24 @@ public class DesktopInput extends InputHandler{
     }
 
     protected void updateMovement(Unitc unit){
-        boolean canMove = !(Core.scene.getKeyboardFocus() instanceof TextField);
-
+        boolean omni = !(unit instanceof WaterMovec);
         float speed = unit.type().speed;
         float xa = Core.input.axis(Binding.move_x);
         float ya = Core.input.axis(Binding.move_y);
 
-        unit.vel().add(Tmp.v1.set(speed * xa, speed * ya).limit(speed));
-        unit.lookAt(Angles.mouseAngle(unit.x(), unit.y()));
+        Vec2 movement = Tmp.v1.set(speed * xa, speed * ya).limit(speed);
+
+        if(omni){
+            unit.vel().add(movement);
+            unit.lookAt(Angles.mouseAngle(unit.x(), unit.y()));
+        }else{
+            if(!unit.vel().isZero(0.01f)) unit.rotation(unit.vel().angle());
+            unit.vel().add(Tmp.v2.trns(unit.rotation(), movement.len()));
+            if(!movement.isZero()) unit.vel().rotateTo(movement.angle(), unit.type().rotateSpeed * Time.delta());
+        }
+
+        unit.aim(Core.input.mouseWorld());
+        unit.controlWeapons(true, isShooting);
         /*
         Tile tile = unit.tileOn();
         boolean canMove = !Core.scene.hasKeyboard() || ui.minimapfrag.shown();
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index dc90314be9..f5b9d1e1e1 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -25,7 +25,7 @@ public class Weapon{
     /** whether to rotate toward the target independently of unit */
     public boolean rotate = false;
     /** rotation speed of weapon when rotation is enabled, in degrees/t*/
-    public float rotateSpeed = 2f;
+    public float rotateSpeed = 20f;
     /** weapon reload in frames */
     public float reload;
     /** amount of shots per fire */
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index df3fe0e5fc..adbdddcc61 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -8,6 +8,7 @@ import arc.struct.*;
 import arc.util.*;
 import arc.util.noise.*;
 import mindustry.ctype.*;
+import mindustry.gen.*;
 import mindustry.tools.ImagePacker.*;
 import mindustry.type.*;
 import mindustry.ui.*;
@@ -190,9 +191,11 @@ public class Generators{
 
                 Image image = ImagePacker.get(type.region);
 
-                image.draw(type.baseRegion);
-                image.draw(type.legRegion);
-                image.draw(type.legRegion, true, false);
+                if(type.constructor.get() instanceof Legsc){
+                    image.draw(type.baseRegion);
+                    image.draw(type.legRegion);
+                    image.draw(type.legRegion, true, false);
+                }
                 image.draw(type.region);
 
                 for(Weapon weapon : type.weapons){