diff --git a/mods/nousersthings.js b/mods/nousersthings.js index 97c7be41..2fa1a8cb 100644 --- a/mods/nousersthings.js +++ b/mods/nousersthings.js @@ -315,7 +315,7 @@ elements.destroyable_pipe = { var y = pixel.y+coord[1]; if (isEmpty(x,y)) { createPixel("brick",x,y); - pixelMap[x][y].color = pixelColorPick(pixel,"#808080"); + pixelMap[x][y].color = pixelColorPick(pixel,"#586879"); } } pixel.stage = 1; @@ -626,7 +626,7 @@ elements.e_pipe = { var y = pixel.y+coord[1]; if (isEmpty(x,y)) { createPixel("pipe_wall",x,y); - pixelMap[x][y].color = pixelColorPick(pixel,"#808080"); + pixelMap[x][y].color = pixelColorPick(pixel,"#586879"); } } pixel.stage = 1; @@ -744,7 +744,7 @@ elements.destroyable_e_pipe = { var y = pixel.y+coord[1]; if (isEmpty(x,y)) { createPixel("brick",x,y); - pixelMap[x][y].color = pixelColorPick(pixel,"#808080"); + pixelMap[x][y].color = pixelColorPick(pixel,"#586879"); } } pixel.stage = 1; @@ -871,7 +871,7 @@ elements.channel_pipe = { var y = pixel.y+coord[1]; if (isEmpty(x,y)) { createPixel("pipe_wall",x,y); - pixelMap[x][y].color = pixelColorPick(pixel,"#808080"); + pixelMap[x][y].color = pixelColorPick(pixel,"#586879"); } } pixel.stage = 1; @@ -994,7 +994,7 @@ elements.destroyable_channel_pipe = { var y = pixel.y+coord[1]; if (isEmpty(x,y)) { createPixel("brick",x,y); - pixelMap[x][y].color = pixelColorPick(pixel,"#808080"); + pixelMap[x][y].color = pixelColorPick(pixel,"#586879"); } } pixel.stage = 1; @@ -1111,7 +1111,7 @@ elements.bridge_pipe = { var y = pixel.y+coord[1]; if (isEmpty(x,y)) { createPixel("pipe_wall",x,y); - pixelMap[x][y].color = pixelColorPick(pixel,"#808080"); + pixelMap[x][y].color = pixelColorPick(pixel,"#586879"); } } pixel.stage = 1; @@ -1215,15 +1215,17 @@ elements.bridge_pipe = { canContain: true, insulate: true, }, -elements.pipe.tick = function(pixel) { + elements.pipe.tick = function(pixel) { if (!pixel.stage && pixelTicks-pixel.start > 60) { for (var i = 0; i < squareCoords.length; i++) { var coord = squareCoords[i]; var x = pixel.x+coord[0]; var y = pixel.y+coord[1]; + if (!isEmpty(x,y,true) && elements[pixelMap[x][y].element].movable) { + deletePixel(x,y) + } if (isEmpty(x,y)) { createPixel("pipe_wall",x,y); - pixelMap[x][y].color = pixelColorPick(pixel,"#808080"); } } pixel.stage = 1; @@ -1282,7 +1284,7 @@ elements.pipe.tick = function(pixel) { break; } } - else if (!pixel.con && elements[newPixel.element].movable && newPixel.element != "ray") { //suck up pixel + else if (!pixel.con && elements[newPixel.element].movable) { //suck up pixel pixel.con = newPixel; deletePixel(newPixel.x,newPixel.y); pixel.con.x = pixel.x; @@ -1321,7 +1323,7 @@ elements.pipe.tick = function(pixel) { } } doDefaults(pixel); - }, + } elements.pipe.insulate = true, filterTypeVar = 0; elements.filter = { @@ -3793,7 +3795,7 @@ elements.hotter_sensor = { let pipe_transmitter_channelVar = 0; elements.pipe_transmitter = { color: "#6e6250", - category: "machines", + category: "deprecated", movable: false, canContain: true, insulate: true, @@ -3824,7 +3826,7 @@ elements.pipe_transmitter = { let pipe_receiver_channelVar = 0; elements.pipe_receiver = { color: "#4d4b63", - category: "machines", + category: "deprecated", movable: false, canContain: true, insulate: true,