diff --git a/code/_helpers/icons_procs.dm b/code/_helpers/icons_procs.dm index ec97029c09..0e5f482ffa 100644 --- a/code/_helpers/icons_procs.dm +++ b/code/_helpers/icons_procs.dm @@ -161,7 +161,7 @@ mob // Give it a name for the cache var/iconName = "[ckey(src.name)]_flattened.dmi" // Send the icon to src's local cache - src<

") @@ -176,7 +176,7 @@ mob // Copy the file to the rsc manually var/icon/I = fcopy_rsc(get_flat_icon(src)) // Send the icon to src's local cache - src<" #else return "/icon (" + span_value("[value]") + ")" diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 222e674901..05f3853577 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -73,7 +73,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(debug_variables, (R_DEBUG|R_SERVER|R_ADMIN|R_SPAWN|R var/sprite_text if(sprite) hash = md5(sprite) - src << browse_rsc(sprite, "vv[hash].png") + send_rsc(src, sprite, "vv[hash].png") sprite_text = no_icon ? "\[NO ICON\]" : "" title = "[thing] ([REF(thing)]) = [type]" diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm index 1b7e7670fc..d8e4fd7cdd 100644 --- a/code/modules/asset_cache/transports/asset_transport.dm +++ b/code/modules/asset_cache/transports/asset_transport.dm @@ -139,7 +139,7 @@ if (!keep_local_name) new_asset_name = "asset.[ACI.hash][ACI.ext]" log_asset("Sending asset `[asset_name]` to client `[client]` as `[new_asset_name]`") - client << browse_rsc(ACI.resource, new_asset_name) + send_rsc(client, ACI.resource, new_asset_name) client.sent_assets[new_asset_name] = ACI.hash diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index c595486a8c..7769550231 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -350,7 +350,7 @@ Book Cart End user << browse(dat, "window=[name]") else if(istype(pages[page], /obj/item/photo)) var/obj/item/photo/P = W - user << browse_rsc(P.img, "tmp_photo.png") + send_rsc(user, P.img, "tmp_photo.png") user << browse("" + dat + "[P.name]" \ + "" \ + "

" dat+="" @@ -83,7 +83,7 @@ dat+=span_bold("Description") + ": [important_message.body]
" dat+=span_bold("Photo:") + ": " if(important_message.img) - user << browse_rsc(important_message.img, "tmp_photow.png") + send_rsc(user, important_message.img, "tmp_photow.png") dat+="
" else dat+="None" diff --git a/code/modules/news/newspaper.dm b/code/modules/news/newspaper.dm index b6fd2fdca4..4eeed9422c 100644 --- a/code/modules/news/newspaper.dm +++ b/code/modules/news/newspaper.dm @@ -69,7 +69,7 @@ dat+="[MESSAGE.title]
" dat+="-[MESSAGE.body]
" if(MESSAGE.img) - user << browse_rsc(MESSAGE.img, "tmp_photo[i].png") + send_rsc(user, MESSAGE.img, "tmp_photo[i].png") dat+="
" dat+=span_small("\[[MESSAGE.message_type] by " + span_maroon("[MESSAGE.author]") + "\]") + "

" dat+="" @@ -85,7 +85,7 @@ dat+=span_bold("Description") + ": [important_message.body]
" dat+=span_bold("Photo:") + ": " if(important_message.img) - user << browse_rsc(important_message.img, "tmp_photow.png") + send_rsc(user, important_message.img, "tmp_photow.png") dat+="
" else dat+="None" diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 04a8e2d652..e6127ecead 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -131,7 +131,7 @@ user << browse(dat, "window=[name]") else if(istype(pages[page], /obj/item/photo)) var/obj/item/photo/P = W - user << browse_rsc(P.img, "tmp_photo.png") + send_rsc(user, P.img, "tmp_photo.png") user << browse("" + dat + "[P.name]" \ + "" \ + "
[name]" \ + "" \ + "" \ diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm index a58993e7a8..49e82c92ea 100644 --- a/code/modules/pda/core_apps.dm +++ b/code/modules/pda/core_apps.dm @@ -316,7 +316,6 @@ /datum/data/pda/app/goals/proc/get_goals() var/list/goals = list() - var/index = 0 for(var/category in SSdepartmentgoals.active_department_goals) var/list/dept_goal = SSdepartmentgoals.active_department_goals[category] @@ -325,6 +324,6 @@ "name" = goal.name, "description" = goal.goal_text, "count" = FLOOR((goal.current_count / goal.goal_count) * 100, 1), - "index" = ++index + "ref" = REF(goal) )) return goals diff --git a/tgui/packages/tgui/interfaces/Pda/pda_screens/pda_depgoals.tsx b/tgui/packages/tgui/interfaces/Pda/pda_screens/pda_depgoals.tsx index 0f13132fb7..460e777b83 100644 --- a/tgui/packages/tgui/interfaces/Pda/pda_screens/pda_depgoals.tsx +++ b/tgui/packages/tgui/interfaces/Pda/pda_screens/pda_depgoals.tsx @@ -15,7 +15,7 @@ type Goal = { name: string; description: string; count: number; - index: number; + ref: string; }; export const pda_depgoals = (props) => { @@ -25,9 +25,11 @@ export const pda_depgoals = (props) => { return ( - {(!goals.length && ( + {!goals.length ? ( No departmental goals found! - )) || } + ) : ( + + )} ); }; @@ -38,35 +40,34 @@ const GoalsDisplay = (props) => { return ( - {goals.length > 0 && - goals.map((goal) => ( -
- - - {goal.name} - - {goal.description} - - - - - - {!!goal.name && {goal.count}%} - - - - -
- ))} + {goals.map((goal) => ( +
+ + + {goal.name} + + {goal.description} + + + + + + {goal.count}% + + + + +
+ ))} ); };