From b35e3f2b9352309284703d20ca5cd970901af5dd Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Wed, 1 Jul 2020 19:07:03 +0800 Subject: [PATCH] fix: R&D Console, Vending, and chem master --- code/modules/asset_cache/asset_list_items.dm | 2 +- .../chemistry/machinery/chem_master.dm | 10 +++--- code/modules/research/rdconsole.dm | 5 +-- code/modules/vending/_vending.dm | 4 +++ tgui-next/packages/tgui/interfaces/Vending.js | 31 ++++++++++++------- tgui-next/packages/tgui/public/tgui.bundle.js | 2 +- 6 files changed, 33 insertions(+), 21 deletions(-) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index dad1cfef5b..13a1803188 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -415,7 +415,7 @@ "dna_discovered.gif" = 'html/dna_discovered.gif', "dna_undiscovered.gif" = 'html/dna_undiscovered.gif', "dna_extra.gif" = 'html/dna_extra.gif' -) + ) /datum/asset/simple/vv assets = list( diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 042d80dab3..5d7009f311 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -154,6 +154,11 @@ bottle?.forceMove(A) return ..() +//Insert our custom spritesheet css link into the html +/obj/machinery/chem_master/ui_base_html(html) + var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills) + . = replacetext(html, "", assets.css_tag()) + /obj/machinery/chem_master/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) @@ -163,11 +168,6 @@ ui = new(user, src, ui_key, "chem_master", name, 500, 550, master_ui, state) ui.open() -//Insert our custom spritesheet css link into the html -/obj/machinery/chem_master/ui_base_html(html) - var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills) - . = replacetext(html, "", assets.css_tag()) - /obj/machinery/chem_master/ui_data(mob/user) var/list/data = list() data["isBeakerLoaded"] = beaker ? 1 : 0 diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index d543468c48..97555b7248 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -219,8 +219,6 @@ Nothing else in the console has ID requirements. /obj/machinery/computer/rdconsole/proc/ui_header() var/list/l = list() - var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/research_designs) - l += "[sheet.css_tag()][RDSCREEN_NOBREAK]" l += "
[stored_research.organization] Research and Development Network" l += "Available points:
[techweb_point_display_rdconsole(stored_research.research_points, stored_research.last_bitcoins)]" l += "Security protocols: [obj_flags & EMAGGED ? "Disabled" : "Enabled"]" @@ -1075,6 +1073,9 @@ Nothing else in the console has ID requirements. /obj/machinery/computer/rdconsole/ui_interact(mob/user) . = ..() var/datum/browser/popup = new(user, "rndconsole", name, 900, 600) + var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/research_designs) + + popup.add_head_content("") popup.add_stylesheet("techwebs", 'html/browser/techwebs.css') popup.set_content(generate_ui()) popup.open() diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 21fc3504bc..7adf0512de 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -658,6 +658,10 @@ GLOBAL_LIST_EMPTY(vending_products) return return ..() +/obj/machinery/vending/ui_base_html(html) + var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/vending) + . = replacetext(html, "", assets.css_tag()) + /obj/machinery/vending/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) diff --git a/tgui-next/packages/tgui/interfaces/Vending.js b/tgui-next/packages/tgui/interfaces/Vending.js index 3e48124fce..2965dd97d1 100644 --- a/tgui-next/packages/tgui/interfaces/Vending.js +++ b/tgui-next/packages/tgui/interfaces/Vending.js @@ -61,7 +61,7 @@ export const Vending = props => { ); return ( - + {product.base64 ? ( { }} /> ) : ( )} - {product.name} - + + {product.name} + + { {data.stock[product.name]} in stock - + {custom && (