Merge branch 'master' of https://github.com/PolarisSS13/Polaris into FishingFtWorldServer

This commit is contained in:
Mechoid
2019-05-03 21:44:53 -07:00
344 changed files with 11620 additions and 7580 deletions
+1 -1
View File
@@ -28,7 +28,7 @@
name = "recrystallized carbonate"
icon_state = "ore_marble"
origin_tech = list(TECH_MATERIAL = 1)
material = "carbon"
material = "marble"
/obj/item/weapon/ore/glass
name = "sand"
+1
View File
@@ -140,6 +140,7 @@ var/global/list/ore_data = list()
compresses_to = MAT_VERDANTIUM
result_amount = 2
spread_chance = 5
ore = /obj/item/weapon/ore/verdantium
scan_icon = "mineral_rare"
xarch_ages = list(
"billion" = 13,