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 pull request #10397 from VOREStation/upstream-merge-8074

Browse Source 
[MIRROR] Removes tin for ore generation
This commit is contained in:
Novacat
2021-05-23 18:27:26 -04:00
committed by Chompstation Bot
parent fdf91fb0b0
commit f4b442e67d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@
"silicates" = /obj/item/weapon/ore/glass,
"carbon" = /obj/item/weapon/ore/coal,
"copper" = /obj/item/weapon/ore/copper,
"tin" = /obj/item/weapon/ore/tin,
// "tin" = /obj/item/weapon/ore/tin,
"bauxite" = /obj/item/weapon/ore/bauxite,
"rutile" = /obj/item/weapon/ore/rutile
)

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

@@ -64,7 +64,7 @@ var/list/mining_overlay_cache = list()
"marble" = /obj/item/weapon/ore/marble,
"lead" = /obj/item/weapon/ore/lead,
"copper" = /obj/item/weapon/ore/copper,
"tin" = /obj/item/weapon/ore/tin,
// "tin" = /obj/item/weapon/ore/tin,
"bauxite" = /obj/item/weapon/ore/bauxite,
// "void opal" = /obj/item/weapon/ore/void_opal,
// "painite" = /obj/item/weapon/ore/painite,
@@ -659,10 +659,10 @@ turf/simulated/mineral/floor/light_corner
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]