Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755
[MIRROR] All color inputs use current color as default choice
This commit is contained in:
@@ -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
|
||||
..()
|
||||
|
||||
|
||||
@@ -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.",
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user