From 456b55cb0645fec80870248c41d2961343b2dc44 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Wed, 28 Apr 2021 22:25:39 -0700 Subject: [PATCH] that too --- code/controllers/subsystem/tgui.dm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index 511ab623da..c64e743fc0 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -1,10 +1,13 @@ +/*! + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + /** * tgui subsystem * * Contains all tgui state and subsystem code. * - * Copyright (c) 2020 Aleksej Komarov - * SPDX-License-Identifier: MIT */ SUBSYSTEM_DEF(tgui) @@ -42,8 +45,8 @@ SUBSYSTEM_DEF(tgui) var/datum/tgui/ui = current_run[current_run.len] current_run.len-- // TODO: Move user/src_object check to process() - if(ui && ui.user && ui.src_object) - ui.process() + if(ui?.user && ui.src_object) + ui.process(wait * 0.1) else open_uis.Remove(ui) if(MC_TICK_CHECK) @@ -191,8 +194,8 @@ SUBSYSTEM_DEF(tgui) return count for(var/datum/tgui/ui in open_uis_by_src[key]) // Check if UI is valid. - if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) - ui.process(force = 1) + if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user)) + ui.process(wait * 0.1, force = 1) count++ return count @@ -213,7 +216,7 @@ SUBSYSTEM_DEF(tgui) return count for(var/datum/tgui/ui in open_uis_by_src[key]) // Check if UI is valid. - if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) + if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user)) ui.close() count++ return count @@ -230,7 +233,7 @@ SUBSYSTEM_DEF(tgui) for(var/key in open_uis_by_src) for(var/datum/tgui/ui in open_uis_by_src[key]) // Check if UI is valid. - if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) + if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user)) ui.close() count++ return count @@ -251,7 +254,7 @@ SUBSYSTEM_DEF(tgui) return count for(var/datum/tgui/ui in user.tgui_open_uis) if(isnull(src_object) || ui.src_object == src_object) - ui.process(force = 1) + ui.process(wait * 0.1, force = 1) count++ return count