diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png
index c3809b0f60..b563812736 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png
index 37ee6de2a6..812dd3ce2b 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png
index 635972c5bc..3ca57ad02f 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png
index e067a5bb7b..c0b406a072 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png
index ad90c44566..1249112f47 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png
index 7941306123..2204378fdc 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png
index eb0cdfbb25..b1c301f4e8 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png
index 5cc6fd009a..a7ac7b2ce0 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png
index 43017050e7..04f4c45fe3 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png
index 7796332524..86c76aa13b 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png
index 4ae0db8bf1..43597c1aa3 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png
index b90b2a51b2..f57c2f3d55 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png
index 74aedc579e..af87bdbf65 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png
index 30c4e4bcc2..d70994a01a 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png differ
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 4e50905b0e..0ddbc04325 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/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java
index 24a1c1bb46..602932c8f9 100644
--- a/core/src/io/anuke/mindustry/world/Tile.java
+++ b/core/src/io/anuke/mindustry/world/Tile.java
@@ -8,6 +8,7 @@ import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.world.blocks.BlockPart;
 import io.anuke.mindustry.world.blocks.Floor;
 import io.anuke.mindustry.world.modules.ConsumeModule;
 import io.anuke.mindustry.world.modules.InventoryModule;
@@ -414,7 +415,7 @@ public class Tile implements PosTrait, TargetTrait{
                 if(block.hasLiquids) entity.liquids = new LiquidModule();
                 if(block.hasPower) entity.power = new PowerModule();
                 entity.updateProximity();
-            }else{
+            }else if(!(block instanceof BlockPart)){
                 //since the entity won't update proximity for us, update proximity for all nearby tiles manually
                 for(GridPoint2 p : Geometry.d4){
                     Tile tile = world.tile(x + p.x, y + p.y);