cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-11179

Browse Source
This commit is contained in:
Nadyr
2021-07-20 20:59:10 -04:00
committed by GitHub
parent 15cafbe65b 6d04a2b025
commit 744c106c86
50 changed files with 210 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mining/alloys.dm
View File

@@ -44,7 +44,7 @@
"sand" = 2
)
product = /obj/item/stack/material/glass/phoronglass
/*
/datum/alloy/bronze
metaltag = "bronze"
requires = list(
@@ -52,3 +52,4 @@
"tin" = 1
)
product = /obj/item/stack/material/bronze
*/

10
code/modules/mining/drilling/drill.dm
View File

@@ -28,9 +28,9 @@
"hydrogen" = /obj/item/weapon/ore/hydrogen,
"silicates" = /obj/item/weapon/ore/glass,
"carbon" = /obj/item/weapon/ore/coal,
"copper" = /obj/item/weapon/ore/copper,
// "copper" = /obj/item/weapon/ore/copper,
// "tin" = /obj/item/weapon/ore/tin,
"bauxite" = /obj/item/weapon/ore/bauxite,
// "bauxite" = /obj/item/weapon/ore/bauxite,
"rutile" = /obj/item/weapon/ore/rutile
)
@@ -44,14 +44,14 @@
// Found with an advanced laser. exotic_drilling >= 1
var/list/ore_types_uncommon = list(
MAT_MARBLE = /obj/item/weapon/ore/marble,
"painite" = /obj/item/weapon/ore/painite,
"quartz" = /obj/item/weapon/ore/quartz,
//"painite" = /obj/item/weapon/ore/painite,
//"quartz" = /obj/item/weapon/ore/quartz,
MAT_LEAD = /obj/item/weapon/ore/lead
)
// Found with an ultra laser. exotic_drilling >= 2
var/list/ore_types_rare = list(
"void opal" = /obj/item/weapon/ore/void_opal,
//"void opal" = /obj/item/weapon/ore/void_opal,
MAT_VERDANTIUM = /obj/item/weapon/ore/verdantium
)

8
code/modules/mining/drilling/scanner.dm
View File

@@ -41,13 +41,13 @@
var/ore_type
switch(metal)
if("silicates", "carbon", "marble", "quartz") ore_type = "surface minerals"
if("hematite", "tin", "copper", "bauxite", "lead") ore_type = "industrial metals"
if("silicates", "carbon", "marble", /*"quartz"*/) ore_type = "surface minerals"
if("hematite", /*"tin", "copper", "bauxite",*/ "lead") ore_type = "industrial metals"
if("gold", "silver", "rutile") ore_type = "precious metals"
if("diamond", "painite") ore_type = "precious gems"
if("diamond", /*"painite"*/) ore_type = "precious gems"
if("uranium") ore_type = "nuclear fuel"
if("phoron", "osmium", "hydrogen") ore_type = "exotic matter"
if("verdantium", "void opal") ore_type = "anomalous matter"
if("verdantium", /*"void opal"*/) ore_type = "anomalous matter"
if(ore_type) metals[ore_type] += T.resources[metal]

8
code/modules/mining/mine_turfs.dm
View File

@@ -63,9 +63,9 @@ var/list/mining_overlay_cache = list()
"verdantium" = /obj/item/weapon/ore/verdantium,
"marble" = /obj/item/weapon/ore/marble,
"lead" = /obj/item/weapon/ore/lead,
"copper" = /obj/item/weapon/ore/copper,
// "copper" = /obj/item/weapon/ore/copper,
// "tin" = /obj/item/weapon/ore/tin,
"bauxite" = /obj/item/weapon/ore/bauxite,
// "bauxite" = /obj/item/weapon/ore/bauxite,
// "void opal" = /obj/item/weapon/ore/void_opal,
// "painite" = /obj/item/weapon/ore/painite,
// "quartz" = /obj/item/weapon/ore/quartz,
@@ -689,10 +689,10 @@ var/list/mining_overlay_cache = list()
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list("marble" = 5,/* "quartz" = 15,*/ "copper" = 10, /*"tin" = 5,*/ "bauxite" = 5, "uranium" = 15, "platinum" = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, "diamond" = 3, "gold" = 15, "silver" = 15, "phoron" = 25, "lead" = 5,/* "void opal" = 1,*/ "verdantium" = 2/*, "painite" = 1*/))
mineral_name = pickweight(list("marble" = 5,/* "quartz" = 15, "copper" = 10, "tin" = 5, "bauxite" = 5*/, "uranium" = 15, "platinum" = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, "diamond" = 3, "gold" = 15, "silver" = 15, "phoron" = 25, "lead" = 5,/* "void opal" = 1,*/ "verdantium" = 2/*, "painite" = 1*/))
else
mineral_name = pickweight(list("marble" = 3,/* "quartz" = 10,*/ "copper" = 20, /*"tin" = 15,*/ "bauxite" = 15, "uranium" = 10, "platinum" = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 3,/* "void opal" = 1,*/ "verdantium" = 1/*, "painite" = 1*/))
mineral_name = pickweight(list("marble" = 3,/* "quartz" = 10, "copper" = 20, "tin" = 15, "bauxite" = 15*/, "uranium" = 10, "platinum" = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 3,/* "void opal" = 1,*/ "verdantium" = 1/*, "painite" = 1*/))
if(mineral_name && (mineral_name in GLOB.ore_data))
mineral = GLOB.ore_data[mineral_name]

8
code/modules/mining/ore.dm
View File

@@ -106,7 +106,7 @@
icon_state = "ore_lead"
material = MAT_LEAD
origin_tech = list(TECH_MATERIAL = 3)
/*
/obj/item/weapon/ore/copper
name = "raw copper"
icon_state = "ore_copper"
@@ -121,12 +121,12 @@
name = "raw bauxite"
icon_state = "ore_bauxite"
material = "bauxite"
*/
/obj/item/weapon/ore/rutile
name = "raw rutile"
icon_state = "ore_rutile"
material = "rutile"
/*
/obj/item/weapon/ore/void_opal
name = "raw void opal"
icon_state = "ore_void_opal"
@@ -141,7 +141,7 @@
name = "raw quartz"
icon_state = "ore_quartz"
material = "quartz"
*/
/obj/item/weapon/ore/slag
name = "Slag"
desc = "Someone screwed up..."

7
code/modules/mining/ore_datum.dm
View File

@@ -175,7 +175,7 @@
ore = /obj/item/weapon/ore/lead
scan_icon = "mineral_rare"
reagent = "lead"
/*
/ore/copper
name = "copper"
display_name = "copper"
@@ -215,7 +215,7 @@
ore = /obj/item/weapon/ore/bauxite
scan_icon = "mineral_common"
reagent = "aluminum"
*/
/ore/rutile
name = "rutile"
display_name = "rutile"
@@ -225,7 +225,7 @@
alloy = 1
ore = /obj/item/weapon/ore/rutile
scan_icon = "mineral_uncommon"
/*
/ore/painite
name = "painite"
display_name = "rough painite"
@@ -243,3 +243,4 @@
spread_chance = 1
ore = /obj/item/weapon/ore/void_opal
scan_icon = "mineral_rare"
*/