diff --git a/code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm b/code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm index e5497d7c9f..66e20b6e87 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm @@ -38,10 +38,11 @@ set_slab.update_quickbind() /proc/generate_all_scripture() - if(!GLOB.all_scripture.len) - for(var/V in sortList(subtypesof(/datum/clockwork_scripture), /proc/cmp_clockscripture_priority)) - var/datum/clockwork_scripture/S = new V - GLOB.all_scripture[S.type] = S + if(GLOB.all_scripture.len) + return + for(var/V in sortList(subtypesof(/datum/clockwork_scripture) - list(/datum/clockwork_scripture/channeled, /datum/clockwork_scripture/create_object, /datum/clockwork_scripture/create_object/construct), /proc/cmp_clockscripture_priority)) + var/datum/clockwork_scripture/S = new V + GLOB.all_scripture[S.type] = S //changes construction value /proc/change_construction_value(amount) diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index c4e3f67dde..6c25795dea 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -266,25 +266,27 @@ /obj/item/clockwork/slab/ui_data(mob/user) //we display a lot of data via TGUI var/list/data = list() - data["power"] = get_clockwork_power() - data["scriptures"] = list() + data["power"] = DisplayPower(get_clockwork_power()) + data["rec_text"] = recollection() + data["scripture"] = list() for(var/s in GLOB.all_scripture) var/datum/clockwork_scripture/S = GLOB.all_scripture[s] //var/scripture_color = get_component_color_bright(S.primary_component) - var/list/temp_info = list("name" = "[S.name]", + var/list/temp_info = list( + "name" = "[S.name]", "descname" = "[S.descname]", "tip" = "[S.desc]\n[S.usage_tip]", "required" = "([DisplayPower(S.power_cost)][S.special_power_text ? "+ [replacetext(S.special_power_text, "POWERCOST", "[DisplayPower(S.special_power_cost)]")]" : ""])", "type" = "[S.type]", - "quickbind" = S.quickbind) - if(S.important) - temp_info["name"] = "[temp_info["name"]]" + "quickbind" = S.quickbind + ) + temp_info["important"] = S.important var/found = quickbound.Find(S.type) if(found) temp_info["bound"] = "[found]" if(S.invokers_required > 1) temp_info["invokers"] = "Invokers: [S.invokers_required]" - data["scripture"] += temp_info + data["scripture"] += list(temp_info) return data /obj/item/clockwork/slab/ui_static_data(mob/user) @@ -307,7 +309,6 @@ list("name" = "Power", "desc" = "The power system that certain objects use to function."), \ list("name" = "Conversion", "desc" = "Converting the crew, cyborgs, and very walls to your cause."), \ ) - data["rec_text"] = recollection() return data /obj/item/clockwork/slab/ui_act(action, params) diff --git a/tgui/packages/tgui/interfaces/ClockworkSlab.js b/tgui/packages/tgui/interfaces/ClockworkSlab.js index 7b809407e0..1f628af144 100644 --- a/tgui/packages/tgui/interfaces/ClockworkSlab.js +++ b/tgui/packages/tgui/interfaces/ClockworkSlab.js @@ -14,9 +14,9 @@ export const ClockworkSlab = (props, context) => { power = 0, } = data; return ( - + - +
- ); - })(scripture)} + })}