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

Comments out upstream stuff, will be uncommented out during upstream merge

Browse Source
This commit is contained in:
Rykka
2020-05-09 18:39:27 -04:00
parent 160ac0f3d7
commit d01c717b9b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ var/list/mining_overlay_cache = list()
"verdantium" = /obj/item/weapon/ore/verdantium,
"marble" = /obj/item/weapon/ore/marble,
"lead" = /obj/item/weapon/ore/lead,
"rutile" = /obj/item/weapon/ore/rutile //VOREStation Add
// "rutile" = /obj/item/weapon/ore/rutile //VOREStation Add // CHOMP - Rykka commenting this out until it's brought in from upstream.
)
has_resources = 1
@@ -652,10 +652,10 @@ turf/simulated/mineral/floor/light_corner
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list("marble" = 5, "uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 5, "verdantium" = 1, "rutile" = 4)) //VOREStation Edit
mineral_name = pickweight(list("marble" = 5, "uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 5, "verdantium" = 1)) // "rutile" = 4)) //VOREStation Edit // CHOMP - Rykka commenting this out until it's brought in from upstream.
else
mineral_name = pickweight(list("marble" = 3, "uranium" = 10, "platinum" = 10, "hematite" = 70, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 2, "verdantium" = 1, "rutile" = 4)) //VOREStation Edit
mineral_name = pickweight(list("marble" = 3, "uranium" = 10, "platinum" = 10, "hematite" = 70, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 2, "verdantium" = 1)) // "rutile" = 4)) //VOREStation Edit // CHOMP - Rykka commenting this out until it's brought in from upstream.
if(mineral_name && (mineral_name in ore_data))
mineral = ore_data[mineral_name]