diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 97025c4b63..9f146b8ff3 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -497,7 +497,7 @@ ARCD /obj/item/construction/rld/ui_action_click(mob/user, var/datum/action/A) if(istype(A, /datum/action/item_action/pick_color)) - color_choice = input(user,"Choose Color") as color + color_choice = input(user,"","Choose Color",color_choice) as color else ..() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 0759656423..86628265bc 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -221,7 +221,7 @@ paint_mode = PAINT_NORMAL if("select_colour") if(can_change_colour) - paint_color = input(usr,"Choose Color") as color + paint_color = input(usr,"","Choose Color",paint_color) as color|null . = TRUE if("enter_text") var/txt = stripped_input(usr,"Choose what to write.", diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 45f5e8db1e..35c6998d62 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -391,7 +391,7 @@ GLOBAL_LIST_EMPTY(PDAs) if (MODE_VT) font_mode = FONT_VT if ("Change_Color") - var/new_color = input("Please enter a color name or hex value (Default is \'#808000\').")as color + var/new_color = input("Please enter a color name or hex value (Default is \'#808000\').",background_color)as color background_color = new_color if ("Toggle_Underline") diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 44c12a21a1..e7f3d5eafc 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -155,7 +155,7 @@ H.dna.update_ui_block(DNA_SKIN_TONE_BLOCK) if(MUTCOLORS in H.dna.species.species_traits) - var/new_mutantcolor = input(user, "Choose your skin color:", "Race change") as color|null + var/new_mutantcolor = input(user, "Choose your skin color:", "Race change","#"+H.dna.features["mcolor"]) as color|null if(new_mutantcolor) var/temp_hsv = RGBtoHSV(new_mutantcolor) @@ -199,19 +199,19 @@ if(hairchoice == "Style") //So you just want to use a mirror then? ..() else - var/new_hair_color = input(H, "Choose your hair color", "Hair Color") as null|color + var/new_hair_color = input(H, "Choose your hair color", "Hair Color","#"+H.hair_color) as color|null if(new_hair_color) H.hair_color = sanitize_hexcolor(new_hair_color) H.dna.update_ui_block(DNA_HAIR_COLOR_BLOCK) if(H.gender == "male") - var/new_face_color = input(H, "Choose your facial hair color", "Hair Color") as null|color + var/new_face_color = input(H, "Choose your facial hair color", "Hair Color","#"+H.facial_hair_color) as color|null if(new_face_color) H.facial_hair_color = sanitize_hexcolor(new_face_color) H.dna.update_ui_block(DNA_FACIAL_HAIR_COLOR_BLOCK) H.update_hair() if("eyes") - var/new_eye_color = input(H, "Choose your eye color", "Eye Color") as null|color + var/new_eye_color = input(H, "Choose your eye color", "Eye Color","#"+H.eye_color) as color|null if(!Adjacent(user)) return if(new_eye_color) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index ea051ab16c..c9d17aa173 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -605,7 +605,7 @@ /obj/structure/curtain/attackby(obj/item/W, mob/user) if (istype(W, /obj/item/toy/crayon)) - color = input(user,"Choose Color") as color + color = input(user,"","Choose Color",color) as color else if(istype(W, /obj/item/screwdriver)) if(anchored) playsound(src.loc, W.usesound, 100, 1) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 94d7e32818..006ec5eae4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -999,7 +999,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) metadata = sanitize(copytext(new_metadata,1,MAX_MESSAGE_LEN)) if("hair") - var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference") as null|color + var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null if(new_hair) hair_color = sanitize_hexcolor(new_hair) @@ -1026,7 +1026,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) hair_style = previous_list_item(hair_style, GLOB.hair_styles_female_list) if("facial") - var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference") as null|color + var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null if(new_facial) facial_hair_color = sanitize_hexcolor(new_facial) @@ -1076,7 +1076,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) socks = new_socks if("eyes") - var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference") as color|null + var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference","#"+eye_color) as color|null if(new_eyes) eye_color = sanitize_hexcolor(new_eyes) @@ -1097,7 +1097,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["mcolor3"] = pref_species.default_color if("mutant_color") - var/new_mutantcolor = input(user, "Choose your character's primary alien/mutant color:", "Character Preference") as color|null + var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null if(new_mutantcolor) var/temp_hsv = RGBtoHSV(new_mutantcolor) if(new_mutantcolor == "#000000") @@ -1247,7 +1247,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) skin_tone = new_s_tone if("ooccolor") - var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference") as color|null + var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference",ooccolor) as color|null if(new_ooccolor) ooccolor = new_ooccolor @@ -1345,7 +1345,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(pickedPDAStyle) pda_style = pickedPDAStyle if("pda_color") - var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference") as null|color + var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference",pda_color) as color|null if(pickedPDAColor) pda_color = pickedPDAColor diff --git a/code/modules/integrated_electronics/core/special_pins/color_pin.dm b/code/modules/integrated_electronics/core/special_pins/color_pin.dm index 703afe5825..30b0a1895d 100644 --- a/code/modules/integrated_electronics/core/special_pins/color_pin.dm +++ b/code/modules/integrated_electronics/core/special_pins/color_pin.dm @@ -3,7 +3,7 @@ name = "color pin" /datum/integrated_io/color/ask_for_pin_data(mob/user) - var/new_data = input("Please select a color.","[src] color writing") as null|color + var/new_data = input("Please select a color.","[src] color writing") as color|null if(holder.check_interactivity(user) ) to_chat(user, "You input a new color into the pin.") write_data_to_pin(new_data) diff --git a/code/modules/modular_computers/computers/item/computer_ui.dm b/code/modules/modular_computers/computers/item/computer_ui.dm index 7a460732d2..c57bf5f4e3 100644 --- a/code/modules/modular_computers/computers/item/computer_ui.dm +++ b/code/modules/modular_computers/computers/item/computer_ui.dm @@ -143,7 +143,7 @@ var/mob/user = usr var/new_color while(!new_color) - new_color = input(user, "Choose a new color for [src]'s flashlight.", "Light Color") as null|color + new_color = input(user, "Choose a new color for [src]'s flashlight.", "Light Color",light_color) as color|null if(!new_color) return if(color_hex2num(new_color) < 200) //Colors too dark are rejected diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 3eec556c95..3aa501a6b8 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -537,4 +537,4 @@ desc = "Causes kinetic accelerator bolts to have an adjustable-colored tracer trail and explosion. Use in-hand to change color." /obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user) - bolt_color = input(user,"Choose Color") as color + bolt_color = input(user,"","Choose Color",bolt_color) as color|null diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index f8f57c650f..430308ca3f 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -194,7 +194,7 @@ activate() /obj/item/organ/eyes/robotic/glow/proc/prompt_for_controls(mob/user) - var/C = input(owner, "Select Color", "Select color", "#ffffff") as null|color + var/C = input(owner, "Select Color", "Select color", "#ffffff") as color|null if(!C || QDELETED(src) || QDELETED(user) || QDELETED(owner) || owner != user) return var/range = input(user, "Enter range (0 - [max_light_beam_distance])", "Range Select", 0) as null|num