cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6509 from eswordthecat/remove-area-error

Browse Source 
This kills, ## ERROR: Mine is an area and is trying to make the sound…
This commit is contained in:
Rob Nelson
2015-11-10 12:04:16 -08:00
parent 6deec1aa7c 5d5c75e006
commit 54206bb8a2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/turfs/simulated/floor.dm
View File

@@ -571,7 +571,7 @@ turf/simulated/floor/proc/update_icon()
user << "<span class='warning'>You must remove the plating first.</span>" user << "<span class='warning'>You must remove the plating first.</span>"
else if(istype(C, /obj/item/weapon/pickaxe/shovel)) else if(istype(C, /obj/item/weapon/pickaxe/shovel))
if(is_grass_floor()) if(is_grass_floor())
playsound(loc, 'sound/items/shovel.ogg', 50, 1) playsound(src, 'sound/items/shovel.ogg', 50, 1)
new /obj/item/weapon/ore/glass(src) new /obj/item/weapon/ore/glass(src)
new /obj/item/weapon/ore/glass(src) //Make some sand if you shovel grass new /obj/item/weapon/ore/glass(src) //Make some sand if you shovel grass
user << "<span class='notice'>You shovel the grass.</span>" user << "<span class='notice'>You shovel the grass.</span>"

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

@@ -541,7 +541,7 @@
playsound(get_turf(src), 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better playsound(get_turf(src), 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better
if(do_after(user, used_digging.digspeed) && user) //the better the drill, the faster the digging if(do_after(user, used_digging.digspeed) && user) //the better the drill, the faster the digging
playsound(loc, 'sound/items/shovel.ogg', 50, 1) playsound(src, 'sound/items/shovel.ogg', 50, 1)
user << "<span class='notice'>You dug a hole.</span>" user << "<span class='notice'>You dug a hole.</span>"
gets_dug() gets_dug()