\[[world.time]\] [COMMENT.author]:[COMMENT.message]
Return" - - human_or_robot_user << browse(dat, "window=newscaster_main;size=400x600") + send_theme_resources(human_or_robot_user) + human_or_robot_user << browse(enable_ui_theme(human_or_robot_user, dat), "window=newscaster_main;size=400x600") onclose(human_or_robot_user, "newscaster_main") /obj/machinery/newscaster/Topic(href, href_list) @@ -876,7 +876,8 @@ obj/item/weapon/newspaper/attack_self(mob/user as mob) dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" dat+="[src.curr_page+1]" - human_user << browse(dat, "window=newspaper_main;size=300x400") + send_theme_resources(src) + human_user << browse(enable_ui_theme(human_user, dat), "window=newspaper_main;size=300x400") onclose(human_user, "newspaper_main") else to_chat(user, "The paper is full of intelligible symbols!") diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 4f20f4e03d4..20ff1c3b8d3 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -113,7 +113,7 @@ if(!user.IsAdvancedToolUser()) return 0 if(src.panelopen) //The maintenance panel is open. Time for some shady stuff - dat+= "Suit storage unit: Maintenance panel " + dat+= "" dat+= "Maintenance panel controls
" dat+= "The panel is ridden with controls, button and meters, labeled in strange signs and symbols that
you cannot understand. Probably the manufactoring world's language.
Among other things, a few controls catch your eye.
" dat+= text("A small dial with a \"ë\" symbol embroidded on it. It's pointing towards a gauge that reads [].
Turn towards []
",(src.issuperUV ? "15nm" : "185nm"),src,(src.issuperUV ? "185nm" : "15nm") ) @@ -130,7 +130,7 @@ else if(!src.isbroken) - dat+= "Suit storage unit " + dat+= "" dat+= "U-Stor-It Suit Storage Unit, model DS1900
" dat+= "Welcome to the Unit control panel.
" dat+= text("Helmet storage compartment: []
",(src.HELMET ? HELMET.name : "No helmet detected.") ) @@ -156,13 +156,14 @@ //user << browse(dat, "window=Suit Storage Unit;size=400x500") //onclose(user, "Suit Storage Unit") else //Ohhhh shit it's dirty or broken! Let's inform the guy. - dat+= "Suit storage unit " + dat+= "" dat+= "Unit chamber is too contaminated to continue usage. Please call for a qualified individual to perform maintenance.
" dat+= text("
Close control panel", user) //user << browse(dat, "window=suit_storage_unit;size=400x500") //onclose(user, "suit_storage_unit") - user << browse(dat, "window=suit_storage_unit;size=400x500") + send_theme_resources(user) + user << browse(enable_ui_theme(user, dat), "window=suit_storage_unit;size=400x500") onclose(user, "suit_storage_unit") return @@ -841,7 +842,7 @@ usr.set_machine(src) - var/dat = "Suit Cycler Interface " + var/dat = "" if(src.active) dat+= "
The [model_text ? "[model_text] " : ""]suit cycler is currently in use. Please wait..." @@ -867,12 +868,13 @@ dat += "Customisation
" dat += "Target product: [target_department], [target_species]." - dat += "
\[apply customisation routine\]
" + dat += "
\[apply customisation routine\]
" if(panel_open) wires.Interact(user) - user << browse(dat, "window=suit_cycler") + send_theme_resources(user) + user << browse(enable_ui_theme(user, dat), "window=suit_cycler") onclose(user, "suit_cycler") return diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 50f669e5732..b969e95f0eb 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -90,7 +90,8 @@ if (!src.locked) message = "*****" dat += text("
\n>[]
\n1-2-3
\n4-5-6
\n7-8-9
\nR-0-E
\n", message, src, src, src, src, src, src, src, src, src, src, src, src) - user << browse(dat, "window=caselock;size=300x280") + send_theme_resources(user) + user << browse(enable_ui_theme(user, dat), "window=caselock;size=300x280") Topic(href, href_list) ..() diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 88b8fc11b25..919b2f39cff 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -332,7 +332,7 @@ proc/admin_notice(var/message, var/rights) if (!admincaster_signature) update_newscaster_sig() var/dat - dat = "Admin Newscaster Admin Newscaster Unit
" + dat = "Admin Newscaster Unit
" switch(admincaster_screen) if(0) @@ -573,7 +573,8 @@ proc/admin_notice(var/message, var/rights) else dat+="Please report this on GitHub, along with what you did to make this appear." - usr << browse(dat, "window=admincaster_main;size=400x600") + send_theme_resources(usr) + usr << browse(enable_ui_theme(usr, dat), "window=admincaster_main;size=400x600") onclose(usr, "admincaster_main") diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index f4ab980c543..8b382452ee3 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -654,7 +654,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.species_preview = "Human" var/datum/species/current_species = all_species[pref.species_preview] var/list/dat = list( - "", "[current_species.name] \[change\]
", "", "
" - - src << browse(output,"window=playerpolllist;size=500x300") + send_theme_resources(src) + src << browse(enable_ui_theme(src, output),"window=playerpolllist;size=500x300") /mob/abstract/new_player/proc/show_poll_link(var/pollid = -1) if(pollid == -1) return diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 4acc367935c..e416b729230 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -71,11 +71,12 @@ dat += "", @@ -710,9 +709,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O dat += "You cannot play as this species.This species is not available for play as a station race." if(!restricted || check_rights(R_ADMIN, 0)) dat += "\[select\]" - dat += "" + dat += "" - user << browse(dat.Join(), "window=species;size=700x400") + send_theme_resources(user) + user << browse(enable_ui_theme(user, dat.Join()), "window=species;size=700x400") /*/datum/category_item/player_setup_item/general/body/proc/reset_limbs() diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 17dc6ce50b1..3f94172ae83 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -219,7 +219,8 @@ log transactions dat += "
" dat += "" - user << browse(dat,"window=atm;size=550x650") + send_theme_resources(user) + user << browse(enable_ui_theme(user, dat),"window=atm;size=550x650") else user << browse(null,"window=atm") diff --git a/code/modules/mob/abstract/new_player/new_player.dm b/code/modules/mob/abstract/new_player/new_player.dm index 7e3e9acc80a..87f164b6009 100644 --- a/code/modules/mob/abstract/new_player/new_player.dm +++ b/code/modules/mob/abstract/new_player/new_player.dm @@ -364,7 +364,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) /mob/abstract/new_player/proc/LateChoices() var/name = client.prefs.real_name - var/dat = "" + var/dat = " " dat += "Welcome, [name]. " - src << browse(dat, "window=latechoices;size=300x640;can_close=1") + send_theme_resources(src) + src << browse(enable_ui_theme(src, dat), "window=latechoices;size=300x640;can_close=1") /mob/abstract/new_player/proc/create_character() @@ -461,7 +462,8 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) dat += "
" dat += "Round Duration: [get_round_duration_formatted()]
" @@ -388,7 +388,8 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player) dat += "[job.title] ([job.current_positions]) (Active: [active])
" dat += "Show Crew Manifest
" dat += SSrecords.get_manifest(OOC = 1) - src << browse(dat, "window=manifest;size=370x420;can_close=1") + send_theme_resources(src) + src << browse(enable_ui_theme(src, dat), "window=manifest;size=370x420;can_close=1") /mob/abstract/new_player/Move() return 0 diff --git a/code/modules/mob/abstract/new_player/poll.dm b/code/modules/mob/abstract/new_player/poll.dm index 8ed62aeceb3..f7f72c51282 100644 --- a/code/modules/mob/abstract/new_player/poll.dm +++ b/code/modules/mob/abstract/new_player/poll.dm @@ -31,8 +31,8 @@ i++ output += "Grant Emergency Maintenance Access " dat += "Revoke Emergency Maintenance Access " dat += "" - user << browse(dat, "window=keycard_auth;size=500x250") if(screen == 2) dat += "Please swipe your card to authorize the following event: [event]" dat += "Back" - user << browse(dat, "window=keycard_auth;size=500x250") + + send_theme_resources(user) + user << browse(enable_ui_theme(user, dat), "window=keycard_auth;size=500x350") return diff --git a/html/changelogs/more theming.yml b/html/changelogs/more theming.yml new file mode 100644 index 00000000000..058aa7e8862 --- /dev/null +++ b/html/changelogs/more theming.yml @@ -0,0 +1,4 @@ +author: Karolis2011 +delete-after: True +changes: + - rscadd: "Added theme support to multiple UIs."