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

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/door.dm
	code/game/objects/transfer_valve.dm
	code/game/turf.dm
	code/modules/clothing/gloves.dm
	maps/tgstation.2.0.8.dmm
This commit is contained in:
Erthilo
2012-06-19 22:09:30 +01:00
parent ac30f5f2d3 0743fd1ab6
commit edd6f3ad88
139 changed files with 16602 additions and 15345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +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 = 0.5
/turf/simulated/mineral/random/New()
..()
@@ -98,6 +99,11 @@
if(M)
src = M
M.levelupdate()
else if (prob(artifactChance))
//spawn a rare, xeno-archaelogical artifact here
new/obj/machinery/artifact(src)
return
/turf/simulated/mineral/random/high_chance
@@ -193,8 +199,8 @@
if(old_icon) W.icon_state = old_icon
*/
W.opacity = 1
W.sd_SetOpacity(0)
W.sd_LumReset()
W.ul_SetOpacity(0)
W.ul_Recalculate()
W.levelupdate()
return W