removed squeak trhough + adjusted fluid boxes

changelog.txt

@@ -1,3 +1,13 @@
+---------------------------------------------------------------------------------------------------
+Version: 1.0.7
+Date: 5.4.2022
+  Features:
+    - added pipe covers for most machines
+    - added more inputs to KI cores to improve symetry
+    - added new simple kerosene recipe in Overhaul mode, without lightoil 
+  Changes:
+    - removed squeak trough dependency
+
 ---------------------------------------------------------------------------------------------------
 Version: 1.0.6
 Date: 3.4.2022

info.json

@@ -7,7 +7,6 @@
     "description": "Advance through 4 stages of tech. Start with simple machines and work your way through nuclear fission and fusion up to black and white holes. Can be added to already existing saves! See mod portal for more info.",
     "dependencies": [
         "base >= 1.0.0",
-        "Squeak Through",
         "?Booktorio",
         "?informatron",
         "?Krastorio2",

locale/en/lang_en.cfg

@@ -563,6 +563,7 @@ limitation_message=This module can not be used here.
 
 [recipe-name]
 fi_decay_waste_recipe=Decay nuclear waste
+fu_burn_oxygen_recipe=Vent oxygen
 
 #booktorio
 [gui]

prototypes/electronic/el_arc_furnace.lua

@@ -63,6 +63,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {0, -4}},
@@ -75,6 +76,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {-4, 0}}
@@ -87,6 +89,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {4, 0}},
@@ -100,6 +103,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {0, 4}},
@@ -116,7 +120,7 @@ data:extend({
         --lines_per_file = 2,
         frame_count = 1,
         --animation_speed = 0.2,
-        shift = {0,-0.1} 
+        shift = {0,-0.3} 
       },
       working_visualisations = {
         {

prototypes/electronic/el_caster.lua

@@ -64,6 +64,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, -4}},
@@ -76,6 +77,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {-4, 0}}
@@ -88,6 +90,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {4, 0}},
@@ -101,6 +104,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, 4}},
@@ -118,7 +122,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           east = {
               filename = sprite('entity_animation.png'),
@@ -128,7 +132,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           south = {
               filename = sprite('entity_animation.png'),
@@ -138,7 +142,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           west = {
               filename = sprite('entity_animation.png'),
@@ -148,7 +152,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
       },
       working_sound =

prototypes/electronic/el_grower.lua

@@ -63,6 +63,7 @@ data:extend({
           height = 2,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
+          pipe_picture = south_basic_pipe_picture,
           pipe_connections =
           {
             {type = "input", position = {0, -3}},
@@ -74,6 +75,7 @@ data:extend({
           height = 2,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
+          pipe_picture = south_basic_pipe_picture,
           pipe_connections =
           {
             {type = "input", position = {-3, 0}}
@@ -85,6 +87,7 @@ data:extend({
           height = 2,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
+          pipe_picture = south_basic_pipe_picture,
           pipe_connections =
           {
             {type = "input", position = {3, 0}},
@@ -97,6 +100,7 @@ data:extend({
           height = 2,
           base_level = -1,
           pipe_covers = pipecoverspictures(),
+          pipe_picture = south_basic_pipe_picture,
           pipe_connections =
           {
             {type = "input", position = {0, 3}},

prototypes/electronic/el_ki/el_ki_core.lua

@@ -61,8 +61,8 @@ data:extend({
         crafting_speed = 1,
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-2.8, -2.8}, {2.8, 2.8}},
+        collision_box = {{-2.9, -2.9}, {2.9, 2.9}},
-        selection_box = {{-3.0, -3.0}, {3.0, 3.0}},
+        selection_box = {{-3, -3}, {3, 3}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
             mining_time = 1,
@@ -82,9 +82,23 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, -3.2}},
+                  {type = "input", position = {0.5, -3.5}},
+                },
+                production_type = "input"
+            },
+            {
+                filter = 'el_ki_cpu_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {-0.5, -3.5}},
                 },
                 production_type = "input"
             },
@@ -94,12 +108,26 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, 3.2}},
+                  {type = "input", position = {0.5, 3.5}},
                 },
                 production_type = "input"
-          },
+            },
+            {
+                filter = 'el_ki_memory_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {-0.5, 3.5}},
+                },
+                production_type = "input"
+            },
         },
         animation = {
             
@@ -168,7 +196,7 @@ data:extend({
         crafting_speed = 1,
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-2.8, -2.8}, {2.8, 2.8}},
+        collision_box = {{-2.9, -2.9}, {2.9, 2.9}},
         selection_box = {{-3.0, -3.0}, {3.0, 3.0}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
@@ -189,9 +217,23 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, -3.2}},
+                  {type = "input", position = {0.5, -3.5}},
+                },
+                production_type = "input"
+            },
+            {
+                filter = 'el_ki_cpu_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {-0.5, -3.5}},
                 },
                 production_type = "input"
             },
@@ -201,9 +243,23 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, 3.2}},
+                  {type = "input", position = {0.5, 3.5}},
+                },
+                production_type = "input"
+            },
+            {
+                filter = 'el_ki_memory_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {-0.5, 3.5}},
                 },
                 production_type = "input"
             },
@@ -213,9 +269,23 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {3.2, 0.5}},
+                  {type = "input", position = {3.5, 0.5}},
+                },
+                production_type = "input"
+            },
+            {
+                filter = 'fi_ki_circuit_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {3.5, -0.5}},
                 },
                 production_type = "input"
             }
@@ -287,7 +357,7 @@ data:extend({
         crafting_speed = 1,
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-2.8, -2.8}, {2.8, 2.8}},
+        collision_box = {{-2.9, -2.9}, {2.9, 2.9}},
         selection_box = {{-3.0, -3.0}, {3.0, 3.0}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
@@ -308,9 +378,23 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, -3.2}},
+                  {type = "input", position = {0.5, -3.5}},
+                },
+                production_type = "input"
+            },
+            {
+                filter = 'el_ki_cpu_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {-0.5, -3.5}},
                 },
                 production_type = "input"
             },
@@ -320,9 +404,23 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {0.5, 3.2}},
+                  {type = "input", position = {0.5, 3.5}},
+                },
+                production_type = "input"
+            },
+            {
+                filter = 'el_ki_memory_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {-0.5, 3.5}},
                 },
                 production_type = "input"
             },
@@ -332,9 +430,23 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {3.2, 0.5}},
+                  {type = "input", position = {3.5, 0.5}},
+                },
+                production_type = "input"
+            },
+            {
+                filter = 'fi_ki_circuit_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {3.5, -0.5}},
                 },
                 production_type = "input"
             },
@@ -344,9 +456,23 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
                 pipe_connections =
                 {
-                  {type = "input", position = {-3.2, 0.5}},
+                  {type = "input", position = {-3.5, 0.5}},
+                },
+                production_type = "input"
+            },
+            {
+                filter = 'fu_ki_circuit_fluid',
+                base_area = 1,
+                height = 2,
+                base_level = -1,
+                pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_long_north_pipe_picture,
+                pipe_connections =
+                {
+                  {type = "input", position = {-3.5, -0.5}},
                 },
                 production_type = "input"
             }

prototypes/electronic/el_ki/el_ki_cpu.lua

@@ -57,6 +57,7 @@ data:extend({
               height = 2,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {0, 2}},

prototypes/electronic/el_ki/el_ki_memory.lua

@@ -57,6 +57,7 @@ data:extend({
               height = 2,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {0, 2}},

prototypes/electronic/el_ki/fi_ki_circuit.lua

@@ -57,6 +57,7 @@ data:extend({
               height = 2,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {0, 2}},

prototypes/electronic/el_ki/fu_ki_circuit.lua

@@ -57,6 +57,7 @@ data:extend({
               height = 2,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {0, 2}},

prototypes/electronic/el_pressurizer.lua

@@ -57,6 +57,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, -2}},
@@ -69,6 +70,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {-2, 0}}
@@ -81,6 +83,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {2, 0}},
@@ -94,6 +97,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {0, 2}},

prototypes/electronic/el_purifier.lua

@@ -64,6 +64,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, -4}},
@@ -76,6 +77,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {-4, 0}}
@@ -88,6 +90,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {4, 0}},
@@ -101,6 +104,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {0, 4}},
@@ -117,7 +121,7 @@ data:extend({
               line_length = 3,
               frame_count = 3,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           east = {
               filename = sprite('entity_animation.png'),
@@ -126,7 +130,7 @@ data:extend({
               line_length = 3,
               frame_count = 3,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           south = {
               filename = sprite('entity_animation.png'),
@@ -135,7 +139,7 @@ data:extend({
               line_length = 3,
               frame_count = 3,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           west = {
               filename = sprite('entity_animation.png'),
@@ -144,7 +148,7 @@ data:extend({
               line_length = 3,
               frame_count = 3,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
       },
       working_sound =

prototypes/electronic/el_tank.lua

@@ -38,7 +38,7 @@ data:extend({
         },
         max_health = 300,
         corpse = 'small-remnants',
-        collision_box = {{-3.5,-3.5},{3.5,3.5}},
+        collision_box = {{-3.4,-3.4},{3.4,3.4}},
         selection_box = {{-3.5,-3.5},{3.5,3.5}},
         pictures = {
             picture = {

prototypes/electronic/el_water_generator.lua

@@ -33,7 +33,7 @@ data:extend({
         flags = {"player-creation","placeable-neutral"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-1.3, -3.3}, {1.3, 3.3}},
+        collision_box = {{-1.4, -3.4}, {1.4, 3.4}},
         selection_box = {{-1.5, -3.5}, {1.5, 3.5}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
@@ -53,6 +53,8 @@ data:extend({
             minimum_temperature = 0,
             maximum_temperature = 500,
             production_type = 'input-output',
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = south_basic_pipe_picture,
             pipe_connections = {
                 {type = "input-output", position = {2, 0}},  
                 {type = "input-output", position = {-2, 0}},  
@@ -81,7 +83,7 @@ data:extend({
         horizontal_animation = {
             filename = sprite('entity_animation_horizontal_1.png'),
             size = {896,480},
-            scale = 0.22,
+            scale = 0.2,
             line_length = 4,
             frame_count = 4,
             animation_speed = 0.5,
@@ -92,4 +94,3 @@ data:extend({
         },
     },
 })
-

prototypes/fission/fi_compound_machine.lua

@@ -63,6 +63,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, -4}},
@@ -75,6 +76,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {-4, 0}}
@@ -87,6 +89,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {4, 0}},
@@ -100,6 +103,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, 4}},
@@ -116,7 +120,7 @@ data:extend({
               line_length = 3,
               frame_count = 3,
               animation_speed = 0.5,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           east = {
               filename = sprite('entity_animation.png'),
@@ -126,7 +130,7 @@ data:extend({
               --lines_per_file = 3,
               frame_count = 3,
               animation_speed = 0.5,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           south = {
               filename = sprite('entity_animation.png'),
@@ -135,7 +139,7 @@ data:extend({
               line_length = 3,
               frame_count = 3,
               animation_speed = 0.5,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           west = {
               filename = sprite('entity_animation.png'),
@@ -144,7 +148,7 @@ data:extend({
               line_length = 3,
               frame_count = 3,
               animation_speed = 0.5,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
       },
       working_sound =

prototypes/fusion/fu_activator.lua

@@ -63,6 +63,7 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = south_basic_pipe_picture,
                 pipe_connections =
                 {
                   {type = "input", position = {-2, 0}}
@@ -74,6 +75,7 @@ data:extend({
               height = 2,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = south_basic_pipe_picture,
               pipe_connections =
               {
                 {type = "input", position = {0, 2}}
@@ -85,6 +87,7 @@ data:extend({
               height = 2,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = south_basic_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {2, 0}},
@@ -96,6 +99,7 @@ data:extend({
               height = 2,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
+             pipe_picture = south_basic_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {0, -2}},

prototypes/fusion/fu_exchanger.lua

@@ -33,7 +33,7 @@ data:extend({
         flags = {"player-creation","placeable-neutral"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-1.8,-1.8},{1.8,1.8}},
+        collision_box = {{-1.9,-1.9},{1.9,1.9}},
         selection_box = {{-2,-2},{2,2}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
@@ -61,6 +61,7 @@ data:extend({
               height = 2,
               base_level = -1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "input", position = {-2.5, -0.5}}
@@ -72,6 +73,7 @@ data:extend({
                 height = 2,
                 base_level = -1,
                 pipe_covers = pipecoverspictures(),
+                pipe_picture = grey_south_pipe_picture,
                 pipe_connections =
                 {
                   {type = "input", position = {-2.5, 1.5}}
@@ -83,6 +85,7 @@ data:extend({
               height = 2,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {2.5, -0.5}},
@@ -94,6 +97,7 @@ data:extend({
               height = 2,
               base_level = 1,
               pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {2.5, 1.5}},

prototypes/fusion/fu_laser.lua

@@ -56,6 +56,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, -4}},
@@ -68,6 +69,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {-4, 0}}
@@ -80,6 +82,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {4, 0}},
@@ -93,6 +96,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {0, 4}},
@@ -109,7 +113,7 @@ data:extend({
         --lines_per_file = 2,
         frame_count = 1,
         --animation_speed = 0.2,
-        shift = {0,-0.1} 
+        shift = {0,-0.3} 
       },
       working_visualisations = {
         {
@@ -122,7 +126,7 @@ data:extend({
             lines_per_file = 1,
             frame_count = 3,
             animation_speed = 0.2,
-            shift = {0,-0.1} 
+            shift = {0,-0.3} 
           }
         }
       },

prototypes/fusion/fu_magnet.lua

@@ -56,6 +56,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, -4}},
@@ -68,6 +69,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {-4, 0}}
@@ -80,6 +82,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {4, 0}},
@@ -93,6 +96,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {0, 4}},
@@ -110,7 +114,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           east = {
               filename = sprite('entity_animation.png'),
@@ -120,7 +124,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           south = {
               filename = sprite('entity_animation.png'),
@@ -130,7 +134,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
           west = {
               filename = sprite('entity_animation.png'),
@@ -140,7 +144,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.2,
-              shift = {0,-0.1}
+              shift = {0,-0.3}
           },
       },
       working_sound =

prototypes/fusion/fu_plasma.lua

@@ -56,6 +56,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {0, -4}},
@@ -68,6 +69,7 @@ data:extend({
             height = 2,
             base_level = -1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "input", position = {-4, 0}}
@@ -80,6 +82,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {4, 0}},
@@ -93,6 +96,7 @@ data:extend({
             height = 2,
             base_level = 1,
             pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
             pipe_connections =
             {
               {type = "output", position = {0, 4}},
@@ -109,7 +113,7 @@ data:extend({
         --lines_per_file = 2,
         frame_count = 1,
         --animation_speed = 0.2,
-        shift = {0,-0.1} 
+        shift = {0,-0.3} 
       },
       working_visualisations = {
         {
@@ -122,7 +126,7 @@ data:extend({
             lines_per_file = 2,
             frame_count = 4,
             animation_speed = 0.2,
-            shift = {0,-0.1} 
+            shift = {0,-0.3} 
           }
         }
       },

prototypes/fusion/fu_reactor.lua

@@ -60,50 +60,54 @@ data:extend({
         energy_usage = '400MW',
         --fluid
         fluid_boxes = {
+          {
+            base_area = 1,
+            height = 2,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
             {
-              base_area = 1,
+              {type = "input", position = {-1, -7}},
-              height = 2,
-              base_level = -1,
-              pipe_covers = pipecoverspictures(),
-              pipe_connections =
-              {
-                {type = "input", position = {-1, -7}},
-              },
-              production_type = "input"
             },
+            production_type = "input"
+          },
+          { 
+            base_area = 1,
+            height = 2,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
             {
-              base_area = 1,
+              {type = "input", position = {1, -7}}
-              height = 2,
-              base_level = -1,
-              pipe_covers = pipecoverspictures(),
-              pipe_connections =
-              {
-                {type = "input", position = {1, -7}}
-              },
-              production_type = "input"
             },
+            production_type = "input"
+          },
+          { 
+            base_area = 1,
+            height = 2,
+            base_level = -1,
+            pipe_covers = pipecoverspictures(),
+            pipe_picture = grey_south_pipe_picture,
+            pipe_connections =
             {
-                base_area = 1,
+              {type = "input", position = {3, -7}}
-                height = 2,
+            },
-                base_level = -1,
+            production_type = "input"
-                pipe_covers = pipecoverspictures(),
+          },
-                pipe_connections =
+          { 
-                {
+            base_area = 1,
-                  {type = "input", position = {3, -7}}
+            height = 2,
-                },
+            base_level = 1,
-                production_type = "input"
+            pipe_covers = pipecoverspictures(),
-              },
+            pipe_picture = grey_south_pipe_picture,
-              { 
+            pipe_connections =
-                base_area = 1,
+            {
-                height = 2,
+              {type = "output", position = {-3, -7}}
-                base_level = 1,
+            },
-                pipe_covers = pipecoverspictures(),
+            production_type = "output"
-                pipe_connections =
+          },
-                {
-                  {type = "output", position = {-3, -7}}
-                },
-                production_type = "output"
-              },
         },
         --animation
         animation = {
@@ -114,7 +118,7 @@ data:extend({
           --lines_per_file = 2,
           frame_count = 1,
           --animation_speed = 0.2,
-          shift = {2.4,-1.5} 
+          shift = {2.4,-1.7} 
         },
         working_visualisations = {
           {
@@ -127,7 +131,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.3,
-              shift = {2.4,-1.5} 
+              shift = {2.4,-1.7} 
             }
           }
         },
@@ -163,50 +167,54 @@ data:extend({
       energy_usage = '400MW',
       --fluid
       fluid_boxes = {
+        {
+          base_area = 1,
+          height = 2,
+          base_level = -1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = grey_south_pipe_picture,
+          pipe_connections =
           {
-            base_area = 1,
+            {type = "input", position = {-1, -7}},
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_connections =
-            {
-              {type = "input", position = {-1, -7}},
-            },
-            production_type = "input"
           },
+          production_type = "input"
+        },
+        { 
+          base_area = 1,
+          height = 2,
+          base_level = -1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = grey_south_pipe_picture,
+          pipe_connections =
           {
-            base_area = 1,
+            {type = "input", position = {1, -7}}
-            height = 2,
-            base_level = -1,
-            pipe_covers = pipecoverspictures(),
-            pipe_connections =
-            {
-              {type = "input", position = {1, -7}}
-            },
-            production_type = "input"
           },
+          production_type = "input"
+        },
+        { 
+          base_area = 1,
+          height = 2,
+          base_level = -1,
+          pipe_covers = pipecoverspictures(),
+          pipe_picture = grey_south_pipe_picture,
+          pipe_connections =
           {
-              base_area = 1,
+            {type = "input", position = {3, -7}}
-              height = 2,
+          },
-              base_level = -1,
+          production_type = "input"
-              pipe_covers = pipecoverspictures(),
+        },
-              pipe_connections =
+        { 
-              {
+          base_area = 1,
-                {type = "input", position = {3, -7}}
+          height = 2,
-              },
+          base_level = 1,
-              production_type = "input"
+          pipe_covers = pipecoverspictures(),
-            },
+          pipe_picture = grey_south_pipe_picture,
-            { 
+          pipe_connections =
-              base_area = 1,
+          {
-              height = 2,
+            {type = "output", position = {-3, -7}}
-              base_level = 1,
+          },
-              pipe_covers = pipecoverspictures(),
+          production_type = "output"
-              pipe_connections =
+        },
-              {
-                {type = "output", position = {-3, -7}}
-              },
-              production_type = "output"
-            },
       },
       animation = {
         filename = sprite('tokamak_entity_animation.png'),
@@ -216,7 +224,7 @@ data:extend({
         lines_per_file = 3,
         frame_count = 9,
         animation_speed = 0.3,
-        shift = {2.4,-1.5} 
+        shift = {2.4,-1.7} 
       },
       
       working_sound = { 

prototypes/fusion/fu_star_engine/fu_star_engine_cooler.lua

@@ -33,7 +33,7 @@ data:extend({
         flags = {"player-creation","placeable-neutral","not-rotatable"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-6.5,-9},{6.5,9}},
+        collision_box = {{-6.4,-8.9},{6.4,8.9}},
         selection_box = {{-6.5,-9},{6.5,9}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {
@@ -54,7 +54,8 @@ data:extend({
               base_area = 1,
               height = 2,
               base_level = -1,
-              
+              pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "input", position = {-2, -9.5}}
@@ -65,7 +66,8 @@ data:extend({
               base_area = 1,
               height = 2,
               base_level = -1,
-              
+              pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "input", position = {2, -9.5}}
@@ -76,7 +78,8 @@ data:extend({
               base_area = 1,
               height = 2,
               base_level = 1,
-              
+              pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {0, 9.5}},
@@ -87,7 +90,8 @@ data:extend({
               base_area = 1,
               height = 2,
               base_level = 1,
-              
+              pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {-2, 9.5}},
@@ -98,7 +102,8 @@ data:extend({
               base_area = 1,
               height = 2,
               base_level = 1,
-              
+              pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {2, 9.5}},
@@ -109,7 +114,8 @@ data:extend({
               base_area = 1,
               height = 2,
               base_level = 1,
-              
+              pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {-4, 9.5}},
@@ -120,7 +126,8 @@ data:extend({
               base_area = 1,
               height = 2,
               base_level = 1,
-              
+              pipe_covers = pipecoverspictures(),
+              pipe_picture = grey_south_pipe_picture,
               pipe_connections =
               {
                 {type = "output", position = {4, 9.5}},
@@ -133,7 +140,7 @@ data:extend({
           filename = sprite('base.png'),
           size = {1080, 1080},
           scale = 0.58,
-          shift = {0,-0.35},
+          shift = {0,-0.62},
           line_length = 1,
           lines_per_file = 1,
           frame_count = 1,
@@ -150,7 +157,7 @@ data:extend({
               lines_per_file = 3,
               frame_count = 9,
               animation_speed = 0.3,
-              shift = {0,-0.35} 
+              shift = {0,-0.62} 
             }
           }
         },

prototypes/fusion/fu_star_engine/fu_star_engine_cooler_up.lua

@@ -33,7 +33,7 @@ data:extend({
         flags = {"player-creation","placeable-neutral","not-rotatable"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-6.5,-9},{6.5,9}},
+        collision_box = {{-6.4,-8.9},{6.4,8.9}},
         selection_box = {{-6.5,-9},{6.5,9}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {

prototypes/fusion/fu_star_engine/fu_star_engine_core.lua

@@ -33,7 +33,7 @@ data:extend({
         flags = {"player-creation","placeable-neutral","not-rotatable"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-8.5,-4.5},{8.5,8.5}},
+        collision_box = {{-8.4,-4.4},{8.4,8.4}},
         selection_box = {{-8.5,-4.5},{8.5,8.5}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {

prototypes/fusion/fu_star_engine/fu_star_engine_heater.lua

@@ -33,7 +33,7 @@ data:extend({
         flags = {"player-creation","placeable-neutral","not-rotatable"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-10.5,-4.5}, {8.5,4.5}},
+        collision_box = {{-10.4,-4.4}, {8.4,4.4}},
         selection_box = {{-10.5,-4.5}, {8.5,4.5}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {

prototypes/fusion/fu_star_engine/fu_star_engine_heater_left.lua

@@ -33,7 +33,7 @@ data:extend({
         flags = {"player-creation","placeable-neutral","not-rotatable"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-8.5,-4.5},{10.5,4.5}},
+        collision_box = {{-8.4,-4.4},{10.4,4.4}},
         selection_box = {{-8.5,-4.5},{10.5,4.5}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {

prototypes/gravitation/gr_lab.lua

@@ -32,7 +32,7 @@ data:extend({
         flags = {"player-creation","placeable-neutral","not-rotatable"},
         max_health = 300,
         corpse = 'big-remnants',
-        collision_box = {{-4,-3.5},{4,3.5}},
+        collision_box = {{-3.9,-3.4},{3.9,3.4}},
         selection_box = {{-4,-3.5},{4,3.5}},
         map_color = {r=0, g=0, b=1, a=1},
         minable = {

prototypes/pipe_covers.lua

@@ -107,7 +107,49 @@ grey_south_pipe_picture = {
     east = empty_sprite
 }
 
-north_south_basic_pipe_picture = {
+grey_south_north_pipe_picture = {
+    north = {
+        filename = sprite("north_basic_covers"),
+		priority = "high",
+		width = 45,
+        height = 40,
+        shift = util.by_pixel(0, 25),
+        scale = 0.5
+    },
+    south = {
+        filename = sprite("south_covers_grey"),
+		priority = "high",
+		width = 88,
+        height = 61,
+        shift = util.by_pixel(0, -31.25),
+        scale = 0.5
+    },
+    west = empty_sprite,
+    east = empty_sprite
+}
+
+grey_south_long_north_pipe_picture = {
+    north = {
+        filename = sprite("north_long_basic_covers"),
+		priority = "high",
+		width = 45,
+        height = 65,
+        shift = util.by_pixel(0, 23.25),
+        scale = 0.5
+    },
+    south = {
+        filename = sprite("south_covers_grey"),
+		priority = "high",
+		width = 88,
+        height = 61,
+        shift = util.by_pixel(0, -31.25),
+        scale = 0.5
+    },
+    west = empty_sprite,
+    east = empty_sprite
+}
+
+south_basic_pipe_picture = {
     north = empty_sprite,
     south = {
         filename = sprite("south_basic_covers"),