From 80a8467e9e93770d3de411e1bb360baf7cacd3b4 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 28 Apr 2021 22:24:49 -0700 Subject: [PATCH] hm --- code/modules/tgui/states/never.dm | 15 +++++++++++++++ code/modules/tgui/tgui.dm | 4 +++- code/modules/tgui_panel/tgui_panel.dm | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 code/modules/tgui/states/never.dm diff --git a/code/modules/tgui/states/never.dm b/code/modules/tgui/states/never.dm new file mode 100644 index 0000000000..f8b5faeeb3 --- /dev/null +++ b/code/modules/tgui/states/never.dm @@ -0,0 +1,15 @@ +/*! + * Copyright (c) 2021 Arm A. Hammer + * SPDX-License-Identifier: MIT + */ + +/** + * tgui state: never_state + * + * Always closes the UI, no matter what. See the ui_state in religious_tool.dm to see an example + */ + +GLOBAL_DATUM_INIT(never_state, /datum/ui_state/never_state, new) + +/datum/ui_state/never_state/can_use_topic(src_object, mob/user) + return UI_CLOSE diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index c6e5a99ac3..55497b150a 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -94,6 +94,8 @@ window.send_message("ping") var/flush_queue = window.send_asset(get_asset_datum( /datum/asset/simple/namespaced/fontawesome)) + flush_queue |= window.send_asset(get_asset_datum( + /datum/asset/simple/namespaced/tgfont)) for(var/datum/asset/asset in src_object.ui_assets(user)) flush_queue |= window.send_asset(asset) if (flush_queue) @@ -241,7 +243,7 @@ * Run an update cycle for this UI. Called internally by SStgui * every second or so. */ -/datum/tgui/process(force = FALSE) +/datum/tgui/process(delta_time, force = FALSE) if(closing) return var/datum/host = src_object.ui_host(user) diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index 2f7c2e9105..895333daee 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -47,7 +47,9 @@ get_asset_datum(/datum/asset/simple/tgui_panel), )) window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome)) + window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/tgfont)) window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat)) + // Other setup request_telemetry() addtimer(CALLBACK(src, .proc/on_initialize_timed_out), 5 SECONDS)