cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

cyborg drills use internal battery first + charging fix

Browse Source
This commit is contained in:
Jordie0608
2015-03-31 21:24:48 +11:00
parent b62eb672da
commit 879659a3d1
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_items.dm
+16
View File
@@ -130,6 +130,22 @@
/obj/item/weapon/pickaxe/drill/cyborg
name = "cyborg mining drill"
desc = "An integrated electric mining drill."
var/warned = 0
/obj/item/weapon/pickaxe/drill/cyborg/update_icon()
..() //piggybacking this since it's always called once a turf is dug and doesn't need it's own proc
if(bcell.charge < drillcost && !warned)
usr << "<span class='danger'>Drill internal battery depleted, power will be drawn from user's power supply.</span>"
playsound(src, 'sound/weapons/smg_empty_alarm.ogg',50,1)
warned = 1
/obj/item/weapon/pickaxe/drill/cyborg/proc/use_robot_power(var/mob/living/silicon/robot/R)
if(!bcell.use(drillcost))
if(!R.cell.use(drillcost))
R << "<span class='notice'>You don't have enough charge to drill.</span>"
return 0
return 1
/obj/item/weapon/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
code/modules/mining/mine_turfs.dm
+3 -4
View File
@@ -417,11 +417,10 @@
if(istype(P, /obj/item/weapon/pickaxe/drill))
var/obj/item/weapon/pickaxe/drill/D = P
if(isrobot(user))
var/mob/living/silicon/robot/R = user
if(!R.cell.use(D.drillcost))
R << "<span class='notice'>Your [D.name] doesn't have enough charge.</span>"
var/obj/item/weapon/pickaxe/drill/cyborg/RD = D
if(!RD.use_robot_power(user))
return
if(!D.bcell.use(D.drillcost))
else if(!D.bcell.use(D.drillcost))
user << "<span class='notice'>Your [D.name] doesn't have enough charge.</span>"
return