From fd6b2c32de59e32df90ff39ef2568fce018962fa Mon Sep 17 00:00:00 2001 From: Charlie Nolan Date: Tue, 26 Mar 2024 02:56:06 -0700 Subject: [PATCH] White cables no longer spontaneously change color (#24763) * Allow cables to be white. * Allow cables to remain white. --- code/modules/power/cables/cable.dm | 4 +--- code/modules/power/cables/cable_coil.dm | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/power/cables/cable.dm b/code/modules/power/cables/cable.dm index ff91ec6b020..a6757fd34be 100644 --- a/code/modules/power/cables/cable.dm +++ b/code/modules/power/cables/cable.dm @@ -140,9 +140,7 @@ By design, d1 is the smallest direction and d2 is the highest deconstruct() /obj/structure/cable/proc/cable_color(colorC) - if(!colorC) - color = COLOR_RED - else if(colorC == "rainbow") + if(colorC == "rainbow") color = color_rainbow() else if(colorC == "orange") //byond only knows 16 colors by name, and orange isn't one of them color = COLOR_ORANGE diff --git a/code/modules/power/cables/cable_coil.dm b/code/modules/power/cables/cable_coil.dm index 31176947c3a..c8f1c6d7c50 100644 --- a/code/modules/power/cables/cable_coil.dm +++ b/code/modules/power/cables/cable_coil.dm @@ -53,8 +53,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain name = "cable piece" /obj/item/stack/cable_coil/update_icon_state() - if(!color) - color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) if(amount == 1) icon_state = "coil1" else if(amount == 2)