shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755

Browse Source 
[MIRROR] All color inputs use current color as default choice
This commit is contained in:
deathride58
2018-01-26 15:44:23 +00:00
committed by GitHub
parent 4008898f54 cd17afba45
commit 8ee42a5282
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/RCD.dm
+1 -1
View File
@@ -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
..()
code/game/objects/items/crayons.dm
+1 -1
View File
@@ -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.",
code/game/objects/items/devices/PDA/PDA.dm
+1 -1
View File
@@ -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")
code/game/objects/structures/mirror.dm
+4 -4
View File
@@ -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)
code/game/objects/structures/watercloset.dm
+1 -1
View File
@@ -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)