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

Update mine_turfs.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-10 00:33:43 -05:00
committed by GitHub
parent 0131f176f1
commit 3e60113ea0
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,26 +49,6 @@ var/list/mining_overlay_cache = list()
var/datum/artifact_find/artifact_find
var/ignore_mapgen
<<<<<<< HEAD
||||||| parent of 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
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
)
=======
var/ore_types = list(
"hematite" = /obj/item/weapon/ore/iron,
"uranium" = /obj/item/weapon/ore/uranium,
@@ -92,7 +72,6 @@ var/list/mining_overlay_cache = list()
"rutile" = /obj/item/weapon/ore/rutile
)
>>>>>>> 4e5a8041e8... Merge pull request #9620 from VOREStation/upstream-merge-7811
has_resources = 1
// Alternative rock wall sprites.