From 76577f2696d343eeec5eb7eb7184690b8ec5d9dd Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Thu, 10 Dec 2015 16:26:42 +0100 Subject: [PATCH] Fixes subcategories of cable coils not being mergeable --- code/modules/power/cable.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index b5aa43077f9..25c8c4827fa 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -871,26 +871,34 @@ obj/structure/cable/proc/cableColor(var/colorC) update_wclass() /obj/item/stack/cable_coil/yellow + stacktype = /obj/item/stack/cable_coil color = COLOR_YELLOW /obj/item/stack/cable_coil/blue + stacktype = /obj/item/stack/cable_coil color = COLOR_BLUE /obj/item/stack/cable_coil/green + stacktype = /obj/item/stack/cable_coil color = COLOR_LIME /obj/item/stack/cable_coil/pink + stacktype = /obj/item/stack/cable_coil color = COLOR_PINK /obj/item/stack/cable_coil/orange + stacktype = /obj/item/stack/cable_coil color = COLOR_ORANGE /obj/item/stack/cable_coil/cyan + stacktype = /obj/item/stack/cable_coil color = COLOR_CYAN /obj/item/stack/cable_coil/white + stacktype = /obj/item/stack/cable_coil color = COLOR_WHITE /obj/item/stack/cable_coil/random/New() + stacktype = /obj/item/stack/cable_coil color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) ..()