Reorganize power module into subfolders

Author: out-of-phaze

code/modules/power/cable.dm code/modules/power/cable/cable.dmcode/modules/power/cable.dm renamed to code/modules/power/cable/cable.dm

@@ -0,0 +1,117 @@
+// Power Cells
+/obj/item/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}'
+	throw_speed = 3
+	throw_range = 5
+	w_class = ITEM_SIZE_NORMAL
+	material = /decl/material/solid/metal/steel
+	matter = list(
+		/decl/material/solid/fiberglass = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/organic/plastic = MATTER_AMOUNT_TRACE
+	)
+	var/charge			                // Current charge
+	var/maxcharge = 1000 // Capacity in Wh
+
+/obj/item/cell/Initialize()
+	. = ..()
+	if(isnull(charge))
+		charge = maxcharge
+	update_icon()
+
+/obj/item/cell/drain_power(var/drain_check, var/surge, var/power = 0)
+
+	if(drain_check)
+		return 1
+
+	if(charge <= 0)
+		return 0
+
+	var/cell_amt = power * CELLRATE
+
+	return use(cell_amt) / CELLRATE
+
+/obj/item/cell/on_update_icon()
+	. = ..()
+	var/overlay_state = null
+	switch(percent())
+		if(95 to 100)
+			overlay_state = "cell-o2"
+		if(25 to 95)
+			overlay_state = "cell-o1"
+		if(0.05 to 25)
+			overlay_state = "cell-o0"
+	if(overlay_state)
+		add_overlay(overlay_state)
+
+/obj/item/cell/proc/percent()		// return % charge of cell
+	return maxcharge && (100.0*charge/maxcharge)
+
+/obj/item/cell/proc/fully_charged()
+	return (charge == maxcharge)
+
+// checks if the power cell is able to provide the specified amount of charge
+/obj/item/cell/proc/check_charge(var/amount)
+	return (charge >= amount)
+
+// use power from a cell, returns the amount actually used
+/obj/item/cell/proc/use(var/amount)
+	var/used = min(charge, amount)
+	charge -= used
+	update_icon()
+	return used
+
+// Checks if the specified amount can be provided. If it can, it removes the amount
+// from the cell and returns 1. Otherwise does nothing and returns 0.
+/obj/item/cell/proc/checked_use(var/amount)
+	if(!check_charge(amount))
+		return 0
+	use(amount)
+	return 1
+
+/obj/item/cell/proc/give(var/amount)
+	var/amount_used = min(maxcharge-charge,amount)
+	charge += amount_used
+	update_icon()
+	return amount_used
+
+/obj/item/cell/get_examine_strings(mob/user, distance, infix, suffix)
+	. = ..()
+	. += "The label states it's capacity is [maxcharge] Wh."
+	. += "The charge meter reads [round(src.percent(), 0.1)]%."
+
+/obj/item/cell/emp_act(severity)
+	// remove this if EMPs are ever rebalanced so that they don't instantly drain borg cells
+	// todo: containers (partially) shielding contents?
+	if(isrobot(loc))
+		var/mob/living/silicon/robot/robot = loc
+		severity *= robot.cell_emp_mult
+
+	// Lose 1/2, 1/4, 1/6 of the current charge per hit or 1/4, 1/8, 1/12 of the max charge per hit, whichever is highest
+	charge -= max(charge / (2 * severity), maxcharge/(4 * severity))
+	if (charge < 0)
+		charge = 0
+	..()
+
+
+/obj/item/cell/proc/get_electrocute_damage()
+	switch (charge)
+		if (1000000 to INFINITY)
+			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
+
+/obj/item/cell/get_cell()
+	return src //no shit Sherlock

code/modules/power/cable/cable_coil.dm

@@ -1,123 +1,3 @@
-// Power Cells
-/obj/item/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}'
-	throw_speed = 3
-	throw_range = 5
-	w_class = ITEM_SIZE_NORMAL
-	material = /decl/material/solid/metal/steel
-	matter = list(
-		/decl/material/solid/fiberglass = MATTER_AMOUNT_REINFORCEMENT,
-		/decl/material/solid/organic/plastic = MATTER_AMOUNT_TRACE
-	)
-	var/charge			                // Current charge
-	var/maxcharge = 1000 // Capacity in Wh
-
-/obj/item/cell/Initialize()
-	. = ..()
-	if(isnull(charge))
-		charge = maxcharge
-	update_icon()
-
-/obj/item/cell/drain_power(var/drain_check, var/surge, var/power = 0)
-
-	if(drain_check)
-		return 1
-
-	if(charge <= 0)
-		return 0
-
-	var/cell_amt = power * CELLRATE
-
-	return use(cell_amt) / CELLRATE
-
-/obj/item/cell/on_update_icon()
-	. = ..()
-	var/overlay_state = null
-	switch(percent())
-		if(95 to 100)
-			overlay_state = "cell-o2"
-		if(25 to 95)
-			overlay_state = "cell-o1"
-		if(0.05 to 25)
-			overlay_state = "cell-o0"
-	if(overlay_state)
-		add_overlay(overlay_state)
-
-/obj/item/cell/proc/percent()		// return % charge of cell
-	return maxcharge && (100.0*charge/maxcharge)
-
-/obj/item/cell/proc/fully_charged()
-	return (charge == maxcharge)
-
-// checks if the power cell is able to provide the specified amount of charge
-/obj/item/cell/proc/check_charge(var/amount)
-	return (charge >= amount)
-
-// use power from a cell, returns the amount actually used
-/obj/item/cell/proc/use(var/amount)
-	var/used = min(charge, amount)
-	charge -= used
-	update_icon()
-	return used
-
-// Checks if the specified amount can be provided. If it can, it removes the amount
-// from the cell and returns 1. Otherwise does nothing and returns 0.
-/obj/item/cell/proc/checked_use(var/amount)
-	if(!check_charge(amount))
-		return 0
-	use(amount)
-	return 1
-
-/obj/item/cell/proc/give(var/amount)
-	var/amount_used = min(maxcharge-charge,amount)
-	charge += amount_used
-	update_icon()
-	return amount_used
-
-/obj/item/cell/get_examine_strings(mob/user, distance, infix, suffix)
-	. = ..()
-	. += "The label states it's capacity is [maxcharge] Wh."
-	. += "The charge meter reads [round(src.percent(), 0.1)]%."
-
-/obj/item/cell/emp_act(severity)
-	// remove this if EMPs are ever rebalanced so that they don't instantly drain borg cells
-	// todo: containers (partially) shielding contents?
-	if(isrobot(loc))
-		var/mob/living/silicon/robot/robot = loc
-		severity *= robot.cell_emp_mult
-
-	// Lose 1/2, 1/4, 1/6 of the current charge per hit or 1/4, 1/8, 1/12 of the max charge per hit, whichever is highest
-	charge -= max(charge / (2 * severity), maxcharge/(4 * severity))
-	if (charge < 0)
-		charge = 0
-	..()
-
-
-/obj/item/cell/proc/get_electrocute_damage()
-	switch (charge)
-		if (1000000 to INFINITY)
-			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
-
-/obj/item/cell/get_cell()
-	return src //no shit Sherlock
-
-// SUBTYPES BELOW
-
 // Smaller variant, used by energy guns and similar small devices.
 /obj/item/cell/device
 	name = "device power cell"