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

Update cell.dm

Browse Source
This commit is contained in:
deathride58
2017-12-13 12:03:21 -05:00
committed by GitHub
parent 1a1e03490a
commit e46811d210
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cell.dm
-4
View File
@@ -23,11 +23,7 @@
/obj/item/stock_parts/cell/get_cell()
return src
<<<<<<< HEAD
/obj/item/stock_parts/cell/New()
=======
/obj/item/stock_parts/cell/Initialize(mapload, override_maxcharge)
>>>>>>> ccfe2d4... Merge pull request #33481 from AutomaticFrenzy/patch/celldesc
. = ..()
START_PROCESSING(SSobj, src)
if (override_maxcharge)