From 4811e97dfca1076e9b732a0a011cdc517aad4fe9 Mon Sep 17 00:00:00 2001
From: An Orbit <68935009+orbit-loona@users.noreply.github.com>
Date: Sun, 7 May 2023 15:45:02 -0400
Subject: [PATCH] incompat merge noConduct

---
 mods/doElectricity changes.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mods/doElectricity changes.js b/mods/doElectricity changes.js
index 9d7fc59b..e505fa5e 100644
--- a/mods/doElectricity changes.js	
+++ b/mods/doElectricity changes.js	
@@ -13,6 +13,7 @@ function doElectricity(pixel) {
 				var newPixel = pixelMap[x][y];
 				var con = elements[newPixel.element].conduct;
 				if (con == undefined) {continue}
+				if (info.noConduct?.length && info.noConduct.includes(newPixel.element)) {continue};
 				if (Math.random() < con) { // If random number is less than conductivity
 					if (!newPixel.charge && !newPixel.chargeCD) {
 						newPixel.charge = isNaN(pixel.charge) ? 0 : pixel.charge; //Actually set it to the same charge