Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/modules/power/cable.dm

@@ -198,12 +198,12 @@ By design, d1 is the smallest direction and d2 is the highest
 // shock the user with probability prb
 /obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1)
 	if(!prob(prb))
-		return 0
+		return FALSE
 	if (electrocute_mob(user, powernet, src, siemens_coeff))
 		do_sparks(5, TRUE, src)
-		return 1
+		return TRUE
 	else
-		return 0
+		return FALSE
 
 /obj/structure/cable/singularity_pull(S, current_size)
 	..()
@@ -235,13 +235,13 @@ By design, d1 is the smallest direction and d2 is the highest
 	if(powernet)
 		return clamp(powernet.avail-powernet.load, 0, powernet.avail)
 	else
-		return 0
+		return FALSE
 
 /obj/structure/cable/proc/avail(amount)
 	if(powernet)
 		return amount ? powernet.avail >= amount : powernet.avail
 	else
-		return 0
+		return FALSE
 
 /obj/structure/cable/proc/add_delayedload(amount)
 	if(powernet)
@@ -251,13 +251,13 @@ By design, d1 is the smallest direction and d2 is the highest
 	if(powernet)
 		return clamp(powernet.newavail - powernet.delayedload, 0, powernet.newavail)
 	else
-		return 0
+		return FALSE
 
 /obj/structure/cable/proc/newavail()
 	if(powernet)
 		return powernet.newavail
 	else
-		return 0
+		return FALSE
 
 /////////////////////////////////////////////////
 // Cable laying helpers
@@ -515,8 +515,9 @@ By design, d1 is the smallest direction and d2 is the highest
 	used_skills = list(/datum/skill/level/job/wiring)
 
 /obj/item/stack/cable_coil/cyborg
-	is_cyborg = 1
+	is_cyborg = TRUE
 	custom_materials = null
+	source = /datum/robot_energy_storage/wire
 	cost = 1
 
 /obj/item/stack/cable_coil/cyborg/attack_self(mob/user)
@@ -572,7 +573,7 @@ By design, d1 is the smallest direction and d2 is the highest
 		return ..()
 
 
-/obj/item/stack/cable_coil/update_icon()
+/obj/item/stack/cable_coil/update_icon_state()
 	icon_state = "[initial(item_state)][amount < 3 ? amount : ""]"
 	name = "cable [amount < 3 ? "piece" : "coil"]"