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

aughe

Browse Source
This commit is contained in:
BlackMajor
2020-07-23 13:57:39 +12:00
parent c375705d68
commit 717a5fa049
31 changed files with 123 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@
cell = /obj/item/weapon/cell/high
/obj/machinery/mining/drill/get_cell()
return cell
return cell
/obj/machinery/mining/drill/process()
@@ -110,7 +110,7 @@
var/total_harvest = harvest_speed //Ore harvest-per-tick.
var/found_resource = 0 //If this doesn't get set, the area is depleted and the drill errors out.
for(var/metal in ore_types)
for(var/metal in GLOB.ore_types)
if(contents.len >= capacity)
system_error("Insufficient storage space.")
@@ -138,7 +138,7 @@
harvesting.resources[metal] = 0
for(var/i=1, i <= create_ore, i++)
var/oretype = ore_types[metal]
var/oretype = GLOB.ore_types[metal]
new oretype(src)
if(!found_resource) // If a drill can't see an advanced material, it will destroy it while going through.

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

@@ -49,23 +49,6 @@ var/list/mining_overlay_cache = list()
var/datum/artifact_find/artifact_find
var/ignore_mapgen
var/ore_types = list(
"hematite" = /obj/item/weapon/ore/iron,
"uranium" = /obj/item/weapon/ore/uranium,
"gold" = /obj/item/weapon/ore/gold,
"silver" = /obj/item/weapon/ore/silver,
"diamond" = /obj/item/weapon/ore/diamond,
"phoron" = /obj/item/weapon/ore/phoron,
"osmium" = /obj/item/weapon/ore/osmium,
"hydrogen" = /obj/item/weapon/ore/hydrogen,
"silicates" = /obj/item/weapon/ore/glass,
"carbon" = /obj/item/weapon/ore/coal,
"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
)
has_resources = 1
// Alternative rock wall sprites.
@@ -244,7 +227,7 @@ turf/simulated/mineral/floor/light_corner
for(var/ore in resources)
var/amount_to_give = rand(CEILING(resources[ore]/2, 1), resources[ore]) // Should result in at least one piece of ore.
for(var/i=1, i <= amount_to_give, i++)
var/oretype = ore_types[ore]
var/oretype = GLOB.ore_types[ore]
new oretype(src)
resources[ore] = 0