Merge branch 'master' of git://github.com/Cheridan/-tg-station

code/game/objects/items/weapons/handcuffs.dm

@@ -55,6 +55,7 @@
 	name = "cable restraints"
 	desc = "Looks like some cables tied together. Could be used to tie something up."
 	icon_state = "cuff_red"
+	item_state = "coil_red"
 	breakouttime = 300 //Deciseconds = 30s
 
 /obj/item/weapon/handcuffs/cable/red
@@ -65,6 +66,7 @@
 
 /obj/item/weapon/handcuffs/cable/blue
 	icon_state = "cuff_blue"
+	item_state = "coil_blue"
 
 /obj/item/weapon/handcuffs/cable/green
 	icon_state = "cuff_green"
@@ -95,4 +97,4 @@
 					return
 				if(user_loc == user.loc && C_loc == C.loc)
 					C.handcuffed = new /obj/item/weapon/handcuffs(C)
-					C.update_inv_handcuffed(0)
+					C.update_inv_handcuffed(0)

code/modules/power/cable.dm

@@ -170,6 +170,7 @@
 	name = "cable coil"
 	icon = 'icons/obj/power.dmi'
 	icon_state = "coil_red"
+	item_state = "coil_red"
 	var/amount = MAXCOIL
 	color = "red"
 	desc = "A coil of power cable."
@@ -181,7 +182,6 @@
 	g_amt = 20
 	flags = TABLEPASS | USEDELAY | FPRINT | CONDUCT
 	slot_flags = SLOT_BELT
-	item_state = "coil_red"
 	attack_verb = list("whipped", "lashed", "disciplined", "flogged")
 
 	suicide_act(mob/user)
@@ -538,6 +538,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
 /obj/item/weapon/cable_coil/blue
 	color = "blue"
 	icon_state = "coil_blue"
+	item_state = "coil_blue"
 
 /obj/item/weapon/cable_coil/green
 	color = "green"