diff --git a/core/assets/maps/siege.msav b/core/assets/maps/siege.msav
index c6fb26a8bb..a44e1fa897 100644
Binary files a/core/assets/maps/siege.msav and b/core/assets/maps/siege.msav differ
diff --git a/core/src/mindustry/ai/ControlPathfinder.java b/core/src/mindustry/ai/ControlPathfinder.java
index 4c72159df0..31eafee6d2 100644
--- a/core/src/mindustry/ai/ControlPathfinder.java
+++ b/core/src/mindustry/ai/ControlPathfinder.java
@@ -50,7 +50,8 @@ public class ControlPathfinder{
 
     costLegs = (team, tile) ->
     PathTile.legSolid(tile) ? impassable : 1 +
-    (PathTile.deep(tile) ? 6000 : 0),
+    (PathTile.deep(tile) ? 6000 : 0) +
+    (PathTile.solid(tile) ? 2 : 0),
 
     costNaval = (team, tile) ->
     //impassable same-team neutral block, or non-liquid
diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java
index 63bd247e67..118d4d0298 100644
--- a/core/src/mindustry/world/blocks/liquid/Conduit.java
+++ b/core/src/mindustry/world/blocks/liquid/Conduit.java
@@ -38,6 +38,8 @@ public class Conduit extends LiquidBlock implements Autotiler{
     /** indices: [rotation] [fluid type] [frame] */
     public TextureRegion[][][] rotateRegions;
 
+    /** If true, the liquid region is padded at corners, so it doesn't stick out. */
+    public boolean padCorners = true;
     public boolean leaks = true;
     public @Nullable Block junctionReplacement, bridgeReplacement, rotBridgeReplacement;
 
@@ -188,7 +190,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
             int wrapRot = (rotation + offset) % 4;
             TextureRegion liquidr = bits == 1 ? rotateRegions[wrapRot][gas][frame] : renderer.fluidFrames[gas][frame];
 
-            if(bits == 1){
+            if(bits == 1 && padCorners){
                 ox = rotateOffsets[wrapRot][0];
                 oy = rotateOffsets[wrapRot][1];
             }