Polaris sync

This commit is contained in:
Eearslya
2016-08-06 20:34:44 -07:00
566 changed files with 16223 additions and 7350 deletions
+12 -1
View File
@@ -8,6 +8,17 @@
var/product
var/metaltag
/datum/alloy/durasteel
metaltag = "durasteel"
requires = list(
"diamond" = 1,
"platinum" = 1,
"carbon" = 2,
"hematite" = 2
)
product_mod = 0.3
product = /obj/item/stack/material/durasteel
/datum/alloy/plasteel
metaltag = "plasteel"
requires = list(
@@ -32,4 +43,4 @@
"platinum" = 1,
"sand" = 2
)
product = /obj/item/stack/material/glass/phoronglass
product = /obj/item/stack/material/glass/phoronglass
+23
View File
@@ -34,6 +34,19 @@ var/list/mining_overlay_cache = list()
var/datum/artifact_find/artifact_find
var/ignore_mapgen
var/ore_types = list(
"iron" = /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,
"carbonaceous rock" = /obj/item/weapon/ore/coal
)
has_resources = 1
/turf/simulated/mineral/ignore_mapgen
@@ -154,6 +167,16 @@ var/list/mining_overlay_cache = list()
mined_ore = 2 //some of the stuff gets blown up
GetDrilled()
if(severity <= 2) // Now to expose the ore lying under the sand.
spawn(1) // Otherwise most of the ore is lost to the explosion, which makes this rather moot.
var/losses = rand(0.5, 1) // Between 0% to 50% loss due to booms.
for(var/ore in resources)
var/amount_to_give = Ceiling(resources[ore] * losses) // Should result in at least one piece of ore.
for(var/i=1, i <= amount_to_give, i++)
var/oretype = ore_types[ore]
new oretype(src)
resources[ore] = 0
/turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj)
// Emitter blasts
+1
View File
@@ -61,6 +61,7 @@ var/global/list/ore_data = list()
name = "sand"
display_name = "sand"
smelts_to = "glass"
alloy = 1
compresses_to = "sandstone"
/ore/phoron