From 24d262f19da9b9b416f7bc9948f6c646c10bbfa3 Mon Sep 17 00:00:00 2001 From: "ryantennessee@yahoo.com" Date: Fri, 9 Dec 2011 01:01:37 +0000 Subject: [PATCH] Drills and Ddrills now dig sand faster than shovels. Changed digging to produce 5 glass ore instead of 4. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2646 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mining/mine_turfs.dm | 49 +++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index c0909c4e843..de1f1874d48 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -307,7 +307,7 @@ if(!W || !user) return 0 - if ((istype(W, /obj/item/weapon/shovel))||(istype(W,/obj/item/weapon/pickaxe/drill))||(istype(W,/obj/item/weapon/pickaxe/diamonddrill))) + if ((istype(W, /obj/item/weapon/shovel))) var/turf/T = user.loc if (!( istype(T, /turf) )) return @@ -319,7 +319,7 @@ user << "\red You start digging." playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better - sleep(50) + sleep(40) if ((user.loc == T && user.equipped() == W)) user << "\blue You dug a hole." gets_dug() @@ -328,6 +328,50 @@ icon_state = "asteroid_dug" else ..(W,user) + if ((istype(W,/obj/item/weapon/pickaxe/drill))) + var/turf/T = user.loc + if (!( istype(T, /turf) )) + return + + if (dug == 1) + user << "\red This area has already been dug" + return + + user << "\red You start digging." + playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better + + sleep(30) + if ((user.loc == T && user.equipped() == W)) + user << "\blue You dug a hole." + gets_dug() + dug = 1 + icon_plating = "asteroid_dug" + icon_state = "asteroid_dug" + else + ..(W,user) + + if ((istype(W,/obj/item/weapon/pickaxe/diamonddrill))) + var/turf/T = user.loc + if (!( istype(T, /turf) )) + return + + if (dug == 1) + user << "\red This area has already been dug" + return + + user << "\red You start digging." + playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better + + sleep(0) + if ((user.loc == T && user.equipped() == W)) + user << "\blue You dug a hole." + gets_dug() + dug = 1 + icon_plating = "asteroid_dug" + icon_state = "asteroid_dug" + else + ..(W,user) + return /turf/simulated/floor/plating/airless/asteroid/proc/gets_dug() @@ -335,6 +379,7 @@ new/obj/item/weapon/ore/glass(src) new/obj/item/weapon/ore/glass(src) new/obj/item/weapon/ore/glass(src) + new/obj/item/weapon/ore/glass(src) return /turf/simulated/floor/plating/airless/asteroid/proc/updateMineralOverlays()