Simpler lighting process, bug fixes, & modular computer tweaks (#1809)

Fixes #1806
Fixes #1730
Fixes #1747
Partially addresses #1763
Addresses #1283
Fixes #1799
Fixes #1816
Fixes #1813
This commit is contained in:
Lohikar
2017-02-24 20:24:31 +02:00
committed by skull132
parent a52092b294
commit 65e0f3de97
63 changed files with 270 additions and 146 deletions
+11 -11
View File
@@ -24,7 +24,7 @@ var/global/list/ore_data = list()
display_name = name
/ore/uranium
name = "uranium"
name = ORE_URANIUM
display_name = "pitchblende"
smelts_to = "uranium"
result_amount = 5
@@ -38,7 +38,7 @@ var/global/list/ore_data = list()
xarch_source_mineral = "potassium"
/ore/hematite
name = "hematite"
name = ORE_IRON
display_name = "hematite"
smelts_to = "iron"
alloy = 1
@@ -48,7 +48,7 @@ var/global/list/ore_data = list()
scan_icon = "mineral_common"
/ore/coal
name = "carbon"
name = ORE_COAL
display_name = "raw carbon"
smelts_to = "plastic"
alloy = 1
@@ -58,13 +58,13 @@ var/global/list/ore_data = list()
scan_icon = "mineral_common"
/ore/glass
name = "sand"
name = ORE_SAND
display_name = "sand"
smelts_to = "glass"
compresses_to = "sandstone"
/ore/phoron
name = "phoron"
name = ORE_PHORON
display_name = "phoron crystals"
compresses_to = "phoron"
//smelts_to = something that explodes violently on the conveyor, huhuhuhu
@@ -81,7 +81,7 @@ var/global/list/ore_data = list()
xarch_source_mineral = "phoron"
/ore/silver
name = "silver"
name = ORE_SILVER
display_name = "native silver"
smelts_to = "silver"
result_amount = 5
@@ -90,7 +90,7 @@ var/global/list/ore_data = list()
scan_icon = "mineral_uncommon"
/ore/gold
smelts_to = "gold"
smelts_to = ORE_GOLD
name = "gold"
display_name = "native gold"
result_amount = 5
@@ -105,7 +105,7 @@ var/global/list/ore_data = list()
)
/ore/diamond
name = "diamond"
name = ORE_DIAMOND
display_name = "diamond"
compresses_to = "diamond"
result_amount = 5
@@ -115,7 +115,7 @@ var/global/list/ore_data = list()
xarch_source_mineral = "nitrogen"
/ore/platinum
name = "platinum"
name = ORE_PLATINUM
display_name = "raw platinum"
smelts_to = "platinum"
compresses_to = "osmium"
@@ -126,8 +126,8 @@ var/global/list/ore_data = list()
scan_icon = "mineral_rare"
/ore/hydrogen
name = "mhydrogen"
name = ORE_HYDROGEN
display_name = "metallic hydrogen"
smelts_to = "tritium"
compresses_to = "mhydrogen"
scan_icon = "mineral_rare"
scan_icon = "mineral_rare"