Merge pull request #1313 from caelaislinn/master

minor changes to artifacts
This commit is contained in:
SkyMarshal
2012-06-18 19:54:24 -07:00
2 changed files with 4 additions and 1 deletions

View File

@@ -72,7 +72,7 @@
var/mineralAmtList = list("Uranium" = 5, "Iron" = 5, "Diamond" = 5, "Gold" = 5, "Silver" = 5, "Plasma" = 5/*, "Adamantine" = 5*/)
var/mineralSpawnChanceList = list("Uranium" = 5, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Plasma" = 25/*, "Adamantine" =5*/)//Currently, Adamantine won't spawn as it has no uses. -Durandan
var/mineralChance = 10 //means 10% chance of this plot changing to a mineral deposit
var/artifactChance = 1
var/artifactChance = 0.5
/turf/simulated/mineral/random/New()
..()

View File

@@ -715,6 +715,9 @@
M.LAssailant = null
else
M.LAssailant = usr
if(istype(src, /obj/machinery/artifact))
var/obj/machinery/artifact/A = src
A.attack_hand(usr)
return
/atom/verb/examine()