From 50bad3b24442e10020951537cf35bcf76a2210ec Mon Sep 17 00:00:00 2001 From: LordNest <77477080+LordNest@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:37:24 +0300 Subject: [PATCH] [MIRROR] Autolathe queue --- code/modules/fabrication/fabricator_ui.dm | 6 +- nano/templates/fabricator.tmpl | 231 +++++++++++++--------- 2 files changed, 143 insertions(+), 94 deletions(-) diff --git a/code/modules/fabrication/fabricator_ui.dm b/code/modules/fabrication/fabricator_ui.dm index b414ebf6eca49..464542fe52750 100644 --- a/code/modules/fabrication/fabricator_ui.dm +++ b/code/modules/fabrication/fabricator_ui.dm @@ -7,7 +7,7 @@ data["category"] = show_category data["functional"] = is_functioning() - if(is_functioning()) + if(is_functioning()) var/current_storage = list() data["material_storage"] = current_storage @@ -79,7 +79,7 @@ ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) - ui = new(user, src, ui_key, "fabricator.tmpl", "[capitalize(name)]", 480, 410, state = GLOB.physical_state) + ui = new(user, src, ui_key, "fabricator.tmpl", "[capitalize(name)]", 780, 580, state = GLOB.physical_state) ui.set_initial_data(data) ui.open() ui.set_auto_update(1) @@ -88,4 +88,4 @@ ui_interact(user) return TRUE -#undef PRINT_MULTIPLIER_DIVISOR \ No newline at end of file +#undef PRINT_MULTIPLIER_DIVISOR diff --git a/nano/templates/fabricator.tmpl b/nano/templates/fabricator.tmpl index 1fb0857872588..47caa7027a33d 100644 --- a/nano/templates/fabricator.tmpl +++ b/nano/templates/fabricator.tmpl @@ -1,94 +1,143 @@ {{if data.functional}} - - - - - - - - - - - - - - -
- - - - - - - {{for data.material_storage}} - - - - - - {{/for}} -
ResourceStorageOptions
{{:value.name}}{{:value.stored}}/{{:value.max}}{{:helper.link(value.eject_label, null, {'eject_mat' : value.eject_key})}}
-
- - - - - - - - - - - -
Current BuildUnitsProgress
{{:data.current_build.name}}{{:data.current_build.multiplier}}{{:data.current_build.progress}}
- 		- - - - - - - {{for data.build_queue}} - - - - {{if value.reference}} - - {{else}} - - {{/if}} - - {{/for}} -
PendingUnitsOptions
{{:value.name}}{{:value.multiplier}}{{:helper.link('Cancel', null, {'cancel' : value.reference})}}-
-
Selected Category {{:helper.link(data.category, null, {'change_category' : 1})}}
- - - - - - - {{for data.build_options}} - - {{if value.illegal}} - - {{else}} - - {{/if}} - - - - {{/for}} -
DesignCostOptions
{{:value.name}}{{:value.name}}{{:value.cost}} - {{if !value.unavailable}} - {{:helper.link('Queue', null, {'make' : value.reference, 'multiplier' : 1})}} - {{for value.multiplier :multValue:multIndex}} - {{:helper.link(multValue.label, null, {'make' : value.reference, 'multiplier' : multValue.multiplier})}} - {{/for}} - {{else}} - Insufficient resources. - {{/if}} -
-
+ + + + + + + + +
+ {{if data.color_selectable}} +
Color
+ {{:helper.link('(Set)', null, {'color_select' : 1})}} + {{/if}} + {{if data.network}} +
Connected to local network.
+
{{:helper.link(data.network, null, { 'settings': 1 }, null)}}
+ {{/if}} +
+ + + + + + + + + + +
+ + + + + + + {{for data.material_storage}} + + + + + + {{/for}} +
ResourceStorageOptions
+ {{:value.name}} + + {{:value.stored}}/{{:value.max}} + +
{{:helper.link(value.eject_label, null, {'eject_mat' : value.eject_key})}}
+
+
+
+
Category
+
+ {{:helper.link(data.category, null, {'change_category' : 1})}} +
+
+ +
+ + + + + + + {{for data.build_options}} + + {{if value.illegal}} + + {{else}} + + {{/if}} + + + + {{/for}} +
DesignCostOptions
+ {{:value.name}} + + {{:value.name}} + + {{:value.cost}} + + {{if !value.unavailable}} +
{{:helper.link('Queue', null, {'make' : value.reference, 'multiplier' : 1})}}
+ {{else}} + Insufficient resources. + {{/if}} +
+
+ 		+ + + + + + + + + + + +
Current BuildUnitsProgress
+ {{:data.current_build.name}} + + {{:data.current_build.multiplier}} + + {{:data.current_build.progress}} +
+ + + + + + + {{for data.build_queue}} + + + + {{if value.reference}} + + {{else}} + + {{/if}} + + {{/for}} +
PendingUnitsOptions
+ {{:value.name}} + + {{:value.multiplier}} + + {{:helper.link('Cancel', null, {'cancel' : value.reference})}} + -
+
{{else}} -

FABRICATOR OFFLINE. CONTACT SYSTEM ADMINISTRATOR.

+

+ FABRICATOR OFFLINE. CONTACT SYSTEM ADMINISTRATOR. +

{{/if}}