diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 0a719f111c1..3c37f92a91a 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -102,16 +102,8 @@ icon_state = "rock" return name = "\improper [mineral.display_name] deposit" - switch(mineral.display_name) - if("Iron") - icon_state = "rock_Iron[rand(1,3)]" - scan_state = "rock_Iron" - if("Plasma") - icon_state = "rock_Plasma[rand(1,3)]" - scan_state = "rock_Plasma" - else - icon_state = "rock_[mineral.name]" - scan_state = "rock_[mineral.name]" + icon_state = "rock_[mineral.name][rand(1,3)]" + scan_state = "rock_[mineral.name][rand(1,3)]" //Not even going to touch this pile of spaghetti attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -367,7 +359,7 @@ /turf/simulated/mineral/random name = "Mineral deposit" - var/mineralSpawnChanceList = list("Uranium" = 5, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Plasma" = 25, "Gibtonite" = 5, "Cave" = 1)//Currently, Adamantine won't spawn as it has no uses. -Durandan + var/mineralSpawnChanceList = list("Uranium" = 5, "Coal" = 50, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Platinum" = 5, "Hydrogen" = 5, "Plasma" = 25, "Cave" = 1)//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 New() @@ -386,12 +378,12 @@ /turf/simulated/mineral/random/high_chance mineralChance = 25 - mineralSpawnChanceList = list("Uranium" = 10, "Iron" = 30, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Plasma" = 25) + mineralSpawnChanceList = list("Uranium" = 10, "Coal" = 30, "Iron" = 30, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Platinum" = 10, "Hydrogen" = 10, "Plasma" = 25) /turf/simulated/mineral/random/high_chance_clown mineralChance = 40 - mineralSpawnChanceList = list("Uranium" = 10, "Iron" = 30, "Diamond" = 2, "Gold" = 5, "Silver" = 5, "Plasma" = 25, "Clown" = 15) + mineralSpawnChanceList = list("Uranium" = 10, "Coal" = 30, "Iron" = 30, "Diamond" = 2, "Gold" = 5, "Silver" = 5, "Platinum" = 5, "Hydrogen" = 5, "Plasma" = 25, "Clown" = 15) /**********************Asteroid**************************/ diff --git a/code/modules/mining/minerals.dm b/code/modules/mining/minerals.dm index a147927d808..c8bfa32bace 100644 --- a/code/modules/mining/minerals.dm +++ b/code/modules/mining/minerals.dm @@ -61,6 +61,12 @@ mineral/silver spread_chance = 10 ore = /obj/item/weapon/ore/silver +mineral/platinum + name = "Platinum" + result_amount = 5 + spread_chance = 10 + ore = /obj/item/weapon/ore/osmium + mineral/plasma name = "Plasma" result_amount = 5 @@ -74,6 +80,19 @@ mineral/clown spread = 0 ore = /obj/item/weapon/ore/clown +mineral/coal + name = "Coal" + result_amount = 5 + spread_chance = 25 + ore = /obj/item/weapon/ore/coal + +mineral/hydrogen + name = "Hydrogen" + result_amount = 5 + spread_chance = 10 + ore = /obj/item/weapon/ore/coal + + mineral/cave display_name = "Cave" name = "Cave" diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index 1b55448f50d..4dac5957185 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ