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

Merge pull request #1876 from Darlantanis/GlobalOreFix

Browse Source 
Webedit ore spawning fix
This commit is contained in:
Razgriz
2021-05-04 00:52:43 -07:00
committed by GitHub
parent 377d149957 b921922a45
commit cdf293dbb9
3 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/_global_vars/lists/mapping.dm
View File

@@ -30,20 +30,3 @@ GLOBAL_LIST_INIT(cww_dir, list( // cww_dir[dir] = counter-clockwise rotation of
32, 40, 36, 44, 33, 41, 37, 45, 34, 42, 38, 46, 35, 43, 39, 47, // DOWN - Same as first line but +32 32, 40, 36, 44, 33, 41, 37, 45, 34, 42, 38, 46, 35, 43, 39, 47, // DOWN - Same as first line but +32
48, 56, 52, 60, 49, 57, 53, 61, 50, 58, 54, 62, 51, 59, 55, 63 // UP+DOWN - Same as first line but +48 48, 56, 52, 60, 49, 57, 53, 61, 50, 58, 54, 62, 51, 59, 55, 63 // UP+DOWN - Same as first line but +48
)) ))
GLOBAL_LIST_INIT(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
))

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

@@ -117,7 +117,7 @@
var/total_harvest = harvest_speed //Ore harvest-per-tick. 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. var/found_resource = 0 //If this doesn't get set, the area is depleted and the drill errors out.
for(var/metal in GLOB.ore_types) for(var/metal in ore_types)
if(contents.len >= capacity) if(contents.len >= capacity)
system_error("Insufficient storage space.") system_error("Insufficient storage space.")
@@ -145,7 +145,7 @@
harvesting.resources[metal] = 0 harvesting.resources[metal] = 0
for(var/i=1, i <= create_ore, i++) for(var/i=1, i <= create_ore, i++)
var/oretype = GLOB.ore_types[metal] var/oretype = ore_types[metal]
new oretype(src) new oretype(src)
if(!found_resource) // If a drill can't see an advanced material, it will destroy it while going through. if(!found_resource) // If a drill can't see an advanced material, it will destroy it while going through.

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

@@ -8,13 +8,13 @@ var/list/mining_overlay_cache = list()
density = 1 density = 1
opacity = 1 // YW edit. Stops all my unsimulated tiles from being seethrough. opacity = 1 // YW edit. Stops all my unsimulated tiles from being seethrough.
//YW add start
/turf/unsimulated/mineral/ice /turf/unsimulated/mineral/ice
name = "Ice wall" name = "Ice wall"
desc = "Frigid Ice that seems to be stronger than most manmade structures." desc = "Frigid Ice that seems to be stronger than most manmade structures."
icon = 'icons/turf/snow_new.dmi' icon = 'icons/turf/snow_new.dmi'
icon_state = "Icerock" icon_state = "Icerock"
//YW add end
/turf/simulated/mineral //wall piece /turf/simulated/mineral //wall piece
name = "rock" name = "rock"
@@ -250,7 +250,7 @@ turf/simulated/mineral/floor/light_corner
for(var/ore in resources) 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. 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++) for(var/i=1, i <= amount_to_give, i++)
var/oretype = GLOB.ore_types[ore] var/oretype = ore_types[ore]
new oretype(src) new oretype(src)
resources[ore] = 0 resources[ore] = 0