diff --git a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-bottom.png b/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-bottom.png deleted file mode 100644 index 8c363b7435..0000000000 Binary files a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-bottom.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-middle.png b/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-middle.png deleted file mode 100644 index da2dc2fea1..0000000000 Binary files a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-middle.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber.png b/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber.png deleted file mode 100644 index 26f8399989..0000000000 Binary files a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber.png and /dev/null differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index c67e06c80b..e400f992cd 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -534,3 +534,4 @@ 63169=reinforced-payload-conveyor|block-reinforced-payload-conveyor-ui 63168=reinforced-payload-router|block-reinforced-payload-router-ui 63167=disperse|block-disperse-ui +63166=large-shield-projector|block-large-shield-projector-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 0ab389a106..6448d9c3a3 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index dcba0bc1a0..e7f176009e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -72,7 +72,6 @@ public class Blocks{ //erekir siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, phaseHeater, heatRedirector, slagIncinerator, carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor, - cellSynthesisChamber, //sandbox powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator, @@ -1430,37 +1429,6 @@ public class Blocks{ outputItem = new ItemStack(Items.fissileMatter, 1); }}; - //TODO needs to be completely redone from the ground up - if(false) - cellSynthesisChamber = new LiquidConverter("cell-synthesis-chamber"){{ - //TODO booster mechanics? - requirements(Category.crafting, with(Items.thorium, 100, Items.phaseFabric, 120, Items.titanium, 150, Items.surgeAlloy, 70)); - outputLiquid = new LiquidStack(Liquids.neoplasm, 0.4f); - craftTime = 200f; - size = 3; - hasPower = true; - hasItems = true; - hasLiquids = true; - rotate = false; - solid = true; - outputsLiquid = true; - drawer = new DrawCells(){{ - color = Color.valueOf("9e172c"); - particleColorFrom = Color.valueOf("9e172c"); - particleColorTo = Color.valueOf("f98f4a"); - radius = 2.5f; - lifetime = 1400f; - recurrence = 2f; - particles = 20; - range = 3f; - }}; - liquidCapacity = 30f; - - consumes.power(2f); - consumes.items(with(Items.sporePod, 3, Items.phaseFabric, 1)); - consumes.liquid(Liquids.water, 0.8f); - }}; - //endregion //region defense