Fallout 13 Energy Overhaul (DO NOT MERGE, NOT UP FOR DISCUSSION!)

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -133,7 +133,7 @@
 
 /datum/crafting_recipe/ecrecharge
 	name = "Small Energy Cell (recycle)"
-	result = /obj/item/stock_parts/cell/ammo/ec
+	result = /obj/item/stock_parts/cell/ammo/ec/recycled
 	reqs = list(/obj/item/stock_parts/cell/ammo/ec=2)
 	tools = list(TOOL_WORKBENCH)
 	time = 10
@@ -167,7 +167,7 @@
 
 /datum/crafting_recipe/mfcrecharge
 	name = "Microfusion Cell (recycle)"
-	result = /obj/item/stock_parts/cell/ammo/mfc
+	result = /obj/item/stock_parts/cell/ammo/mfc/recycled
 	reqs = list(/obj/item/stock_parts/cell/ammo/mfc=2)
 	tools = list(TOOL_WORKBENCH)
 	time = 10
@@ -201,7 +201,7 @@
 
 /datum/crafting_recipe/ecprecharge
 	name = "Electron Charge Pack (recycle)"
-	result = /obj/item/stock_parts/cell/ammo/ecp
+	result = /obj/item/stock_parts/cell/ammo/ecp/recycled
 	reqs = list(/obj/item/stock_parts/cell/ammo/ecp=2)
 	tools = list(TOOL_WORKBENCH)
 	time = 10

code/modules/mob/living/simple_animal/hostile/f13/Securitron.dm

@@ -12,7 +12,7 @@
 	icon_living = "securitron"
 	icon_dead = "securitron_dead"
 	mob_armor = ARMOR_VALUE_ROBOT_SECURITY
-	maxHealth = 100 
+	maxHealth = 100
 	health = 100
 	stamcrit_threshold = SIMPLEMOB_NO_STAMCRIT
 	emp_flags = list(
@@ -38,7 +38,7 @@
 
 	retreat_distance = 2
 	//how far they pull back
-	
+
 	minimum_distance = 5
 	// how close you can get before they try to pull back
 
@@ -128,7 +128,7 @@
 	icon_living = "sentrybot"
 	icon_dead = "sentrybot_dead"
 	mob_armor = ARMOR_VALUE_ROBOT_SECURITY
-	maxHealth = 150 
+	maxHealth = 150
 	health = 150
 	del_on_death = FALSE
 	melee_damage_lower = 24
@@ -167,7 +167,7 @@
 	loot = list(
 		/obj/effect/decal/cleanable/robot_debris,
 		/obj/item/stack/crafting/electronicparts/five,
-		/obj/item/stock_parts/cell/ammo/mfc
+		/obj/item/stock_parts/cell/ammo/mfc/recycled
 		)
 	projectile_sound_properties = list(
 		SP_VARY(FALSE),

code/modules/mob/living/simple_animal/hostile/f13/wastebots.dm

@@ -129,7 +129,7 @@
 	loot = list(
 		/obj/effect/decal/cleanable/robot_debris,
 		/obj/item/stack/crafting/electronicparts/three,
-		/obj/item/stock_parts/cell/ammo/mfc
+		/obj/item/stock_parts/cell/ammo/mfc/recycled
 		)
 	pop_required_to_jump_into = BIG_MOB_MIN_PLAYERS
 
@@ -216,7 +216,7 @@
 	loot = list(
 		/obj/effect/decal/cleanable/robot_debris,
 		/obj/item/stack/crafting/electronicparts/three,
-		/obj/item/stock_parts/cell/ammo/mfc
+		/obj/item/stock_parts/cell/ammo/ecp/recycled
 		)
 	emote_taunt_sound = null
 	emote_taunt = list("levels its laser")
@@ -268,7 +268,7 @@
 	loot = list(
 		/obj/effect/decal/cleanable/robot_debris,
 		/obj/item/stack/crafting/electronicparts/three,
-		/obj/item/stock_parts/cell/ammo/mfc
+		/obj/item/stock_parts/cell/ammo/mfc/recycled
 		)
 	emote_taunt_sound = null
 	emote_taunt = list("levels its laser")
@@ -358,7 +358,7 @@
 		"Please assume the position.",
 		"Protect and serve.",
 		"Antisocial behavior detected.",
-		"Criminal behavior willbe punished.",
+		"Criminal behavior will be punished.",
 		"Please step into the open and identify yourself, law abiding citizens have nothing to fear."
 		)
 	emote_taunt_sound = list(
@@ -499,7 +499,7 @@
 	loot = list(
 		/obj/effect/decal/cleanable/robot_debris,
 		/obj/item/stack/crafting/electronicparts/three,
-		/obj/item/stock_parts/cell/ammo/mfc
+		/obj/item/stock_parts/cell/ammo/mfc/recycled
 		)
 
 	emote_taunt_sound = FALSE

code/modules/power/cell.dm

@@ -456,7 +456,7 @@
 	name = "ammo cell"
 	desc = "You shouldn't be holding this."
 	cancharge = 1
-	w_class = WEIGHT_CLASS_TINY
+	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/stock_parts/cell/ammo/update_icon()
 	if(charge > 1)
@@ -466,13 +466,12 @@
 	. = ..()
 
 // Microfusion cell - large energy weapons
-/obj/item/stock_parts/cell/ammo/mfc
+/obj/item/stock_parts/cell/ammo/mfc // T3 cell
 	name = "microfusion cell"
 	desc = "A microfusion cell, typically used as ammunition for large energy weapons."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "mfc-full"
-	maxcharge = 2000
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 30000
 
 /obj/item/stock_parts/cell/ammo/mfc/update_icon()
 	if(charge >= (maxcharge*0.65))
@@ -486,35 +485,33 @@
 // Enhanced Microfusion cell - large energy weapons
 /obj/item/stock_parts/cell/ammo/mfc/large
 	name = "enhanced microfusion cell"
-	desc = "A microfusion cell, typically used as ammunition for large energy weapons. This one has been modified to hold double the normal charge."
+	desc = "A microfusion cell, typically used as ammunition for large energy weapons. This one has been modified to hold fifty percent more charge."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "mfc-full"
-	maxcharge = 3000
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 45000
 
 // Crafted Microfusion cell - large energy weapons
 /obj/item/stock_parts/cell/ammo/mfc/bad
 	name = "shoddy microfusion cell"
 	desc = "A microfusion cell, typically used as ammunition for large energy weapons. This one looks a little dubious though."
 	icon = 'icons/fallout/objects/powercells.dmi' //TODO: give these bad icons
 	icon_state = "mfc-full"
-	maxcharge = 1000
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 22500
 
 /obj/item/stock_parts/cell/ammo/ultracite
 	name = "ultracite cell"
 	desc = "An advanced ultracite cell, used as ammunition for special energy weapons."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ultracite"
-	maxcharge = 2000
+	maxcharge = 40000
 
 // Energy cell - small energy weapons
-/obj/item/stock_parts/cell/ammo/ec
+/obj/item/stock_parts/cell/ammo/ec // T1 cell
 	name = "energy cell"
 	desc = "An energy cell, typically used as ammunition for small-arms energy weapons."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ec-full"
-	maxcharge = 1500
+	maxcharge = 10000
 
 /obj/item/stock_parts/cell/ammo/ec/update_icon()
 	if(charge >= maxcharge * 0.75)
@@ -530,42 +527,41 @@
 // Enhanced energy cell - small energy weapons
 /obj/item/stock_parts/cell/ammo/ec/large
 	name = "enhanced energy cell"
-	desc = "An energy cell, typically used as ammunition for small-arms energy weapons. This one has been modified to hold far more energy."
+	desc = "An energy cell, typically used as ammunition for small-arms energy weapons. This one has been modified to hold far more energy. Is this even safe?"
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ec-full"
-	maxcharge = 2250
+	maxcharge = 15000
 
 // Crafted Energy cell - small energy weapons
 /obj/item/stock_parts/cell/ammo/ec/bad
 	name = "shoddy energy cell"
 	desc = "An energy cell, typically used as ammunition for small-arms energy weapons. This one looks a little suspect though."
 	icon = 'icons/fallout/objects/powercells.dmi' //TODO: Give these a new icon
 	icon_state = "ec-full"
-	maxcharge = 750
+	maxcharge = 7500
 
 // Microfusion breeder? Okay, sure.
 /obj/item/stock_parts/cell/ammo/breeder
 	name = "microfusion breeder"
 	desc = "A miniature microfusion reactor connected to capacitor banks. This is not a removable part, you messed up."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ec-full"
-	maxcharge = 2000
+	maxcharge = 30000
 
 // Microfusion breeder? Okay, sure.
 /obj/item/stock_parts/cell/ammo/breeder/xal
 	name = "S.I.D.A. breeder"
-	maxcharge = 1100
+	maxcharge = 16500
 
 
 
 // Electron charge pack - rapid fire energy
-/obj/item/stock_parts/cell/ammo/ecp
+/obj/item/stock_parts/cell/ammo/ecp // T2 cell
 	name = "electron charge pack"
 	desc = "An electron charge pack, typically used as ammunition for rapidly-firing energy weapons."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ecp-full"
-	maxcharge = 2400
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 20000
 
 /obj/item/stock_parts/cell/ammo/ecp/update_icon()
 	if(charge >= maxcharge*0.65)
@@ -582,24 +578,38 @@
 	desc = "An electron charge pack, typically used as ammunition for rapidly-firing energy weapons. This one has been modified to hold far more energy."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ecp-full"
-	maxcharge = 3600
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 30000
 
 // Crafted Electron charge pack - bad rapid fire energy
 /obj/item/stock_parts/cell/ammo/ecp/bad
 	name = "counterfeit electron charge pack"
 	desc = "An electron charge pack, typically used as ammunition for rapidly-firing energy weapons. This one looks slightly off, somehow."
 	icon = 'icons/fallout/objects/powercells.dmi' //TODO: Give a shitty icon
 	icon_state = "ecp-full"
-	maxcharge = 1200
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 15000
 
 // Alien power cell
-/obj/item/stock_parts/cell/ammo/alien
+/obj/item/stock_parts/cell/ammo/alien // T5?
 	name = "alien weapon cell"
 	desc = "A weapon cell that glows and thrums with unearthly energies. You're not sure you'd be able to recharge it, but it seems very powerful."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "aliencell"
 	ratingdesc = FALSE
-	maxcharge = 4000
+	maxcharge = 50000
+	cancharge = 0
+
+// Recycled Cells - Robot loot and recycle craft; same power as normal cells, just one and done.
+/obj/item/stock_parts/cell/ammo/mfc/recycled
+	name = "worn out microfusion cell"
+	desc = "A microfusion cell, typically used as ammunition for large energy weapons. This one has seen too much use and can't be recharged."
+	cancharge = 0
+
+/obj/item/stock_parts/cell/ammo/ec/recycled
+	name = "worn out energy cell"
+	desc = "An energy cell, typically used as ammunition for small-arms energy weapons. This one has seen too much use and can't be recharged."
+	cancharge = 0
+
+/obj/item/stock_parts/cell/ammo/ecp/recycled
+	name = "worn out electron charge pack"
+	desc = "An electron charge pack, typically used as ammunition for rapidly-firing energy weapons. This one has seen too much use and can't be recharged."
 	cancharge = 0