cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix origin menus not starting focused and closing (#13666)

Browse Source
This commit is contained in:
Wildkins
2022-04-25 02:00:42 +02:00
committed by GitHub
parent 6345606f01
commit 31c2c989be
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/origin/origin.dm
+11 -6
View File
@@ -126,7 +126,7 @@
var/decl/origin_item/culture/chosen_culture = options[result]
if(chosen_culture)
show_window(chosen_culture, "set_culture_data", user)
return TOPIC_REFRESH
return TOPIC_HANDLED
if(href_list["open_origin_menu"])
var/list/options = list()
@@ -139,14 +139,16 @@
var/decl/origin_item/origin/chosen_origin = options[result]
if(chosen_origin)
show_window(chosen_origin, "set_origin_data", user)
return TOPIC_REFRESH
return TOPIC_HANDLED
if(href_list["set_culture_data"])
user << browse(null, "window=set_culture_data")
pref.culture = html_decode(href_list["set_culture_data"])
sanitize_character()
return TOPIC_REFRESH
if(href_list["set_origin_data"])
user << browse(null, "window=set_origin_data")
pref.origin = html_decode(href_list["set_origin_data"])
sanitize_character()
return TOPIC_REFRESH
@@ -163,9 +165,10 @@
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
show_citizenship_menu(user, choice)
return TOPIC_REFRESH
return TOPIC_HANDLED
if(href_list["set_citizenship"])
user << browse(null, "window=citizen_win")
pref.citizenship = (html_decode(href_list["set_citizenship"]))
sanitize_character()
return TOPIC_REFRESH
@@ -176,9 +179,10 @@
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
show_religion_menu(user, choice)
return TOPIC_REFRESH
return TOPIC_HANDLED
if(href_list["set_religion"])
user << browse(null, "window=rel_win")
pref.religion = (html_decode(href_list["set_religion"]))
sanitize_character()
return TOPIC_REFRESH
@@ -189,9 +193,10 @@
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
show_accent_menu(user, choice)
return TOPIC_REFRESH
return TOPIC_HANDLED
if(href_list["set_accent"])
user << browse(null, "window=acc_win")
pref.accent = (html_decode(href_list["set_accent"]))
sanitize_character()
return TOPIC_REFRESH
@@ -239,4 +244,4 @@
dat += "<br><center>\[<a href='?src=\ref[src];set_accent=[html_encode(accent.name)]'>Select</a>\]</center>"
dat += "</html>"
acc_win.set_content(dat)
acc_win.open()
acc_win.open()