Merge branch 'tiled-logic-displays' of https://github.com/Anuken/Mindustry

core/src/mindustry/content/Blocks.java

@@ -158,7 +158,7 @@ public class Blocks{
     payloadConveyor, payloadRouter, reinforcedPayloadConveyor, reinforcedPayloadRouter, payloadMassDriver, largePayloadMassDriver, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader,
 
     //logic
-    message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank,
+    message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, logicDisplayTile, memoryCell, memoryBank,
     canvas, reinforcedMessage,
     worldProcessor, worldCell, worldMessage, worldSwitch,
 
@@ -6596,6 +6596,10 @@ public class Blocks{
             size = 6;
         }};
 
+        logicDisplayTile = new TileableLogicDisplay("tile-logic-display"){{
+            requirements(Category.logic, with(Items.lead, 10, Items.silicon, 10, Items.metaglass, 10, Items.phaseFabric, 6));
+        }};
+
         canvas = new CanvasBlock("canvas"){{
             requirements(Category.logic, BuildVisibility.shown, with(Items.silicon, 10, Items.beryllium, 10));
 

core/src/mindustry/content/SerpuloTechTree.java

@@ -169,7 +169,6 @@ public class SerpuloTechTree{
                             });
                         });
 
-                        //logic disabled until further notice
                         node(microProcessor, () -> {
                             node(switchBlock, () -> {
                                 node(message, () -> {
@@ -177,6 +176,10 @@ public class SerpuloTechTree{
                                         node(largeLogicDisplay, () -> {
 
                                         });
+
+                                        node(logicDisplayTile, () -> {
+
+                                        });
                                     });
 
                                     node(memoryCell, () -> {