From 5a9cf405b05774de549516406cb9f6cde93eb615 Mon Sep 17 00:00:00 2001 From: DrPainis <79603707+DrPainis@users.noreply.github.com> Date: Mon, 20 Dec 2021 19:18:46 -0500 Subject: [PATCH 1/8] doesn't work yet this is just to actually make the PR --- .../carbon/human/innate_abilities/customization.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 363f6ecbb2..5610328eb0 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -22,7 +22,7 @@ /datum/action/innate/ability/humanoid_customization/proc/change_form() var/mob/living/carbon/human/H = owner - var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Body Color","Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel") + var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Body Color", "Eye Color","Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel") if(select_alteration == "Body Color") var/new_color = input(owner, "Choose your skin color:", "Race change","#"+H.dna.features["mcolor"]) as color|null @@ -34,6 +34,15 @@ H.update_hair() else to_chat(H, "Invalid color. Your color is not bright enough.") + else if(select_alteration == "Eye Color") + var/new_color = input(owner, "Choose your eye color:", "Race change","#"+H.dna.features["mcolor"]) as color|null + if(new_color) + var/temp_hsv = RGBtoHSV(new_color) + if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright + H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) + H.update_body() + else + to_chat(H, "Invalid color. Your color is not bright enough.") else if(select_alteration == "Hair Style") if(H.gender == MALE) var/new_style = input(owner, "Select a facial hair style", "Hair Alterations") as null|anything in GLOB.facial_hair_styles_list From 05798ef65c606af0c0d2fa66830e9dbf15732a28 Mon Sep 17 00:00:00 2001 From: DrPainis <79603707+DrPainis@users.noreply.github.com> Date: Mon, 20 Dec 2021 19:23:44 -0500 Subject: [PATCH 2/8] makes this do something probably doesn't work --- .../living/carbon/human/innate_abilities/customization.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 5610328eb0..80705d252a 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -40,7 +40,10 @@ var/temp_hsv = RGBtoHSV(new_color) if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) - H.update_body() + H.left_eye_color = "new_color" + H.right_eye_color = "new_color" + H.dna?.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK) + H.dna?.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK) else to_chat(H, "Invalid color. Your color is not bright enough.") else if(select_alteration == "Hair Style") From cd6909736e5153fb9309e8e953c1b9525bed76fe Mon Sep 17 00:00:00 2001 From: DrPainis <79603707+DrPainis@users.noreply.github.com> Date: Mon, 20 Dec 2021 19:35:23 -0500 Subject: [PATCH 3/8] attempt 2 at making it work --- .../living/carbon/human/innate_abilities/customization.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 80705d252a..a91eb7467c 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -40,10 +40,9 @@ var/temp_hsv = RGBtoHSV(new_color) if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) - H.left_eye_color = "new_color" - H.right_eye_color = "new_color" - H.dna?.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK) - H.dna?.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK) + H.left_eye_color = "mcolor" + H.right_eye_color = "mcolor" + H.update_body() else to_chat(H, "Invalid color. Your color is not bright enough.") else if(select_alteration == "Hair Style") From b224693f67c748800c0c56ec5bcbf147abe83a30 Mon Sep 17 00:00:00 2001 From: DrPainis <79603707+DrPainis@users.noreply.github.com> Date: Mon, 20 Dec 2021 19:42:15 -0500 Subject: [PATCH 4/8] attempt 3 --- .../mob/living/carbon/human/innate_abilities/customization.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index a91eb7467c..bfc5d9d423 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -42,7 +42,8 @@ H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) H.left_eye_color = "mcolor" H.right_eye_color = "mcolor" - H.update_body() + H.dna?.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK) + H.dna?.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK) else to_chat(H, "Invalid color. Your color is not bright enough.") else if(select_alteration == "Hair Style") From fe82ab25048792accfddf6ba53c73b5146fa826f Mon Sep 17 00:00:00 2001 From: LiteralMushroom <79603707+LiteralMushroom@users.noreply.github.com> Date: Mon, 10 Jan 2022 18:47:13 -0500 Subject: [PATCH 5/8] Update code/modules/mob/living/carbon/human/innate_abilities/customization.dm Finally. Co-authored-by: Poojawa --- .../mob/living/carbon/human/innate_abilities/customization.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index bfc5d9d423..6f5a457b1c 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -35,8 +35,10 @@ else to_chat(H, "Invalid color. Your color is not bright enough.") else if(select_alteration == "Eye Color") + if(iscultist(H) && HAS_TRAIT(H, TRAIT_CULT_EYES)) + to_chat(H, "The power of the cult overrules your eyes, do not be ashamed of your power!") var/new_color = input(owner, "Choose your eye color:", "Race change","#"+H.dna.features["mcolor"]) as color|null - if(new_color) + else if(new_color) var/temp_hsv = RGBtoHSV(new_color) if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) From 239782e74aa2050e1632f1e35e9e872343375365 Mon Sep 17 00:00:00 2001 From: LiteralMushroom <79603707+LiteralMushroom@users.noreply.github.com> Date: Mon, 10 Jan 2022 18:52:16 -0500 Subject: [PATCH 6/8] maybe makes it compile --- .../mob/living/carbon/human/innate_abilities/customization.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 6f5a457b1c..3acbc0c4ed 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -38,7 +38,7 @@ if(iscultist(H) && HAS_TRAIT(H, TRAIT_CULT_EYES)) to_chat(H, "The power of the cult overrules your eyes, do not be ashamed of your power!") var/new_color = input(owner, "Choose your eye color:", "Race change","#"+H.dna.features["mcolor"]) as color|null - else if(new_color) + else(new_color) var/temp_hsv = RGBtoHSV(new_color) if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) From 41fe2105f8bb90bb20af9e0fb3df85b20f3fc55d Mon Sep 17 00:00:00 2001 From: LiteralMushroom <79603707+LiteralMushroom@users.noreply.github.com> Date: Mon, 10 Jan 2022 18:57:47 -0500 Subject: [PATCH 7/8] that didn't work --- .../mob/living/carbon/human/innate_abilities/customization.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 3acbc0c4ed..6f5a457b1c 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -38,7 +38,7 @@ if(iscultist(H) && HAS_TRAIT(H, TRAIT_CULT_EYES)) to_chat(H, "The power of the cult overrules your eyes, do not be ashamed of your power!") var/new_color = input(owner, "Choose your eye color:", "Race change","#"+H.dna.features["mcolor"]) as color|null - else(new_color) + else if(new_color) var/temp_hsv = RGBtoHSV(new_color) if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) From 40ca396ec7246b393f9f4567021696eafb5d80d4 Mon Sep 17 00:00:00 2001 From: LiteralMushroom <79603707+LiteralMushroom@users.noreply.github.com> Date: Thu, 20 Jan 2022 21:58:09 -0500 Subject: [PATCH 8/8] haha funny stolen code Co-authored-by: Poojawa --- .../human/innate_abilities/customization.dm | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 6f5a457b1c..7dfda87306 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -36,18 +36,25 @@ to_chat(H, "Invalid color. Your color is not bright enough.") else if(select_alteration == "Eye Color") if(iscultist(H) && HAS_TRAIT(H, TRAIT_CULT_EYES)) - to_chat(H, "The power of the cult overrules your eyes, do not be ashamed of your power!") - var/new_color = input(owner, "Choose your eye color:", "Race change","#"+H.dna.features["mcolor"]) as color|null - else if(new_color) - var/temp_hsv = RGBtoHSV(new_color) - if(ReadHSV(temp_hsv)[3] >= ReadHSV(MINIMUM_MUTANT_COLOR)[3]) // mutantcolors must be bright - H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) - H.left_eye_color = "mcolor" - H.right_eye_color = "mcolor" - H.dna?.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK) - H.dna?.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK) - else - to_chat(H, "Invalid color. Your color is not bright enough.") + to_chat(H, "\"I do not need you to hide yourself anymore, relish my gift.\"") + return + + var/heterochromia = input(owner, "Do you want to have heterochromia?", "Confirm Multicolors") in list("Yes", "No") + if(heterochromia == "Yes") + var/new_color1 = input(owner, "Choose your left eye color:", "Eye Color Change","#"+H.dna?.features["left_eye_color"]) as color|null + if(new_color1) + H.left_eye_color = sanitize_hexcolor(new_color1, 6) + var/new_color2 = input(owner, "Choose your right eye color:", "Eye Color Change","#"+H.dna?.features["right_eye_color"]) as color|null + if(new_color2) + H.right_eye_color = sanitize_hexcolor(new_color2, 6) + else + var/new_eyes = input(owner, "Choose your eye color:", "Character Preference","#"+H.dna?.features["left_eye_color"]) as color|null + if(new_eyes) + H.left_eye_color = sanitize_hexcolor(new_eyes, 6) + H.right_eye_color = sanitize_hexcolor(new_eyes, 6) + H.dna?.update_ui_block(DNA_LEFT_EYE_COLOR_BLOCK) + H.dna?.update_ui_block(DNA_RIGHT_EYE_COLOR_BLOCK) + H.update_body() else if(select_alteration == "Hair Style") if(H.gender == MALE) var/new_style = input(owner, "Select a facial hair style", "Hair Alterations") as null|anything in GLOB.facial_hair_styles_list