shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32964 from AutomaticFrenzy/patch/joules

Browse Source 
Measure energy values in joules
This commit is contained in:
oranges
2017-12-05 20:42:25 +13:00
committed by CitadelStationBot
parent e7da4615d6
commit 4204c889ed
11 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cell.dm
+1 -1
View File
@@ -29,7 +29,7 @@
START_PROCESSING(SSobj, src)
charge = maxcharge
if(ratingdesc)
desc += " This one has a power rating of [DisplayPower(maxcharge)], and you should not swallow it."
desc += " This one has a rating of [DisplayEnergy(maxcharge)], and you should not swallow it."
update_icon()
/obj/item/stock_parts/cell/Destroy()