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

Update preferences.dm

Browse Source
This commit is contained in:
LetterJay
2018-01-24 21:44:00 -06:00
committed by GitHub
parent 51e4d9f9db
commit cd17afba45
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
-4
View File
@@ -1097,11 +1097,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["mcolor3"] = pref_species.default_color
if("mutant_color")
<<<<<<< HEAD
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
>>>>>>> f98a4e6... Merge pull request #34755 from ChuckTheSheep/Current-Color-as-Default-Color-in-Inputs
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
if(new_mutantcolor == "#000000")