From 7cd74e6601e5719fdb921a8e572df0064283bf88 Mon Sep 17 00:00:00 2001 From: CalamaBanana Date: Wed, 15 May 2019 00:07:53 +0200 Subject: [PATCH 1/3] Adds pink to the circuit coloring tool --- code/__DEFINES/colors.dm | 3 ++- code/modules/integrated_electronics/core/detailer.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 4811d0041f..de9c7af221 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -53,4 +53,5 @@ #define COLOR_ASSEMBLY_GREEN "#44843C" #define COLOR_ASSEMBLY_LBLUE "#5D99BE" #define COLOR_ASSEMBLY_BLUE "#38559E" -#define COLOR_ASSEMBLY_PURPLE "#6F6192" \ No newline at end of file +#define COLOR_ASSEMBLY_PURPLE "#6F6192" +#define COLOR_ASSEMBLY_PINK "#ff4adc" \ No newline at end of file diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index 33f7ef96ad..a39f561092 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -25,7 +25,8 @@ "green" = COLOR_ASSEMBLY_GREEN, "light blue" = COLOR_ASSEMBLY_LBLUE, "blue" = COLOR_ASSEMBLY_BLUE, - "purple" = COLOR_ASSEMBLY_PURPLE + "purple" = COLOR_ASSEMBLY_PURPLE, + "pink" = COLOR_ASSEMBLY_PINK ) /obj/item/integrated_electronics/detailer/Initialize() From 9e00562e68ed81d24588801285b7241b5274e2a3 Mon Sep 17 00:00:00 2001 From: CalamaBanana Date: Wed, 15 May 2019 13:13:17 +0200 Subject: [PATCH 2/3] Added custom option Added custom option to the color selection --- code/modules/integrated_electronics/core/detailer.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index a39f561092..7fbdf5851e 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -26,7 +26,8 @@ "light blue" = COLOR_ASSEMBLY_LBLUE, "blue" = COLOR_ASSEMBLY_BLUE, "purple" = COLOR_ASSEMBLY_PURPLE, - "pink" = COLOR_ASSEMBLY_PINK + "pink" = COLOR_ASSEMBLY_PINK, + "custom" = "#ffffff" ) /obj/item/integrated_electronics/detailer/Initialize() @@ -44,6 +45,9 @@ if(!color_list[color_choice]) return if(!in_range(src, user)) - return - detail_color = color_list[color_choice] + return + if(color_choice == "custom") + detail_color = input(user,"","Choose Color",detail_color) as color|null + else + detail_color = color_list[color_choice] update_icon() From 1e7b5371663f7b161c5844dc22045b5323b9de0d Mon Sep 17 00:00:00 2001 From: CalamaBanana <46299792+CalamaBanana@users.noreply.github.com> Date: Thu, 16 May 2019 00:42:05 +0200 Subject: [PATCH 3/3] Update code/modules/integrated_electronics/core/detailer.dm Prettier list Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com> --- code/modules/integrated_electronics/core/detailer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/integrated_electronics/core/detailer.dm b/code/modules/integrated_electronics/core/detailer.dm index 7fbdf5851e..52739c7940 100644 --- a/code/modules/integrated_electronics/core/detailer.dm +++ b/code/modules/integrated_electronics/core/detailer.dm @@ -27,7 +27,7 @@ "blue" = COLOR_ASSEMBLY_BLUE, "purple" = COLOR_ASSEMBLY_PURPLE, "pink" = COLOR_ASSEMBLY_PINK, - "custom" = "#ffffff" + "custom" = COLOR_ASSEMBLY_WHITE ) /obj/item/integrated_electronics/detailer/Initialize()