diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index cf92f21046f..d29a4546ae7 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -12,7 +12,7 @@ /obj/machinery/recharger/attackby(obj/item/weapon/G, mob/user) if(istype(user,/mob/living/silicon)) return - if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton)) + if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G, /obj/item/weapon/pickaxe/drill)) if(charging) return @@ -87,6 +87,16 @@ icon_state = "recharger2" else icon_state = "recharger3" + if(istype(charging, /obj/item/weapon/pickaxe/drill)) + var/obj/item/weapon/pickaxe/drill/D = charging + if(D.bcell) + if(D.bcell.give(D.bcell.chargerate)) + icon_state = "recharger1" + use_power(200) + else + icon_state = "recharger2" + else + icon_state = "recharger3" /obj/machinery/recharger/emp_act(severity) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index b04ec323d3c..8904877f3b6 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -85,7 +85,7 @@ hitsound = 'sound/weapons/drill.ogg' origin_tech = "materials=2;powerstorage=3;engineering=2" desc = "An electric mining drill for the especially scrawny." - var/drillcost = 125 + var/drillcost = 125 //80 mineral walls by default var/obj/item/weapon/stock_parts/cell/high/bcell = null powered = 0 @@ -144,10 +144,10 @@ /obj/item/weapon/pickaxe/drill/diamonddrill name = "diamond-tipped mining drill" icon_state = "diamonddrill" - digspeed = 10 + digspeed = 10 //it's a fast drill with a relatively low power cost. what more could you ask for? origin_tech = "materials=6;powerstorage=4;engineering=5" desc = "Yours is the drill that will pierce the heavens!" - drillcost = 150 + drillcost = 150 //66 mineral walls by default, but very quickly /obj/item/weapon/pickaxe/drill/jackhammer name = "sonic jackhammer" @@ -167,7 +167,7 @@ w_class = 3 //it is smaller than the pickaxe damtype = "fire" throwforce = 8 - digspeed = 30 //Mines slightly faster than a normal pickaxe, but doubles as an unlimited-ammo welding tool. + digspeed = 30 //Mines slightly faster than a normal pickaxe, but doubles as an unlimited-ammo welding tool in some cases such as wall deconstruction digsound = list('sound/weapons/plasma_cutter.ogg') hitsound = 'sound/weapons/plasma_cutter.ogg' origin_tech = "materials=4;plasmatech=3;engineering=3" diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 1bebab91a97..362a70b1f93 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -22,10 +22,10 @@ ..() switch(severity) if(3.0) - if(prob(75)) + if (prob(75)) src.gets_drilled(null, 1) if(2.0) - if(prob(90)) + if (prob(90)) src.gets_drilled(null, 1) if(1.0) src.gets_drilled(null, 1) @@ -37,22 +37,22 @@ var/turf/T if((istype(get_step(src, NORTH), /turf/simulated/floor)) || (istype(get_step(src, NORTH), /turf/space)) || (istype(get_step(src, NORTH), /turf/simulated/shuttle/floor))) T = get_step(src, NORTH) - if(T) + if (T) T.overlays += image('icons/turf/walls.dmi', "rock_side_s") if((istype(get_step(src, SOUTH), /turf/simulated/floor)) || (istype(get_step(src, SOUTH), /turf/space)) || (istype(get_step(src, SOUTH), /turf/simulated/shuttle/floor))) T = get_step(src, SOUTH) - if(T) + if (T) T.overlays += image('icons/turf/walls.dmi', "rock_side_n", layer=6) if((istype(get_step(src, EAST), /turf/simulated/floor)) || (istype(get_step(src, EAST), /turf/space)) || (istype(get_step(src, EAST), /turf/simulated/shuttle/floor))) T = get_step(src, EAST) - if(T) + if (T) T.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6) if((istype(get_step(src, WEST), /turf/simulated/floor)) || (istype(get_step(src, WEST), /turf/space)) || (istype(get_step(src, WEST), /turf/simulated/shuttle/floor))) T = get_step(src, WEST) - if(T) + if (T) T.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6) - if(mineralName && mineralAmt && spread && spreadChance) + if (mineralName && mineralAmt && spread && spreadChance) for(var/dir in cardinal) if(prob(spreadChance)) var/turf/T = get_step(src, dir) @@ -78,10 +78,10 @@ /turf/simulated/mineral/random/New() ..() - if(prob(mineralChance)) + if (prob(mineralChance)) var/mName = pickweight(mineralSpawnChanceList) //temp mineral name - if(mName) + if (mName) var/turf/simulated/mineral/M switch(mName) if("Uranium") @@ -383,22 +383,21 @@ /turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob) - if(!user.IsAdvancedToolUser()) + if (!user.IsAdvancedToolUser()) usr << "You don't have the dexterity to do this!" return - if(istype(P, /obj/item/weapon/pickaxe)) + if (istype(P, /obj/item/weapon/pickaxe)) var/turf/T = user.loc - if(!( istype(T, /turf) )) + if (!( istype(T, /turf) )) return - if(!P.powered) - return - + if(!P.powered) + return /* - if(istype(W, /obj/item/weapon/pickaxe/radius)) + if (istype(W, /obj/item/weapon/pickaxe/radius)) var/turf/T = user.loc - if(!( istype(T, /turf) )) + if (!( istype(T, /turf) )) return */ //Watch your tabbing, microwave. --NEO @@ -431,22 +430,22 @@ return /turf/simulated/mineral/proc/gets_drilled() - if((src.mineralName != "") && (src.mineralAmt > 0) && (src.mineralAmt < 11)) + if ((src.mineralName != "") && (src.mineralAmt > 0) && (src.mineralAmt < 11)) var/i for (i=0;iThis area has already been dug." return user << "You start digging." playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE - sleep(15) - if((user.loc == T && user.get_active_hand() == W)) + sleep(20) + if ((user.loc == T && user.get_active_hand() == W)) user << "You dug a hole." gets_dug() return