Power Cell Code Cleanup

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -146,7 +146,7 @@
 				wrapped = A.cell
 
 				A.cell.add_fingerprint(user)
-				A.cell.updateicon()
+				A.cell.update_icon()
 				A.cell.forceMove(src)
 				A.cell = null
 

code/modules/mob/living/silicon/robot/robot_defense.dm

@@ -42,7 +42,7 @@
 
 	if(opened && !wiresexposed && !issilicon(user))
 		if(cell)
-			cell.updateicon()
+			cell.update_icon()
 			cell.add_fingerprint(user)
 			user.put_in_active_hand(cell)
 			to_chat(user, "<span class='notice'>You remove \the [cell].</span>")

code/modules/mob/living/simple_animal/bot/mulebot.dm

@@ -188,7 +188,7 @@
 			visible_message("[usr] switches [on ? "on" : "off"] [src].")
 		if("cellremove")
 			if(open && cell && !usr.get_active_hand())
-				cell.updateicon()
+				cell.update_icon()
 				usr.put_in_active_hand(cell)
 				cell.add_fingerprint(usr)
 				cell = null

code/modules/power/apc.dm

@@ -682,7 +682,7 @@
 			else
 				user.put_in_hands(cell)
 			cell.add_fingerprint(user)
-			cell.updateicon()
+			cell.update_icon()
 
 			src.cell = null
 			user.visible_message("<span class='warning'>[user.name] removes the power cell from [src.name]!", "You remove the power cell.</span>")

code/modules/power/cell.dm

@@ -1,8 +1,64 @@
-// the power cell
-// charge from 0 to 100%
-// fits in APC to provide backup power
+/obj/item/stock_parts/cell
+	name = "power cell"
+	desc = "A rechargeable electrochemical power cell."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "cell"
+	item_state = "cell"
+	origin_tech = "powerstorage=1"
+	force = 5
+	throwforce = 5
+	throw_speed = 2
+	throw_range = 5
+	w_class = WEIGHT_CLASS_SMALL
+	var/charge = 0	// note %age conveted to actual charge in New
+	var/maxcharge = 1000
+	materials = list(MAT_METAL = 700, MAT_GLASS = 50)
+	var/rigged = FALSE		// true if rigged to explode
+	var/chargerate = 100 //how much power is given every tick in a recharger
+	var/self_recharge = 0 //does it self recharge, over time, or not?
+	var/ratingdesc = TRUE
+	var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
+
+/obj/item/stock_parts/cell/New()
+	..()
+	processing_objects.Add(src)
+	charge = maxcharge
+	if(ratingdesc)
+		desc += " This one has a power rating of [DisplayPower(maxcharge)], and you should not swallow it."
+	update_icon()
+
+/obj/item/stock_parts/cell/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/item/stock_parts/cell/vv_edit_var(var_name, var_value)
+	switch(var_name)
+		if("self_recharge")
+			if(var_value)
+				processing_objects.Add(src)
+			else
+				processing_objects.Remove(src)
+	. = ..()
+
+/obj/item/stock_parts/cell/process()
+	if(self_recharge)
+		give(chargerate * 0.25)
+	else
+		return PROCESS_KILL
+
+/obj/item/stock_parts/cell/update_icon()
+	overlays.Cut()
+	if(grown_battery)
+		overlays += image('icons/obj/power.dmi', "grown_wires")
+	if(charge < 0.01)
+		return
+	else if(charge/maxcharge >=0.995)
+		overlays += "cell-o2"
+	else
+		overlays += "cell-o1"
+
 /obj/item/stock_parts/cell/proc/percent()		// return % charge of cell
-	return 100.0*charge/maxcharge
+	return 100 * charge / maxcharge
 
 // use power from a cell
 /obj/item/stock_parts/cell/proc/use(amount)
@@ -20,24 +76,23 @@
 		explode()
 		return 0
 	if(maxcharge < amount)
-		return 0
-	var/power_used = min(maxcharge-charge,amount)
+		amount = maxcharge
+	var/power_used = min(maxcharge - charge, amount)
 	charge += power_used
 	return power_used
 
 /obj/item/stock_parts/cell/examine(mob/user)
-	if(..(user, 1))
-		if(maxcharge <= 2500)
-			to_chat(user, "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%.")
-		else
-			to_chat(user, "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%.")
+	..()
+	if(rigged)
+		to_chat(user, "<span class='danger'>This power cell seems to be faulty!</span>")
+	else
+		to_chat(user, "The charge meter reads [round(percent() )]%.")
 
-/obj/item/stock_parts/cell/attack_self(mob/user as mob)
-	src.add_fingerprint(user)
-	return
+/obj/item/stock_parts/cell/suicide_act(mob/user)
+	to_chat(viewers(user), "<span class='suicide'>[user] is licking the electrodes of the [src]! It looks like \he's trying to commit suicide.</span>")
+	return (FIRELOSS)
 
 /obj/item/stock_parts/cell/attackby(obj/item/W, mob/user, params)
-	..()
 	if(istype(W, /obj/item/reagent_containers/syringe))
 		var/obj/item/reagent_containers/syringe/S = W
 
@@ -45,34 +100,29 @@
 
 		if(S.reagents.has_reagent("plasma", 5) || S.reagents.has_reagent("plasma_dust", 5))
 
-			rigged = 1
+			rigged = TRUE
 
 			log_admin("LOG: [key_name(user)] injected a power cell with plasma, rigging it to explode.")
 			message_admins("LOG: [key_name_admin(user)] injected a power cell with plasma, rigging it to explode.")
 
 		S.reagents.clear_reagents()
+	else
+		return ..()
 
 
 /obj/item/stock_parts/cell/proc/explode()
-	var/turf/T = get_turf(src.loc)
-/*
- * 1000-cell	explosion(T, -1, 0, 1, 1)
- * 2500-cell	explosion(T, -1, 0, 1, 1)
- * 10000-cell	explosion(T, -1, 1, 3, 3)
- * 15000-cell	explosion(T, -1, 2, 4, 4)
- * */
-	if(charge==0)
+	var/turf/T = get_turf(loc)
+	if(charge == 0)
 		return
 	var/devastation_range = -1 //round(charge/11000)
-	var/heavy_impact_range = round(sqrt(charge)/60)
-	var/light_impact_range = round(sqrt(charge)/30)
+	var/heavy_impact_range = round(sqrt(charge) / 60)
+	var/light_impact_range = round(sqrt(charge) / 30)
 	var/flash_range = light_impact_range
-	if(light_impact_range==0)
-		rigged = 0
+	if(light_impact_range == 0)
+		rigged = FALSE
 		corrupt()
 		return
 	//explosion(T, 0, 1, 2, 2)
-
 	log_admin("LOG: Rigged power cell explosion, last touched by [fingerprintslast]")
 	message_admins("LOG: Rigged power cell explosion, last touched by [fingerprintslast]")
 
@@ -81,70 +131,242 @@
 
 /obj/item/stock_parts/cell/proc/corrupt()
 	charge /= 2
-	maxcharge /= 2
+	maxcharge = max(maxcharge / 2, chargerate)
 	if(prob(10))
-		rigged = 1 //broken batterys are dangerous
+		rigged = TRUE //broken batterys are dangerous
 
 /obj/item/stock_parts/cell/emp_act(severity)
 	charge -= 1000 / severity
 	if(charge < 0)
 		charge = 0
-	if(reliability != 100 && prob(50/severity))
-		reliability -= 10 / severity
 	..()
 
 /obj/item/stock_parts/cell/ex_act(severity)
-
 	switch(severity)
-		if(1.0)
+		if(EXPLODE_DEVASTATE)
 			qdel(src)
-			return
-		if(2.0)
+		if(EXPLODE_HEAVY)
 			if(prob(50))
 				qdel(src)
 				return
 			if(prob(50))
 				corrupt()
-		if(3.0)
+		if(EXPLODE_LIGHT)
 			if(prob(25))
 				qdel(src)
 				return
 			if(prob(25))
 				corrupt()
-	return
 
 /obj/item/stock_parts/cell/blob_act()
-	ex_act(1)
+	ex_act(EXPLODE_DEVASTATE)
 
 /obj/item/stock_parts/cell/proc/get_electrocute_damage()
 	switch(charge)
-/*		if(9000 to INFINITY)
-			return min(rand(90,150),rand(90,150))
-		if(2500 to 9000-1)
-			return min(rand(70,145),rand(70,145))
-		if(1750 to 2500-1)
-			return min(rand(35,110),rand(35,110))
-		if(1500 to 1750-1)
-			return min(rand(30,100),rand(30,100))
-		if(750 to 1500-1)
-			return min(rand(25,90),rand(25,90))
-		if(250 to 750-1)
-			return min(rand(20,80),rand(20,80))
-		if(100 to 250-1)
-			return min(rand(20,65),rand(20,65))*/
 		if(5000000 to INFINITY)
-			return min(rand(200,300),rand(200,300))
-		if(4000000 to 5000000-1)
-			return min(rand(80,180),rand(80,180))
-		if(1000000 to 4000000-1)
-			return min(rand(50,160),rand(50,160))
-		if(200000 to 1000000-1)
-			return min(rand(25,80),rand(25,80))
-		if(100000 to 200000-1)//Ave powernet
-			return min(rand(20,60),rand(20,60))
-		if(50000 to 100000-1)
-			return min(rand(15,40),rand(15,40))
-		if(1000 to 50000-1)
-			return min(rand(10,20),rand(10,20))
+			return min(rand(200, 300),rand(200, 300))
+		if(4000000 to 5000000 - 1)
+			return min(rand(80, 180),rand(80, 180))
+		if(1000000 to 4000000 - 1)
+			return min(rand(50, 160),rand(50, 160))
+		if(200000 to 1000000 - 1)
+			return min(rand(25, 80),rand(25, 80))
+		if(100000 to 200000 - 1)//Ave powernet
+			return min(rand(20, 60),rand(20, 60))
+		if(50000 to 100000 - 1)
+			return min(rand(15, 40),rand(15, 40))
+		if(1000 to 50000 - 1)
+			return min(rand(10, 20),rand(10, 20))
 		else
 			return 0
+
+// Cell variants
+/obj/item/stock_parts/cell/empty/New()
+	..()
+	charge = 0
+
+/obj/item/stock_parts/cell/crap
+	name = "\improper Nanotrasen brand rechargeable AA battery"
+	desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
+	maxcharge = 500
+	materials = list(MAT_GLASS = 40)
+	rating = 2
+
+/obj/item/stock_parts/cell/crap/empty/New()
+	..()
+	charge = 0
+	update_icon()
+
+/obj/item/stock_parts/cell/upgraded
+	name = "upgraded power cell"
+	desc = "A power cell with a slightly higher capacity than normal!"
+	maxcharge = 2500
+	materials = list(MAT_GLASS = 50)
+	rating = 2
+	chargerate = 1000
+
+/obj/item/stock_parts/cell/upgraded/plus
+	name = "upgraded power cell+"
+	desc = "A power cell with an even higher capacity than the base model!"
+	maxcharge = 5000
+
+/obj/item/stock_parts/cell/secborg
+	name = "security borg rechargeable D battery"
+	origin_tech = null
+	maxcharge = 600	//600 max charge / 100 charge per shot = six shots
+	materials = list(MAT_GLASS = 40)
+	rating = 2.5
+
+/obj/item/stock_parts/cell/secborg/empty/New()
+	..()
+	charge = 0
+	update_icon()
+
+/obj/item/stock_parts/cell/pulse //200 pulse shots
+	name = "pulse rifle power cell"
+	maxcharge = 40000
+	rating = 3
+	chargerate = 1500
+
+/obj/item/stock_parts/cell/pulse/carbine //25 pulse shots
+	name = "pulse carbine power cell"
+	maxcharge = 5000
+
+/obj/item/stock_parts/cell/pulse/pistol //10 pulse shots
+	name = "pulse pistol power cell"
+	maxcharge = 2000
+
+/obj/item/stock_parts/cell/high
+	name = "high-capacity power cell"
+	origin_tech = "powerstorage=2"
+	icon_state = "hcell"
+	maxcharge = 10000
+	materials = list(MAT_GLASS = 60)
+	rating = 3
+	chargerate = 1500
+
+/obj/item/stock_parts/cell/high/plus
+	name = "high-capacity power cell+"
+	desc = "Where did these come from?"
+	icon_state = "h+cell"
+	maxcharge = 15000
+	chargerate = 2250
+
+/obj/item/stock_parts/cell/high/empty/New()
+	..()
+	charge = 0
+	update_icon()
+
+/obj/item/stock_parts/cell/super
+	name = "super-capacity power cell"
+	origin_tech = "powerstorage=3;materials=3"
+	icon_state = "scell"
+	maxcharge = 20000
+	materials = list(MAT_GLASS = 300)
+	rating = 4
+	chargerate = 2000
+
+/obj/item/stock_parts/cell/super/empty/New()
+	..()
+	charge = 0
+	update_icon()
+
+/obj/item/stock_parts/cell/hyper
+	name = "hyper-capacity power cell"
+	origin_tech = "powerstorage=4;engineering=4;materials=4"
+	icon_state = "hpcell"
+	maxcharge = 30000
+	materials = list(MAT_GLASS = 400)
+	rating = 5
+	chargerate = 3000
+
+/obj/item/stock_parts/cell/hyper/empty/New()
+	..()
+	charge = 0
+	update_icon()
+
+/obj/item/stock_parts/cell/bluespace
+	name = "bluespace power cell"
+	desc = "A rechargeable transdimensional power cell."
+	origin_tech = "powerstorage=5;bluespace=4;materials=4;engineering=4"
+	icon_state = "bscell"
+	maxcharge = 40000
+	materials = list(MAT_GLASS = 600)
+	rating = 6
+	chargerate = 4000
+
+/obj/item/stock_parts/cell/bluespace/empty/New()
+	..()
+	charge = 0
+	update_icon()
+
+/obj/item/stock_parts/cell/infinite
+	name = "infinite-capacity power cell!"
+	icon_state = "icell"
+	origin_tech =  "powerstorage=7"
+	maxcharge = 30000
+	materials = list(MAT_GLASS=1000)
+	rating = 6
+	chargerate = 30000
+
+/obj/item/stock_parts/cell/infinite/use()
+	return 1
+
+/obj/item/stock_parts/cell/infinite/abductor
+	name = "void core"
+	desc = "An alien power cell that produces energy seemingly out of nowhere."
+	icon = 'icons/obj/abductor.dmi'
+	icon_state = "cell"
+	maxcharge = 50000
+	rating = 12
+	ratingdesc = FALSE
+
+/obj/item/stock_parts/cell/infinite/abductor/update_icon()
+	return
+
+
+/obj/item/stock_parts/cell/potato
+	name = "potato battery"
+	desc = "A rechargeable starch based power cell."
+	icon = 'icons/obj/hydroponics/harvest.dmi'
+	icon_state = "potato"
+	origin_tech = "powerstorage=1;biotech=1"
+	charge = 100
+	maxcharge = 300
+	materials = list()
+	rating = 1
+	grown_battery = TRUE //it has the overlays for wires
+
+/obj/item/stock_parts/cell/high/slime
+	name = "charged slime core"
+	desc = "A yellow slime core infused with plasma, it crackles with power."
+	origin_tech = "powerstorage=5;biotech=4"
+	icon = 'icons/mob/slimes.dmi'
+	icon_state = "yellow slime extract"
+	materials = list()
+	rating = 5 //self-recharge makes these desirable
+	self_recharge = 1 // Infused slime cores self-recharge, over time
+	chargerate = 500
+
+/obj/item/stock_parts/cell/emproof
+	name = "\improper EMP-proof cell"
+	desc = "An EMP-proof cell."
+	maxcharge = 500
+	rating = 3
+
+/obj/item/stock_parts/cell/emproof/empty/New()
+	..()
+	charge = 0
+	update_icon()
+
+/obj/item/stock_parts/cell/emproof/emp_act(severity)
+	return
+
+/obj/item/stock_parts/cell/emproof/corrupt()
+	return
+
+/obj/item/stock_parts/cell/ninja
+	name = "spider-clan power cell"
+	desc = "A standard ninja-suit power cell."
+	maxcharge = 10000
+	materials = list(MAT_GLASS = 60)

code/modules/research/designs/power_designs.dm

@@ -4,7 +4,7 @@
 
 /datum/design/basic_cell
 	name = "Basic Power Cell"
-	desc = "A basic power cell that holds 1000 units of energy"
+	desc = "A basic power cell that holds 1 kW of power."
 	id = "basic_cell"
 	req_tech = list("powerstorage" = 1)
 	build_type = PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB
@@ -15,7 +15,7 @@
 
 /datum/design/high_cell
 	name = "High-Capacity Power Cell"
-	desc = "A power cell that holds 10000 units of energy"
+	desc = "A power cell that holds 10 kW of power."
 	id = "high_cell"
 	req_tech = list("powerstorage" = 2)
 	build_type = PROTOLATHE | AUTOLATHE | MECHFAB | PODFAB
@@ -26,7 +26,7 @@
 
 /datum/design/hyper_cell
 	name = "Hyper-Capacity Power Cell"
-	desc = "A power cell that holds 30000 units of energy"
+	desc = "A power cell that holds 30 kW of power."
 	id = "hyper_cell"
 	req_tech = list("powerstorage" = 5, "materials" = 5, "engineering" = 5)
 	build_type = PROTOLATHE | MECHFAB | PODFAB
@@ -37,7 +37,7 @@
 
 /datum/design/super_cell
 	name = "Super-Capacity Power Cell"
-	desc = "A power cell that holds 20000 units of energy"
+	desc = "A power cell that holds 20 kW of power."
 	id = "super_cell"
 	req_tech = list("powerstorage" = 3, "materials" = 3)
 	build_type = PROTOLATHE | MECHFAB | PODFAB
@@ -48,7 +48,7 @@
 
 /datum/design/bluespace_cell
 	name = "Bluespace Power Cell"
-	desc = "A power cell that holds 40000 units of energy."
+	desc = "A power cell that holds 40 kW of power."
 	id = "bluespace_cell"
 	req_tech = list("powerstorage" = 6, "materials" = 5, "engineering" = 5, "bluespace" = 5)
 	build_type = PROTOLATHE | MECHFAB