Skip to content

NanoUI asset transport fix #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

NanoUI asset transport fix #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95e2fb9
AEUeueurgruhghhghhgr
flleeppyy Oct 27, 2025
98f3445
asdf
flleeppyy Oct 27, 2025
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
76 changes: 37 additions & 39 deletions code/modules/asset_cache/asset_list_items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,35 @@
"tgfont.css" = file("tgui/packages/tgfont/static/tgfont.css"),
)

// /datum/asset/simple/headers
// assets = list(
// "alarm_green.gif" = 'icons/program_icons/alarm_green.gif',
// "alarm_red.gif" = 'icons/program_icons/alarm_red.gif',
// "batt_5.gif" = 'icons/program_icons/batt_5.gif',
// "batt_20.gif" = 'icons/program_icons/batt_20.gif',
// "batt_40.gif" = 'icons/program_icons/batt_40.gif',
// "batt_60.gif" = 'icons/program_icons/batt_60.gif',
// "batt_80.gif" = 'icons/program_icons/batt_80.gif',
// "batt_100.gif" = 'icons/program_icons/batt_100.gif',
// "charging.gif" = 'icons/program_icons/charging.gif',
// "downloader_finished.gif" = 'icons/program_icons/downloader_finished.gif',
// "downloader_running.gif" = 'icons/program_icons/downloader_running.gif',
// "ntnrc_idle.gif" = 'icons/program_icons/ntnrc_idle.gif',
// "ntnrc_new.gif" = 'icons/program_icons/ntnrc_new.gif',
// "power_norm.gif" = 'icons/program_icons/power_norm.gif',
// "power_warn.gif" = 'icons/program_icons/power_warn.gif',
// "sig_high.gif" = 'icons/program_icons/sig_high.gif',
// "sig_low.gif" = 'icons/program_icons/sig_low.gif',
// "sig_lan.gif" = 'icons/program_icons/sig_lan.gif',
// "sig_none.gif" = 'icons/program_icons/sig_none.gif',
// "smmon_0.gif" = 'icons/program_icons/smmon_0.gif',
// "smmon_1.gif" = 'icons/program_icons/smmon_1.gif',
// "smmon_2.gif" = 'icons/program_icons/smmon_2.gif',
// "smmon_3.gif" = 'icons/program_icons/smmon_3.gif',
// "smmon_4.gif" = 'icons/program_icons/smmon_4.gif',
// "smmon_5.gif" = 'icons/program_icons/smmon_5.gif',
// "smmon_6.gif" = 'icons/program_icons/smmon_6.gif',
// "borg_mon.gif" = 'icons/program_icons/borg_mon.gif',
// "robotact.gif" = 'icons/program_icons/robotact.gif'
// )
/datum/asset/simple/headers
assets = list(
"alarm_green.gif" = 'nano/images/modular_computers/alarm_green.gif',
"alarm_red.gif" = 'nano/images/modular_computers/alarm_red.gif',
"batt_5.gif" = 'nano/images/modular_computers/batt_5.gif',
"batt_20.gif" = 'nano/images/modular_computers/batt_20.gif',
"batt_40.gif" = 'nano/images/modular_computers/batt_40.gif',
"batt_60.gif" = 'nano/images/modular_computers/batt_60.gif',
"batt_80.gif" = 'nano/images/modular_computers/batt_80.gif',
"batt_100.gif" = 'nano/images/modular_computers/batt_100.gif',
"charging.gif" = 'nano/images/modular_computers/charging.gif',
"downloader_finished.gif" = 'nano/images/modular_computers/downloader_finished.gif',
"downloader_running.gif" = 'nano/images/modular_computers/downloader_running.gif',
"ntnrc_idle.gif" = 'nano/images/modular_computers/ntnrc_idle.gif',
"ntnrc_new.gif" = 'nano/images/modular_computers/ntnrc_new.gif',
"power_norm.gif" = 'nano/images/modular_computers/power_norm.gif',
"power_warn.gif" = 'nano/images/modular_computers/power_warn.gif',
"sig_high.gif" = 'nano/images/modular_computers/sig_high.gif',
"sig_low.gif" = 'nano/images/modular_computers/sig_low.gif',
"sig_lan.gif" = 'nano/images/modular_computers/sig_lan.gif',
"sig_none.gif" = 'nano/images/modular_computers/sig_none.gif',
"smmon_0.gif" = 'nano/images/modular_computers/smmon_0.gif',
"smmon_1.gif" = 'nano/images/modular_computers/smmon_1.gif',
"smmon_2.gif" = 'nano/images/modular_computers/smmon_2.gif',
"smmon_3.gif" = 'nano/images/modular_computers/smmon_3.gif',
"smmon_4.gif" = 'nano/images/modular_computers/smmon_4.gif',
"smmon_5.gif" = 'nano/images/modular_computers/smmon_5.gif',
"smmon_6.gif" = 'nano/images/modular_computers/smmon_6.gif',
)

// /datum/asset/simple/radar_assets
// assets = list(
Expand Down Expand Up @@ -150,14 +148,14 @@
)
parents = list("font-awesome.css" = 'html/font-awesome/css/all.min.css')

// /datum/asset/simple/namespaced/tgfont
// assets = list(
// "tgfont.eot" = file("tgui/packages/tgfont/dist/tgfont.eot"),
// "tgfont.woff2" = file("tgui/packages/tgfont/dist/tgfont.woff2"),
// )
// parents = list(
// "tgfont.css" = file("tgui/packages/tgfont/dist/tgfont.css"),
// )
/datum/asset/simple/namespaced/tgfont
assets = list(
"tgfont.eot" = file("tgui/packages/tgfont/dist/tgfont.eot"),
"tgfont.woff2" = file("tgui/packages/tgfont/dist/tgfont.woff2"),
)
parents = list(
"tgfont.css" = file("tgui/packages/tgfont/dist/tgfont.css"),
)

// /datum/asset/simple/lobby
// assets = list(
Expand Down
7 changes: 7 additions & 0 deletions code/modules/modular_computers/computers/modular_computer/ui.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,10 @@
data["PC_hasheader"] = 1
data["PC_showexitprogram"] = active_program ? 1 : 0 // Hides "Exit Program" button on mainscreen
return data

/obj/item/modular_computer/ui_assets(mob/user)
var/list/data = list()
data += get_asset_datum(/datum/asset/simple/headers)
if(active_program)
data += active_program.ui_assets(user)
return data
2 changes: 2 additions & 0 deletions code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
return 1
return 0


/datum/nano_module/program/computer_ntnetdownload
name = "Software Download Tool"
var/obj/item/modular_computer/my_computer = null
Expand Down Expand Up @@ -238,3 +239,4 @@
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)

15 changes: 15 additions & 0 deletions code/modules/nano/nanoui.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,21 @@ nanoui is used to open and update nano browser uis
* @return nothing
*/
/datum/nanoui/proc/add_common_assets()
var/datum/asset/asset
var/flush_queue = FALSE

// asset = get_asset_datum(/datum/asset/simple/namespaced/fontawesome)
// asset.send(user.client)

// asset = get_asset_datum(/datum/asset/simple/namespaced/tgfont)
// asset.send(user.client)

// asset = get_asset_datum(/datum/asset/json/icon_ref_map)
// asset.send(user.client)

for(var/datum/asset/asset_item in src_object.ui_assets(user))
asset_item.send(user.client)

add_script("libraries.min.js") // A JS file comprising of jQuery, doT.js and jQuery Timer libraries (compressed together)
add_script("nano_utility.js") // The NanoUtility JS, this is used to store utility functions.
add_script("nano_template.js") // The NanoTemplate JS, this is used to render templates.
Expand Down
Loading