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/hydroponics/plant_genes.dm
+1 -1
View File
@@ -375,7 +375,7 @@
pocell.maxcharge *= CG.rate*1000
pocell.charge = pocell.maxcharge
pocell.name = "[G.name] battery"
pocell.desc = "A rechargeable plant based power cell. This one has a power rating of [DisplayPower(pocell.maxcharge)], and you should not swallow it."
pocell.desc = "A rechargeable plant-based power cell. This one has a rating of [DisplayEnergy(pocell.maxcharge)], and you should not swallow it."
if(G.reagents.has_reagent("plasma", 2))
pocell.rigged = 1