Correctly set description of nonstandard cells

2017-12-13 10:12:35 -05:00
parent a5cd43ae61
commit 129cd705d1
7 changed files with 55 additions and 18 deletions
@@ -23,9 +23,15 @@
 /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)
+		maxcharge = override_maxcharge
 	charge = maxcharge
 	if(ratingdesc)
 		desc += " This one has a rating of [DisplayEnergy(maxcharge)], and you should not swallow it."