Merge pull request #3525 from CheeseDogg0/dev

Material Melting and Boiling Update

code/modules/materials/definitions/liquids/materials_liquid_solvents.dm

@@ -9,8 +9,8 @@
 	value = 1.2
 	solvent_power = MAT_SOLVENT_STRONG + 2
 	solvent_melt_dose = 10
-	boiling_point = 290 CELSIUS
-	melting_point = 10 CELSIUS
+	melting_point = 284
+	boiling_point = 611
 	latent_heat = 612
 	molar_mass = 0.098
 
@@ -24,8 +24,8 @@
 	solvent_melt_dose = 8
 	solvent_max_damage = 30
 	value = 1.5
-	boiling_point = 48 CELSIUS
-	melting_point = -30 CELSIUS
+	boiling_point = 382
+	melting_point = 160
 	molar_mass = 0.036
 
 /decl/material/liquid/acid/polyacid
@@ -62,7 +62,7 @@
 	value = 0.1
 	solvent_power = MAT_SOLVENT_MODERATE
 	toxicity = 3
-	boiling_point = 56 CELSIUS
-	melting_point = -95 CELSIUS
+	boiling_point = 330
+	melting_point = 179
 	latent_heat = 525
 	molar_mass = 0.058

code/modules/materials/definitions/liquids/materials_liquid_toxins.dm

@@ -88,6 +88,8 @@
 	lore_text = "A highly toxic chemical."
 	taste_mult = 0.6
 	color = "#cf3600"
+	melting_point = 261
+	boiling_point = 299
 	toxicity = 20
 	metabolism = REM * 2
 	toxicity_targets_organ = BP_HEART
@@ -271,6 +273,8 @@
 	uid = "liquid_mercury"
 	lore_text = "A chemical element."
 	taste_mult = 0 //mercury apparently is tasteless. IDK
+	melting_point = 234
+	boiling_point = 629
 	color = "#484848"
 	value = 0.5
 	narcosis = 5

code/modules/materials/definitions/solids/materials_solid_elements.dm

@@ -2,6 +2,8 @@
 	name = "boron"
 	uid = "solid_boron"
 	lore_text = "Boron is a chemical element with the symbol B and atomic number 5."
+	melting_point = 2349
+	boiling_point = 4200
 	flags = MAT_FLAG_FUSION_FUEL | MAT_FLAG_FISSIBLE
 
 	neutron_cross_section = 10
@@ -18,6 +20,8 @@
 	name = "lithium"
 	uid = "solid_lithium"
 	lore_text = "A chemical element, used as antidepressant."
+	melting_point = 453
+	boiling_point = 1615
 	flags = MAT_FLAG_FUSION_FUEL
 	taste_description = "metal"
 	color = "#808080"
@@ -28,6 +32,8 @@
 	name = "carbon"
 	uid = "solid_carbon"
 	lore_text = "A chemical element, the building block of life."
+	melting_point = 3800
+	boiling_point = 4300
 	taste_description = "sour chalk"
 	taste_mult = 1.5
 	color = "#1c1300"
@@ -46,6 +52,8 @@
 	name = "phosphorus"
 	uid = "solid_phosphorus"
 	lore_text = "A chemical element, the backbone of biological energy carriers."
+	melting_point = 317
+	boiling_point = 550
 	taste_description = "vinegar"
 	color = "#832828"
 	value = 0.5
@@ -61,6 +69,8 @@
 	name = "sodium"
 	uid = "solid_sodium"
 	lore_text = "A chemical element, readily reacts with water."
+	melting_point = 1687
+	boiling_point = 3173
 	taste_description = "salty metal"
 	color = "#808080"
 	value = 0.5
@@ -69,6 +79,8 @@
 	name = "sulfur"
 	uid = "solid_sulfur"
 	lore_text = "A chemical element with a pungent smell."
+	melting_point = 388
+	boiling_point = 717
 	taste_description = "old eggs"
 	color = "#bf8c00"
 	value = 0.5
@@ -77,6 +89,8 @@
 	name = "potassium"
 	uid = "solid_potassium"
 	lore_text = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
+	melting_point = 336
+	boiling_point = 1032
 	taste_description = "sweetness" //potassium is bitter in higher doses but sweet in lower ones.
 	color = "#a0a0a0"
 	value = 0.5

code/modules/materials/definitions/solids/materials_solid_fission.dm

@@ -41,6 +41,8 @@
 	table_icon_base = "stone"
 	icon_reinf = 'icons/turf/walls/reinforced_stone.dmi'
 	wall_flags = 0 //Since we're using an unpaintable icon_base and icon_reinf
+	melting_point = 910
+	boiling_point = 4300
 	color = "#404c53"
 	value = 0.5
 	exoplanet_rarity_plant = MAT_RARITY_UNCOMMON
@@ -65,6 +67,8 @@
 	table_icon_base = "stone"
 	icon_reinf = 'icons/turf/walls/reinforced_stone.dmi'
 	wall_flags = 0 //Since we're using an unpaintable icon_base and icon_reinf
+	melting_point = 912
+	boiling_point = 3503
 	color = "#b5c5a2"
 	value = 3
 	exoplanet_rarity_plant = MAT_RARITY_UNCOMMON
@@ -101,4 +105,4 @@
 	dissolves_into = list(
 		/decl/material/solid/metal/radium = 0.5,
 		/decl/material/solid/lithium = 0.5
-	)
+	)

code/modules/materials/definitions/solids/materials_solid_gemstones.dm

@@ -18,6 +18,9 @@
 	name = "diamond"
 	uid = "solid_diamond"
 	lore_text = "An extremely hard allotrope of carbon. Valued for its use in industrial tools."
+	melting_point = 4300
+	boiling_point = null
+	ignition_point = null
 	brute_armor = 10
 	burn_armor = 50		// Diamond walls are immune to fire, therefore it makes sense for them to be almost undamageable by burn damage type.
 	stack_origin_tech = "{'materials':6}"

code/modules/materials/definitions/solids/materials_solid_glass.dm

@@ -12,7 +12,7 @@
 	hardness = MAT_VALUE_RIGID + 10
 	door_icon_base = "metal"
 	reflectiveness = MAT_VALUE_SHINY
-	melting_point = 1873
+	melting_point = 1674
 	boiling_point = null
 	ignition_point = null
 	weight = MAT_VALUE_VERY_LIGHT
@@ -32,7 +32,7 @@
 	return ..() && !is_reinforced()
 
 /decl/material/solid/glass/borosilicate
-	name = "borosilicate glass"
+	name = "heat-resistant glass"
 	codex_name = null
 	uid = "solid_borosilicate_glass"
 	lore_text = "An extremely heat-resistant form of glass."
@@ -42,7 +42,7 @@
 	integrity = 70
 	brute_armor = 2
 	burn_armor = 5
-	melting_point = T0C + 4000
+	melting_point = 4274
 	color = GLASS_COLOR_SILICATE
 	stack_origin_tech = "{'materials':4}"
 	construction_difficulty = MAT_VALUE_HARD_DIY
@@ -58,7 +58,7 @@
 	)
 	color = COLOR_OFF_WHITE
 	opacity = 0.6
-	melting_point = 1400
+	melting_point = 1674
 	hardness = MAT_VALUE_HARD
 	weight = MAT_VALUE_LIGHT
 	integrity = 120

code/modules/materials/definitions/solids/materials_solid_metal.dm

@@ -27,6 +27,8 @@
 	lore_text = "A silvery-white metallic chemical element in the actinide series, weakly radioactive. Commonly used as fuel in fission reactors."
 	mechanics_text = "Uranium can be used as fuel in fission reactors."
 	taste_description = "the inside of a reactor"
+	melting_point = 1407
+	boiling_point = 4074
 	flags = MAT_FLAG_FISSIBLE
 	radioactivity = 12
 	icon_base = 'icons/turf/walls/stone.dmi'
@@ -67,6 +69,8 @@
 	lore_text = "Radium is an alkaline earth metal. It is extremely radioactive."
 	mechanics_text = "Radium can be used as a neutron source in fission reactors."
 	taste_description = "the color blue, and regret"
+	melting_point = 1234
+	boiling_point = 1414
 	color = "#c7c7c7"
 	value = 0.5
 	radioactivity = 18
@@ -76,6 +80,8 @@
 	codex_name = "elemental gold"
 	uid = "solid_gold"
 	lore_text = "A heavy, soft, ductile metal. Once considered valuable enough to back entire currencies, now predominantly used in corrosion-resistant electronics."
+	melting_point = 1337
+	boiling_point = 2974
 	color = COLOR_GOLD
 	hardness = MAT_VALUE_FLEXIBLE + 5
 	integrity = 100
@@ -96,6 +102,8 @@
 	codex_name = "bronze alloy"
 	uid = "solid_bronze"
 	lore_text = "An alloy of copper and tin. Once used in weapons and laboring tools."
+	melting_point = 1184
+	boiling_point = 2574
 	color = "#ccbc63"
 	brute_armor = 3
 	hardness = MAT_VALUE_RIGID + 10
@@ -136,6 +144,8 @@
 	name = "brass"
 	uid = "solid_brass"
 	lore_text = "An alloy of copper and zinc. Renowned for its golden color."
+	melting_point = 1174
+	boiling_point = 1374
 	color = "#dab900"
 	reflectiveness = MAT_VALUE_VERY_SHINY
 	value = 1.2
@@ -147,6 +157,8 @@
 	name = "copper"
 	uid = "solid_copper"
 	lore_text = "A metal used in some components and many alloys. Known for its color-shifting properties when oxidized."
+	melting_point = 1357
+	boiling_point = 2774
 	color = COLOR_COPPER
 	weight = MAT_VALUE_NORMAL
 	hardness = MAT_VALUE_FLEXIBLE + 10
@@ -156,6 +168,8 @@
 	name = "silver"
 	uid = "solid_silver"
 	lore_text = "A soft, white, lustrous transition metal. Has many and varied industrial uses in electronics, solar panels and mirrors."
+	melting_point = 1234
+	boiling_point = 2444
 	color = "#d1e6e3"
 	hardness = MAT_VALUE_FLEXIBLE + 10
 	stack_origin_tech = "{'materials':3}"
@@ -175,6 +189,8 @@
 	codex_name = "carbon steel"
 	uid = "solid_steel"
 	lore_text = "A strong, flexible alloy of iron and carbon. Probably the single most fundamentally useful and ubiquitous substance in human space."
+	melting_point = 1734
+	boiling_point = 2774
 	weight = MAT_VALUE_NORMAL
 	wall_support_value = MAT_VALUE_VERY_HEAVY // Ideal construction material.
 	hardness = MAT_VALUE_HARD
@@ -233,6 +249,8 @@
 	name = "stainless steel"
 	uid = "solid_stainless_steel"
 	lore_text = "A reflective alloy of steel and chromium. Used for its reflective and sturdy properties."
+	melting_point = 1784
+	boiling_point = null
 	wall_support_value = MAT_VALUE_HEAVY
 	integrity = 175
 	burn_armor = 10
@@ -252,6 +270,8 @@
 	name = "aluminium"
 	uid = "solid_aluminium"
 	lore_text = "A low-density ductile metal with a silvery-white sheen."
+	melting_point = 932
+	boiling_point = 2474
 	integrity = 125
 	weight = MAT_VALUE_LIGHT
 	icon_base = 'icons/turf/walls/solid.dmi'
@@ -320,7 +340,8 @@
 	brute_armor = 10
 	burn_armor = 8
 	integrity = 200
-	melting_point = 3000
+	melting_point = 1944
+	boiling_point = 3474
 	weight = MAT_VALUE_LIGHT
 	icon_base = 'icons/turf/walls/metal.dmi'
 	wall_flags = PAINT_PAINTABLE
@@ -367,6 +388,8 @@
 	name = "osmium"
 	uid = "solid_osmium"
 	lore_text = "An extremely hard form of platinum."
+	melting_point = 3307
+	boiling_point = 5285
 	color = "#9999ff"
 	stack_origin_tech = "{'materials':5}"
 	construction_difficulty = MAT_VALUE_VERY_HARD_DIY
@@ -376,6 +399,8 @@
 	name = "platinum"
 	uid = "solid_platinum"
 	lore_text = "A very dense, unreactive, precious metal. Has many industrial uses, particularly as a catalyst."
+	melting_point = 2041
+	boiling_point = 4098
 	color = "#deddff"
 	weight = MAT_VALUE_VERY_HEAVY
 	wall_support_value = MAT_VALUE_VERY_HEAVY
@@ -396,6 +421,8 @@
 	name = "iron"
 	uid = "solid_iron"
 	lore_text = "A ubiquitous, very common metal. The epitaph of stars and the primary ingredient in Earth's core."
+	melting_point = 1811
+	boiling_point = 3134
 	color = "#5c5454"
 	hitsound = 'sound/weapons/smash.ogg'
 	construction_difficulty = MAT_VALUE_NORMAL_DIY
@@ -412,6 +439,8 @@
 	name = "tin"
 	uid = "solid_tin"
 	lore_text = "A soft metal that can be cut without much force. Used in many alloys."
+	melting_point = 505
+	boiling_point = 2875
 	color = "#c5c5a8"
 	hardness = MAT_VALUE_SOFT + 10
 	construction_difficulty = MAT_VALUE_EASY_DIY
@@ -421,6 +450,8 @@
 	name = "lead"
 	uid = "solid_lead"
 	lore_text = "A very soft, heavy and poisonous metal. You probably shouldn't lick it."
+	melting_point = 600
+	boiling_point = 2022
 	color = "#3f3f4d"
 	hardness = MAT_VALUE_SOFT
 	construction_difficulty = MAT_VALUE_NORMAL_DIY
@@ -432,6 +463,8 @@
 	name = "zinc"
 	uid = "solid_zinc"
 	lore_text = "A dull-looking metal with some use in alloying."
+	melting_point = 692
+	boiling_point = 1180
 	color = "#92aae4"
 	construction_difficulty = MAT_VALUE_NORMAL_DIY
 	reflectiveness = MAT_VALUE_MATTE
@@ -443,7 +476,8 @@
 	color = "#dadada"
 	integrity = 200
 	burn_armor = 15 // Strong against laser weaponry, but not as good as OCP.
-	melting_point = 6000
+	melting_point = 2180
+	boiling_point = 2944
 	icon_base = 'icons/turf/walls/solid.dmi'
 	icon_reinf = 'icons/turf/walls/reinforced.dmi'
 	wall_flags = PAINT_PAINTABLE|PAINT_STRIPABLE|WALL_HAS_EDGES