Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Stops adding 'Random' to the list of bars, also makes the cancel button not change preference, rather than clear it #12298

Merged
JamieD1 merged 2 commits into from
Sep 17, 2021
Merged

Stops adding 'Random' to the list of bars, also makes the cancel button not change preference, rather than clear it #12298

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2faf034
Stops adding 'Random' to the list of bars, also makes the cancel butt…
adamsong Sep 12, 2021
b207da2
Makes it actually compile
adamsong Sep 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/modules/client/preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,9 +1753,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("map")
map = !map
if("bar_choice")
var/list/selectablebars = GLOB.potential_box_bars
selectablebars += "Random"
var/pickedbar = input(user, "Choose your bar.", "Character Preference", bar_choice) as null|anything in GLOB.potential_box_bars
var/pickedbar = input(user, "Choose your bar.", "Character Preference", bar_choice) as null|anything in (GLOB.potential_box_bars|"Random")
if(!pickedbar)
return
bar_choice = pickedbar
if ("max_chat_length")
var/desiredlength = input(user, "Choose the max character length of shown Runechat messages. Valid range is 1 to [CHAT_MESSAGE_MAX_LENGTH] (default: [initial(max_chat_length)]))", "Character Preference", max_chat_length) as null|num
Expand Down