Merge pull request #1119 from SkyMarshal/BugFixes

Bug fixes
This commit is contained in:
Erthilo
2012-05-20 14:42:30 -07:00
20 changed files with 89 additions and 49 deletions

View File

@@ -30,7 +30,9 @@
overlays += image('power.dmi', "cell-o1")
/obj/item/weapon/cell/proc/percent() // return % charge of cell
return 100.0*charge/maxcharge
if(maxcharge)
return 100.0*charge/maxcharge
return 0
// use power from a cell
/obj/item/weapon/cell/proc/use(var/amount)