From f46d0b94091ebc89e46bb9f7a2753cd01a9eff8a Mon Sep 17 00:00:00 2001 From: Artur Date: Thu, 2 Jul 2020 23:21:11 +0300 Subject: [PATCH] Clockworkslab, skillpanel, telecoms works now --- .../clockcult/clock_items/clockwork_slab.dm | 8 +- .../packages/tgui/interfaces/ClockworkSlab.js | 46 ++-- tgui/packages/tgui/interfaces/SkillPanel.js | 5 +- .../tgui/interfaces/TelecommsInteraction.js | 5 +- .../tgui/interfaces/TelecommsLogBrowser.js | 8 +- .../tgui/interfaces/TelecommsMonitor.js | 9 +- .../tgui/interfaces/TelecommsPDALog.js | 252 +++++++++--------- tgui/packages/tgui/public/tgui.bundle.js | 6 +- 8 files changed, 176 insertions(+), 163 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index 4090f8085f..b8179afe21 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -295,13 +295,13 @@ if(GLOB.ratvar_awakens) return if(LAZYLEN(quickbound) < i || !quickbound[i]) - .["rec_binds"] += list() + .["rec_binds"] += list(list()) else var/datum/clockwork_scripture/quickbind_slot = quickbound[i] - .["rec_binds"] += list( + .["rec_binds"] += list(list( "name" = initial(quickbind_slot.name), "color" = get_component_color_bright(initial(quickbind_slot.primary_component)) - ) + )) // .["rec_section"]["title"] //this is here if ever we decided to return these back. // .["rec_section"]["info"]// wall of info for the thing @@ -313,7 +313,7 @@ INVOKE_ASYNC(src, .proc/recite_scripture, text2path(params["script"]), usr, FALSE) if("bind") var/datum/clockwork_scripture/path = text2path(params["script"]) //we need a path and not a string - if(!path.quickbind || path.tier == SCRIPTURE_PERIPHERAL) //fuck you href bus + if(!ispath(path, /datum/clockwork_scripture) || !initial(path.quickbind) || initial(path.tier) == SCRIPTURE_PERIPHERAL) //fuck you href bus to_chat(usr, "Nice try using href exploits") return var/found_index = quickbound.Find(path) diff --git a/tgui/packages/tgui/interfaces/ClockworkSlab.js b/tgui/packages/tgui/interfaces/ClockworkSlab.js index 0f424be1bb..e95ff1ee90 100644 --- a/tgui/packages/tgui/interfaces/ClockworkSlab.js +++ b/tgui/packages/tgui/interfaces/ClockworkSlab.js @@ -16,6 +16,7 @@ export const ClockworkSlab = (props, context) => { recollection = true, recollection_categories = [], rec_section = null, + rec_binds = [], scripture = {}, // this is a {}, not a [] tier_infos = {}, power = "0 W", @@ -88,38 +89,37 @@ export const ClockworkSlab = (props, context) => { )} - {!!recollection_categories - && recollection_categories.map(cat => { - return ( - -
-