Merge pull request #1029 from charcoal-afterlife/main

1.7.12 - Water Update
This commit is contained in:
slweeb 2025-02-23 10:30:56 -05:00 committed by GitHub
commit 3978cc5802
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 15 deletions

View File

@ -1,3 +1,4 @@
elements.mars_gunk = { elements.mars_gunk = {
color: "#121212", color: "#121212",
behavior: behaviors.DGAS, behavior: behaviors.DGAS,
@ -28,7 +29,8 @@ elements.molten_mars = {
state: "liquid", state: "liquid",
hidden: "true", hidden: "true",
extraInfo: "The Result of Burnt-up mars stuff. Some turn into this faster more than others.", extraInfo: "The Result of Burnt-up mars stuff. Some turn into this faster more than others.",
temp: 2500 temp: 2500,
density: 1150
} }
elements.mars_rock = { elements.mars_rock = {
color: ["#a51002","#bd1102"], color: ["#a51002","#bd1102"],
@ -185,14 +187,15 @@ elements.liquid_red_gold = {
state: "liquid", state: "liquid",
density: 8, density: 8,
extraInfo: "Red Gold but a fludid.", extraInfo: "Red Gold but a fludid.",
temp: 5500 temp: 5500,
density: 3500
} }
elements.liquid_mars_dust = { elements.mars_water = {
color: "#DB3629", color: "#F94849",
behavior: behaviors.LIQUID, behavior: behaviors.LIQUID,
category: "archived", category: "mars",
state: "liquid", state: "liquid",
extraInfo: "Mars Dust Fluid. Removed 04/02/25." density: 997
} }
elements.testy = { elements.testy = {
color: "#FFFFFF", color: "#FFFFFF",
@ -201,13 +204,6 @@ elements.testy = {
state: "solid", state: "solid",
extraInfo: "Don't mind me, just a test. Removed 06/02/25?" extraInfo: "Don't mind me, just a test. Removed 06/02/25?"
} }
elements.legacy_liquid_mars_dust = {
color: "#DB3629",
behavior: behaviors.SUPERFLUID,
category: "archived",
state: "liquid",
extraInfo: "Mars Dust Superfluid. Changed at the start."
}
elements.o2_tank = { elements.o2_tank = {
color: "#98F5F9", color: "#98F5F9",
behavior: [ behavior: [
@ -222,7 +218,7 @@ elements.o2_tank = {
breakInto: ["copper", "oxygen"] breakInto: ["copper", "oxygen"]
} }
// 1.6.11 // 1.7.12
// most elements done :D // most elements done :D
// iron heart ore // iron heart ore
// iron heart // iron heart
@ -241,4 +237,5 @@ elements.o2_tank = {
// machines are smashable. please smash them. // machines are smashable. please smash them.
// also heatable // also heatable
// O2 BE YOU // O2 BE YOU
// ironheart faster // mars water
// removed legacy liquid mars dust