From 49af22eecff9ef425717fd5066fb8f261e97c403 Mon Sep 17 00:00:00 2001 From: jakob3797 <167775393+jakob3797@users.noreply.github.com> Date: Thu, 2 May 2024 08:20:46 -0500 Subject: [PATCH 1/7] Update Quicksand_one.js Combined tested and working --- Quicksand_one.js | 517 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 517 insertions(+) create mode 100644 Quicksand_one.js diff --git a/Quicksand_one.js b/Quicksand_one.js new file mode 100644 index 00000000..1c1c4ab1 --- /dev/null +++ b/Quicksand_one.js @@ -0,0 +1,517 @@ + +elements.peat_bog = { + color: "#483C32", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 55, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1200, + stain: 0.2 +}; +elements.marsh_muck = { + color: "#6B8E23", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 50, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1000, + stain: 0.25 +}; +elements.quagmire = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1000, + stain: 0.3 +}; +elements.slime_mold = { + color: "#00FF00", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 30, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1000, + stain: 0.2 +}; +elements.mangrove_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 55, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1089, + stain: 0.25 +}; +peat_slurry = { + color: "#556B2F", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 50, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1452, + stain: 0.28 +}; +elements.bog_ooze = { + color: "#2E8B57", + behavior:elements.slime.behavior, + viscosity: 10000, + tempHigh: 100, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1350, + stain: 0.3 +}; +elements.fen_mud = { + color: "#556B2F", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 100, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1550, + stain: 0.28 +}; +elements.swamp_sludge = { + color: "#6B8E23", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 52, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1450, + stain: 0.25 +}; +elements.marsh_slime = { + color: "#00FF00", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 32, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1050, + stain: 0.16 +}; +elements.peat_paste = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 57, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1600, + stain: 0.1 +}; +elements.mudflat_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1700, + stain: 0.25 +}; +elements.swamp_ooze = { + color: "#556B2F", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 54, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1400, + stain: 0.20 +}; +elements.peat_pudding = { + color: "#8B4513", + behavior: elements.sap.behavior, + viscosity: 10000, + tempHigh: 58, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1600, + stain: 0.21 +}; +elements.mudflow = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1700, + stain: 0.2 +}; +elements.marsh_mire = { + color: "#6B8E23", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 55, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1500, + stain: 0.12 +}; +elements.moor = { + color: "#556B2F", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 57, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1600, + stain: 0.18 +}; +elements.quicksand_fen = { + color: "#DAA520", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 62, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1550, + stain: 0.15 +}; +elements.marsh_mudslide = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 58, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1600, + stain: 0.1 +}; +elements.swamp_slime = { + color: "#00FF00", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 35, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1100, + stain: 0.15 +}; +elements.mire_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1700, + stain: 0.17 +}; +elements.peat_quicksand = { + color: "#DAA520", + behavior: elements.slime.behavior, + viscosity: 10000, + tempHigh: 65, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1800, + stain: 0.15 +}; +elements.dense_quicksand = { + color: "#DAA520", + behavior: elements.slime.behavior, + viscosity: 1000, + tempHigh: 65, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1900, + stain: 0.2 +}; +elements.swamp_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1000, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1700, + stain: 0.25 +}; +elements.wet_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1200, + tempHigh: 55, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1600, + stain: 0.3 +}; +elements.wet_quicksand = { + color: "#DAA520", + behavior: elements.slime.behavior, + viscosity: 700, + tempHigh: 70, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1080, + stain: 0.25 +}; +elements.slimy_mud = { + color: "#008000", + behavior: elements.slime.behavior, + viscosity: 900, + tempHigh: 55, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1550, + stain: 0.3 +}; +elements.sticky_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1100, + tempHigh: 58, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1321, + stain: 0.25 +}; +elements.sloppy_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1000, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1700, + stain: 0.3 +}; +elements.thick_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1300, + tempHigh: 50, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1800, + stain: 0.35 +}; +elements.gloopy_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosit: 1950, + tempHigh: 56, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1000, + stain: 0.28 +}; +elements.squelchy_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1050, + tempHigh: 58, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1050, + stain: 0.3 +}; +elements.mucky_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 950, + tempHigh: 57, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1200, + stain: 0.28 +}; +elements.soggy_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1050, + tempHigh: 58, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1090, + stain: 0.3 +}; +elements.gunky_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 900, + tempHigh: 55, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1550, + stain: 0.28 +}; +elements.oozy_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 950, + tempHigh: 56, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1000, + stain: 0.3 +}; +elements.gooey_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1000, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1300, + stain: 0.3 +}; +elements.goopy_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1100, + tempHigh: 58, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1080, + stain: 0.3 +}; +elements.mushy_mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1000, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1200, + stain: 0.3 +}; +elements.mud = { + color: "#8B4513", + behavior: elements.slime.behavior, + viscosity: 1050, + tempHigh: 58, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1000, + stain: 0.3 +}; +elements.quicksand = { + color: "#DAA520", + behavior: elements.slime.behavior, + viscosity: 1750, + tempHigh: 70, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1300, + stain: 0.25 +}; +elements.sandy_mud = { + color: "#8B4513", + behavior: elements.sap.behavior, + viscosity: 1600, + tempHigh: 60, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1100, + stain: 0.3 +}; +elements.sticky_quicksand = { + color: "#DAA520", + behavior: behaviors.LIQUID, + viscosity: 1700, + tempHigh: 65, + stateHigh: "liquid", + tempLow: 0, + category: "liquids", + state: "liquid", + density: 1100, + stain: 0.25 +}; From 2b4a3b89953bb76ba6629919842b7e0d29102fe3 Mon Sep 17 00:00:00 2001 From: jakob3797 <167775393+jakob3797@users.noreply.github.com> Date: Thu, 2 May 2024 08:31:00 -0500 Subject: [PATCH 2/7] Update Quicksand_one.js --- Quicksand_one.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Quicksand_one.js b/Quicksand_one.js index 1c1c4ab1..01659cc1 100644 --- a/Quicksand_one.js +++ b/Quicksand_one.js @@ -505,7 +505,7 @@ elements.sandy_mud = { }; elements.sticky_quicksand = { color: "#DAA520", - behavior: behaviors.LIQUID, + behavior:elements.sap.behavior, viscosity: 1700, tempHigh: 65, stateHigh: "liquid", From ae5664e47dc1c1988de47be14804b5fc6cb99440 Mon Sep 17 00:00:00 2001 From: slweeb <91897291+slweeb@users.noreply.github.com> Date: Fri, 3 May 2024 15:01:20 -0400 Subject: [PATCH 3/7] Delete mods/Quicksand_one.js --- mods/Quicksand_one.js | 266 ------------------------------------------ 1 file changed, 266 deletions(-) delete mode 100644 mods/Quicksand_one.js diff --git a/mods/Quicksand_one.js b/mods/Quicksand_one.js deleted file mode 100644 index ccaa75a5..00000000 --- a/mods/Quicksand_one.js +++ /dev/null @@ -1,266 +0,0 @@ - - elements.peat_bog = { - color: "#483C32", - behavior: behaviors.LIQUID, - viscosity: 10000, - tempHigh: 55, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 120, - stain: 0.2 - }; -elements.marsh_muck = { - color: "#6B8E23", - behavior: behaviors.LIQUID, - viscosity: 10000, - tempHigh: 50, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 140, - stain: 0.25 - }; -elements.quagmire = { - color: "#8B4513", - behavior: behaviors.LIQUID, - viscosity: 10000, - tempHigh: 60, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 160, - stain: 0.3 - }; -elements.slime_mold = { - color: "#00FF00", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 30, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 100, - stain: 0.2 - }; -elements.mangrove_mud = { - color: "#8B4513", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 55, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 150, - stain: 0.25 - }; - peat_slurry = { - color: "#556B2F", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 50, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 130, - stain: 0.28 - }; - elements.bog_ooze = { - color: "#2E8B57", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 100, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 135, - stain: 0.3 - }; - elements.fen_mud = { - color: "#556B2F", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 100, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 155, - stain: 0.28 - }; - elements.swamp_sludge = { - color: "#6B8E23", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 52, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 145, - stain: 0.25 - }; - elements.marsh_slime = { - color: "#00FF00", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 32, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 105, - stain: 0.16 - }; - elements.peat_paste = { - color: "#8B4513", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 57, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 160, - stain: 0.1 - }; - elements.mudflat_mud = { - color: "#8B4513", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 60, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 170, - stain: 0.25 - }; - elements.swamp_ooze = { - color: "#556B2F", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 54, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 140, - stain: 0.20 - }; - elements.peat_pudding = { - color: "#8B4513", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 58, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 160, - stain: 0.21 - }; - elements.mudflow = { - color: "#8B4513", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 60, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 170, - stain: 0.2 - }; - elements.marsh_mire = { - color: "#6B8E23", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 55, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 150, - stain: 0.12 - }; - elements.peat_paste = { - color: "#556B2F", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 57, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 160, - stain: 0.18 - }; - elements.quicksand_fen = { - color: "#DAA520", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 62, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 155, - stain: 0.15 - }; - elements.marsh_mudslide = { - color: "#8B4513", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 58, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 160, - stain: 0.1 - }; - elements.swamp_slime = { - color: "#00FF00", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 35, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 110, - stain: 0.15 - }; - elements.mire_mud = { - color: "#8B4513", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 60, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 170, - stain: 0.17 - }; - elements.peat_quicksand = { - color: "#DAA520", - behavior: behaviors.STICKY, - viscosity: 10000, - tempHigh: 65, - stateHigh: "liquid", - tempLow: 0, - category: "liquids", - state: "liquid", - density: 180, - stain: 0.15 - }; - From 1812374689fb89574e20e57c3a7be27eafcb3373 Mon Sep 17 00:00:00 2001 From: slweeb <91897291+slweeb@users.noreply.github.com> Date: Fri, 3 May 2024 15:01:22 -0400 Subject: [PATCH 4/7] moved Quicksand_one.js --- Quicksand_one.js => mods/Quicksand_one.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Quicksand_one.js => mods/Quicksand_one.js (100%) diff --git a/Quicksand_one.js b/mods/Quicksand_one.js similarity index 100% rename from Quicksand_one.js rename to mods/Quicksand_one.js From e9fe9563c5ac184094f1bcb2998a9549fd37c28c Mon Sep 17 00:00:00 2001 From: DoobieRalsei <163950752+DoobieRalsei@users.noreply.github.com> Date: Fri, 3 May 2024 13:22:17 -0700 Subject: [PATCH 5/7] Fixed scp.js bugs Fixed doc body color bug, made 682 and 096 kill zombies. Next update will make 096 more functional. --- mods/scp.js | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/mods/scp.js b/mods/scp.js index bdc51970..a6eb71dc 100644 --- a/mods/scp.js +++ b/mods/scp.js @@ -253,7 +253,6 @@ elements.mask_head = { burnTime: 250, burnInto: "possessive_mask", breakInto: "possessive_mask", - forceSaveColor: true, reactions: { "cancer": { elem1: "possessive_mask", chance:0.05 }, "tea": { elem2:null, chance:0.2 }, @@ -429,6 +428,7 @@ elements.plague_doctor = { createPixel("doc_head", pixel.x, pixel.y-1); pixelMap[pixel.x][pixel.y-1].color = pixel.color; pixel.element = "doc_body"; + pixelMap[pixel.x][pixel.y].color = ["#11111f","#242424"]; } else { deletePixel(pixel.x, pixel.y); @@ -593,7 +593,6 @@ elements.doc_body = { burn: .01, burnTime: 300, burnInto: "rotten_meat", - forceSaveColor: true, reactions: { "head": { elem2 : "z_head" , chance:0.3}, "body": { elem2 : "z_body" , chance:0.3}, @@ -869,9 +868,11 @@ elements.shy_head = { burnTime: 3000, burnInto: "bone", reactions: { - "homunculus": { elem2 : ["blood","slime","blood","slime","rotten_meat",null] }, - "head": { elem2 : ["blood","blood","blood","bone",null] }, - "body": { elem2: ["blood","blood","meat","bone",null] }, + "homunculus": { elem2 : ["blood","slime","blood","slime","rotten_meat",null] }, + "head": { elem2 : ["blood","blood","blood","bone",null] }, + "body": { elem2: ["blood","blood","meat","bone",null] }, + "z_head": { elem2 : ["infection","infection","infection","bone",null] }, + "z_body": { elem2: ["infection","infection","rotten_meat","bone",null] }, "rat": { elem2: ["infection","rotten_meat",null]}, "frog": { elem2: ["slime",null] }, "cell": { elem2: ["dna","water",null] }, @@ -986,10 +987,12 @@ elements.shy_body = { burnInto: "bone", forceSaveColor: true, reactions: { - "homunculus": { elem2 : ["blood","slime","blood","slime","rotten_meat",null] }, - "head": { elem2 : ["blood","blood","blood","meat","bone",null] }, - "body": { elem2: ["blood","blood","meat","bone",null] }, - "rat": { elem2: ["infection","rotten_meat"]}, + "homunculus": { elem2 : ["blood","slime","blood","slime","rotten_meat",null] }, + "head": { elem2 : ["blood","blood","blood","bone",null] }, + "body": { elem2: ["blood","blood","meat","bone",null] }, + "z_head": { elem2 : ["infection","infection","infection","bone",null] }, + "z_body": { elem2: ["infection","infection","rotten_meat","bone",null] }, + "rat": { elem2: ["infection","infection","plague"] }, "frog": { elem2: "slime" }, "cell": { elem2: ["dna","water",null] }, "cancer": { elem2: ["dna","dirty_water"] }, @@ -1007,11 +1010,12 @@ elements.SCP_682 = { category: "scp", density: 7500, reactions: { - "head": { elem2 : ["bone","blood",null] , chance:10 }, - "body": { elem1 : "mad_682" , elem2 : ["meat","blood",null] , chance:10 }, - "z_head": { elem2 : ["bone","infection",null] , chance:10 }, - "z_body": { elem1 : "mad_682" , elem2 : ["rotten_meat","infection",null] , chance:10 }, - "homunculus": { elem2 : ["slime","blood",null] , chance:10 }, + "head": { elem2 : ["bone","blood",null] , chance:50 }, + "body": { elem1 : "mad_682" , elem2 : ["meat","blood",null] , chance:50 }, + "z_head": { elem2 : ["infection","infection","infection","bone",null] , chance:50 }, + "z_body": { elem1 : "mad_682" , elem2: ["infection","infection","rotten_meat","bone",null] , chance:50 }, + "homunculus": { elem2 : ["slime","blood",null] , chance:10 }, + "rat": { elem2: ["infection","infection","plague"] }, "frog": { elem2 : ["slime","blood",null] , chance:10 }, "bird": { elem2 : ["feather","blood",null] , chance:10 }, "meat": { elem2 : null , chance:0.2 }, @@ -1072,6 +1076,8 @@ elements.mad_682 = { reactions: { "head": { elem2 : ["bone","blood",null] }, "body": { elem2 : ["meat","blood",null] }, + "z_head": { elem2 : ["bone","infection",null] }, + "z_body": { elem2 : ["meat","infection",null] }, "homunculus": { elem2 : ["slime","blood",null] }, "frog": { elem2 : ["slime","blood",null] }, "bird": { elem2 : ["feather","blood",null] }, @@ -1223,4 +1229,4 @@ elements.hyper_tickle_monster = { stain: 0.08, }; -// SCPs with ID over 999 here \ No newline at end of file +// SCPs with ID over 999 here From e5403e8ebcd40a0aa30303ee2345291ed5d5f6d6 Mon Sep 17 00:00:00 2001 From: JustAGenericUsername <92590792+JustAGenericUsername@users.noreply.github.com> Date: Fri, 3 May 2024 18:01:02 -0400 Subject: [PATCH 6/7] heat fix --- mods/heatglow.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/heatglow.js b/mods/heatglow.js index 8c8dabc0..2293bc77 100644 --- a/mods/heatglow.js +++ b/mods/heatglow.js @@ -3,7 +3,7 @@ function weightedAverage(num1, num2, weight){ } const heatfunc = function(pixel){ if (pixel.element != "metal_scrap" || eLists.metals.includes(pixel.scrapType) || !pixel.scrapType){{ - if (pixel.ogR == null || pixel.ogG == null || pixel.ogB == null || (pixel.element != pixel.ogElement && pixel.element == "metal_scrap") || (pixel.element != "metal_scrap" && pixel.ogElement == "metal_scrap")){ + if (pixel.ogR == null || pixel.ogG == null || pixel.ogB == null || (pixel.element != pixel.ogElement && pixel.element == "metal_scrap") || (pixel.element != "metal_scrap" && pixel.ogElement == "metal_scrap") || (pixel.element == "oxidized_copper" && pixel.ogElement == "copper")){ pixel.ogR = parseInt(pixel.color.slice(4, pixel.color.indexOf(',')), 10) pixel.ogG = parseInt(pixel.color.slice(pixel.color.indexOf(',') + 1, pixel.color.lastIndexOf(',')), 10) pixel.ogB = parseInt(pixel.color.slice(pixel.color.lastIndexOf(',') + 1, -1), 10) From b382f4b237f398f2d057427a325fd03fb77bf803 Mon Sep 17 00:00:00 2001 From: slweeb <91897291+slweeb@users.noreply.github.com> Date: Sat, 4 May 2024 17:58:57 -0400 Subject: [PATCH 7/7] hotfix --- index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 3f8dcae8..61314622 100644 --- a/index.html +++ b/index.html @@ -16244,7 +16244,7 @@ Cancer, Landmine, Grenade, Smoke Grenade">? Infinite Chef

-

Email us at contact@R74n.com for advertising, help, or education!

+

Email us at contact@R74n.com for advertising, help, or education!

Be notified when Sandboxels and other R74n projects are updated, along with ramblings from the developer!

@@ -16259,10 +16259,10 @@ Cancer, Landmine, Grenade, Smoke Grenade">? + --> +

Support development by subscribing on our Patreon! Many benefits!!

@@ -16285,7 +16285,7 @@ Cancer, Landmine, Grenade, Smoke Grenade">? applications in education. With a hands-on experience, it can give students an understanding of emerging phenomena in many fields, such as biology, chemistry, ecology, geology, cooking, and even virology. There are countless aspects to discover.

We have a thriving community on Discord! There you can post feedback or share your creations.

-

Business inquiries? Education stories? Help needed? Email us at contact@R74n.com!

+

Business inquiries? Education stories? Help needed? Email us at contact@R74n.com!

More links: Help • Tips • Mods • Mobile • Offline • Privacy

Thanks to: Serioustar, ggod, Midi_png, personman, fnl4y, PitsPower, swagg boi, kaeud, WeiChei, Trent, u2ce