From f023edefa77cc9ab3f258ffa3389bd204a445b7a Mon Sep 17 00:00:00 2001
From: MINIMAN10000 <miniman10000@gmail.com>
Date: Sat, 14 Apr 2018 23:54:37 -0700
Subject: [PATCH] Crayons color cables, cableColor now cable_color

---
 code/game/mecha/equipment/tools/work_tools.dm |  2 +-
 code/game/objects/items/weapons/handcuffs.dm  | 15 +++++++
 code/modules/power/cable.dm                   | 39 ++++++++++++++++---
 code/modules/power/cable_heavyduty.dm         |  2 +-
 4 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index bf547881869..1b9deed332b 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -429,7 +429,7 @@
 	if(!use_cable(1))
 		return reset()
 	var/obj/structure/cable/NC = new(new_turf)
-	NC.cableColor("red")
+	NC.cable_color("red")
 	NC.d1 = 0
 	NC.d2 = fdirn
 	NC.updateicon()
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 24bcb7a8c2c..da24b6084c6 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -108,6 +108,18 @@
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
 	..()
 
+/obj/item/weapon/restraints/handcuffs/cable/proc/cable_color(var/colorC)
+	if(colorC)
+		if(colorC == "rainbow")
+			colorC = color_rainbow()
+		color = colorC
+	else
+		color = COLOR_RED
+
+/obj/item/weapon/restraints/handcuffs/cable/proc/color_rainbow()
+	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
+	return color
+
 /obj/item/weapon/restraints/handcuffs/alien
 	icon_state = "handcuffAlien"
 
@@ -143,6 +155,9 @@
 			if(!remove_item_from_storage(user))
 				user.unEquip(src)
 			qdel(src)
+	else if(istype(I, /obj/item/toy/crayon))
+		var/obj/item/toy/crayon/C = I
+		cable_color(C.colourName)
 
 /obj/item/weapon/restraints/handcuffs/cable/zipties
 	name = "zipties"
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 0914cdc8d32..cb03d127ed5 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -184,6 +184,10 @@ By design, d1 is the smallest direction and d2 is the highest
 
 		shock(user, 5, 0.2)
 
+	else if(istype(W, /obj/item/toy/crayon))
+		var/obj/item/toy/crayon/C = W
+		cable_color(C.colourName)
+
 	else
 		if(W.flags & CONDUCT)
 			shock(user, 50, 0.7)
@@ -218,11 +222,18 @@ By design, d1 is the smallest direction and d2 is the highest
 				qdel(src) // qdel
 	return
 
-obj/structure/cable/proc/cableColor(var/colorC)
-	var/color_n = "#DD0000"
+obj/structure/cable/proc/cable_color(var/colorC)
 	if(colorC)
-		color_n = colorC
-	color = color_n
+		if(colorC == "rainbow")
+			color = color_rainbow()
+		else
+			color = colorC
+	else
+		color = "#DD0000"
+
+/obj/structure/cable/proc/color_rainbow()
+	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
+	return color
 
 /////////////////////////////////////////////////
 // Cable laying helpers
@@ -605,6 +616,10 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
 			src.use(amt)
 			return
 
+	if(istype(W, /obj/item/toy/crayon))
+		var/obj/item/toy/crayon/C = W
+		cable_color(C.colourName)
+
 //add cables to the stack
 /obj/item/stack/cable_coil/proc/give(var/extra)
 	if(amount + extra > MAXCOIL)
@@ -619,7 +634,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
 
 /obj/item/stack/cable_coil/proc/get_new_cable(location)
 	var/obj/structure/cable/C = new(location)
-	C.cableColor(color)
+	C.cable_color(color)
 
 	return C
 
@@ -736,7 +751,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
 				return
 
 
-		C.cableColor(color)
+		C.cable_color(color)
 
 		C.d1 = nd1
 		C.d2 = nd2
@@ -806,6 +821,18 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
 	..()
 
+/obj/item/stack/cable_coil/proc/cable_color(var/colorC)
+	if(colorC)
+		if(colorC == "rainbow")
+			colorC = color_rainbow()
+		color = colorC
+	else
+		color = COLOR_RED
+
+/obj/item/stack/cable_coil/proc/color_rainbow()
+	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
+	return color
+
 /obj/item/stack/cable_coil/cyborg
 	name = "cyborg cable coil"
 
diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm
index e0992d1b79e..806f0794bf7 100644
--- a/code/modules/power/cable_heavyduty.dm
+++ b/code/modules/power/cable_heavyduty.dm
@@ -24,5 +24,5 @@
 	else
 		..()
 
-/obj/structure/cable/heavyduty/cableColor(var/colorC)
+/obj/structure/cable/heavyduty/cable_color(var/colorC)
 	return
\ No newline at end of file