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 pull request #343 from Rykka-Stormheart/shep-dev-pawsteps!

Browse Source 
Earlyport of Footstep sounds properly working!
This commit is contained in:
Razgriz
2020-05-10 14:26:27 -07:00
committed by GitHub
parent 1eb5a36d73 d01c717b9b
commit 5e8aa0b124
11 changed files with 168 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ var/list/mining_overlay_cache = list()
/turf/unsimulated/mineral/ice
name = "Ice wall"
desc = "Frigid Ice that seems to be stronger then most manmade structures"
desc = "Frigid Ice that seems to be stronger than most manmade structures."
icon = 'icons/turf/snow_new.dmi'
icon_state = "Icerock"
@@ -62,7 +62,8 @@ var/list/mining_overlay_cache = list()
"carbon" = /obj/item/weapon/ore/coal,
"verdantium" = /obj/item/weapon/ore/verdantium,
"marble" = /obj/item/weapon/ore/marble,
"lead" = /obj/item/weapon/ore/lead
"lead" = /obj/item/weapon/ore/lead,
// "rutile" = /obj/item/weapon/ore/rutile //VOREStation Add // CHOMP - Rykka commenting this out until it's brought in from upstream.
)
has_resources = 1
@@ -162,6 +163,8 @@ turf/simulated/mineral/floor/light_corner
if(random_icon)
dir = pick(alldirs)
. = INITIALIZE_HINT_LATELOAD
var/decl/flooring/F = get_flooring_data(/decl/flooring/sand)
footstep_sounds = F?.footstep_sounds
/turf/simulated/mineral/LateInitialize()
if(density && mineral)
@@ -649,10 +652,10 @@ turf/simulated/mineral/floor/light_corner
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list("marble" = 5, "uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 5, "verdantium" = 1))
mineral_name = pickweight(list("marble" = 5, "uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 5, "verdantium" = 1)) // "rutile" = 4)) //VOREStation Edit // CHOMP - Rykka commenting this out until it's brought in from upstream.
else
mineral_name = pickweight(list("marble" = 3, "uranium" = 10, "platinum" = 10, "hematite" = 70, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 2, "verdantium" = 1))
mineral_name = pickweight(list("marble" = 3, "uranium" = 10, "platinum" = 10, "hematite" = 70, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 2, "verdantium" = 1)) // "rutile" = 4)) //VOREStation Edit // CHOMP - Rykka commenting this out until it's brought in from upstream.
if(mineral_name && (mineral_name in ore_data))
mineral = ore_data[mineral_name]