tgui 4.0 (#52085)

* tgui 4.0 hyper squash * Upgrade dependencies
2026-07-12 00:27:31 +01:00 · 2020-07-16 21:13:04 +03:00
parent 1f149b7023
commit 0cf00a2645
419 changed files with 5171 additions and 4029 deletions
@@ -31,15 +31,10 @@
 	var/available_on_ntnet = 1
 	/// Whether the program can be downloaded from SyndiNet (accessible via emagging the computer). Set to 1 to enable.
 	var/available_on_syndinet = 0
-	/// ID of TGUI interface
+	/// Name of the tgui interface
 	var/tgui_id
-	/// Default size of TGUI window, in pixels
-	var/ui_x = 575
-	var/ui_y = 700
 	/// Example: "something.gif" - a header image that will be rendered in computer's UI when this program is running at background. Images are taken from /icons/program_icons. Be careful not to use too large images!
 	var/ui_header = null
-	///Assets specific to programs
-	var/list/special_assets = list()

 /datum/computer_file/program/New(obj/item/modular_computer/comp = null)
 	..()
@@ -171,17 +166,11 @@
 		generate_network_log("Connection to [network_destination] closed.")
 	return 1

-
-/datum/computer_file/program/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)
+/datum/computer_file/program/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui && tgui_id)
-		var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
-		assets.send(user)
-		for(var/i in special_assets)
-			assets = get_asset_datum(i)
-			assets.send(user)
-
-		ui = new(user, src, ui_key, tgui_id, filedesc, ui_x, ui_y, state = state)
+		ui = new(user, src, tgui_id, filedesc)
+		ui.send_asset(get_asset_datum(/datum/asset/simple/headers))
 		ui.open()

 // CONVENTIONS, READ THIS WHEN CREATING NEW PROGRAM AND OVERRIDING THIS PROC:
@@ -9,8 +9,6 @@
 	transfer_access = ACCESS_HEADS
 	available_on_ntnet = TRUE
 	tgui_id = "NtosAiRestorer"
-	ui_x = 370
-	ui_y = 400
 	/// Variable dictating if we are in the process of restoring the AI in the inserted intellicard
 	var/restoring = FALSE

@@ -8,9 +8,6 @@
 	network_destination = "alarm monitoring network"
 	size = 5
 	tgui_id = "NtosStationAlertConsole"
-	ui_x = 315
-	ui_y = 500
-
 	var/has_alert = 0
 	var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list())

@@ -9,8 +9,6 @@
 	unsendable = 1
 	undeletable = 1
 	tgui_id = "SyndContractor"
-	ui_x = 500
-	ui_y = 600
 	var/error = ""
 	var/info_screen = TRUE
 	var/assigned = FALSE
@@ -8,8 +8,6 @@
 	available_on_ntnet = FALSE
 	available_on_syndinet = TRUE
 	tgui_id = "NtosNetDos"
-	ui_x = 400
-	ui_y = 250

 	var/obj/machinery/ntnet_relay/target = null
 	var/dos_speed = 0
@@ -8,9 +8,6 @@
 	available_on_ntnet = FALSE
 	available_on_syndinet = TRUE
 	tgui_id = "NtosRevelation"
-	ui_x = 400
-	ui_y = 250
-
 	var/armed = 0

 /datum/computer_file/program/revelation/run_program(var/mob/living/user)
@@ -7,8 +7,6 @@
 	network_destination = "arcade network"
 	size = 6
 	tgui_id = "NtosArcade"
-	ui_x = 450
-	ui_y = 350

 	///Returns TRUE if the game is being played.
 	var/game_active = TRUE
@@ -76,10 +74,10 @@
 	pause_state = FALSE
 	game_check()

-/datum/computer_file/program/arcade/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
-	. = ..()
-	var/datum/asset/assets = get_asset_datum(/datum/asset/simple/arcade)
-	assets.send(user)
+/datum/computer_file/program/arcade/ui_assets(mob/user)
+	return list(
+		get_asset_datum(/datum/asset/simple/arcade),
+	)

 /datum/computer_file/program/arcade/ui_data(mob/user)
 	var/list/data = get_header_data()
@@ -6,8 +6,6 @@
 	network_destination = "atmos scan"
 	size = 4
 	tgui_id = "NtosAtmos"
-	ui_x = 300
-	ui_y = 350

 /datum/computer_file/program/atmosscan/ui_data(mob/user)
 	var/list/data = get_header_data()
@@ -9,8 +9,6 @@
 	network_destination = "cyborg remote monitoring"
 	size = 5
 	tgui_id = "NtosCyborgRemoteMonitor"
-	ui_x = 600
-	ui_y = 800

 /datum/computer_file/program/borg_monitor/ui_data(mob/user)
 	var/list/data = get_header_data()
@@ -7,8 +7,6 @@
 	network_destination = "bounty board interface"
 	size = 10
 	tgui_id = "NtosRequestKiosk"
-	ui_x = 550
-	ui_y = 600
 	///Reference to the currently logged in user.
 	var/datum/bank_account/current_user
 	///The station request datum being affected by UI actions.
@@ -15,8 +15,6 @@
 	requires_ntnet = 0
 	size = 8
 	tgui_id = "NtosCard"
-	ui_x = 450
-	ui_y = 520

 	var/is_centcom = FALSE
 	var/minor = FALSE
@@ -8,8 +8,6 @@
 	network_destination = "cargo claims interface"
 	size = 10
 	tgui_id = "NtosBountyConsole"
-	ui_x = 750
-	ui_y = 600
 	///cooldown var for printing paper sheets.
 	var/printer_ready = 0
 	///The cargo account for grabbing the cargo account's credits.
@@ -18,7 +16,7 @@
 /datum/computer_file/program/bounty/proc/print_paper()
 	new /obj/item/paper/bounty_printout(get_turf(computer))

-/datum/computer_file/program/bounty/ui_interact(mob/user, ui_key, datum/tgui/ui, force_open, datum/tgui/master_ui, datum/ui_state/state)
+/datum/computer_file/program/bounty/ui_interact(mob/user, datum/tgui/ui)
 	if(!GLOB.bounties_list.len)
 		setup_bounties()
 	printer_ready = world.time + PRINTER_TIMEOUT
@@ -6,8 +6,6 @@
 	network_destination = "ship scanner"
 	size = 6
 	tgui_id = "NtosShipping"
-	ui_x = 450
-	ui_y = 350
 	///Account used for creating barcodes.
 	var/datum/bank_account/payments_acc
 	///The amount which the tagger will receive for the sale.
@@ -10,8 +10,6 @@
 	unsendable = 1
 	undeletable = 1
 	size = 4
-	ui_x = 420
-	ui_y = 630
 	available_on_ntnet = 0
 	requires_ntnet = 0
 	tgui_id = "NtosConfiguration"
@@ -7,8 +7,6 @@
 	requires_ntnet = FALSE
 	size = 4
 	tgui_id = "NtosCrewManifest"
-	ui_x = 400
-	ui_y = 480

 /datum/computer_file/program/crew_manifest/ui_static_data(mob/user)
 	var/list/data = list()
@@ -7,8 +7,6 @@
 	requires_ntnet = 0
 	size = 4
 	tgui_id = "NtosJobManager"
-	ui_x = 400
-	ui_y = 620

 	var/change_position_cooldown = 30
 	//Jobs you cannot open new positions for
@@ -11,8 +11,6 @@
 	available_on_ntnet = 0
 	ui_header = "downloader_finished.gif"
 	tgui_id = "NtosNetDownloader"
-	ui_x = 480
-	ui_y = 735

 	var/datum/computer_file/program/downloaded_file = null
 	var/hacked_download = 0
@@ -10,9 +10,6 @@
 	ui_header = "ntnrc_idle.gif"
 	available_on_ntnet = 1
 	tgui_id = "NtosNetChat"
-	ui_x = 900
-	ui_y = 675
-
 	var/last_message				// Used to generate the toolbar icon
 	var/username
 	var/active_channel
@@ -12,8 +12,6 @@
 	network_destination = "power monitoring system"
 	size = 9
 	tgui_id = "NtosPowerMonitor"
-	ui_x = 550
-	ui_y = 700

 	var/has_alert = 0
 	var/obj/structure/cable/attached_wire
@@ -10,11 +10,6 @@
 	network_destination = "tracking program"
 	size = 5
 	tgui_id = "NtosRadar"
-	ui_x = 800
-	ui_y = 600
-	special_assets = list(
-		/datum/asset/simple/radar_assets,
-	)
 	///List of trackable entities. Updated by the scan() proc.
 	var/list/objects
 	///Ref of the last trackable object selected by the user in the tgui window. Updated in the ui_act() proc.
@@ -45,6 +40,11 @@
 	STOP_PROCESSING(SSfastprocess, src)
 	return ..()

+/datum/computer_file/program/radar/ui_assets(mob/user)
+	return list(
+		get_asset_datum(/datum/asset/simple/radar_assets),
+	)
+
 /datum/computer_file/program/radar/ui_data(mob/user)
 	var/list/data = get_header_data()
 	data["selected"] = selected
@@ -9,8 +9,6 @@
 	network_destination = "robotics control network"
 	size = 12
 	tgui_id = "NtosRoboControl"
-	ui_x = 550
-	ui_y = 550
 	///Number of simple robots on-station.
 	var/botcount = 0
 	///Used to find the location of the user for the purposes of summoning robots.
@@ -9,8 +9,6 @@
 	network_destination = "supermatter monitoring system"
 	size = 5
 	tgui_id = "NtosSupermatterMonitor"
-	ui_x = 600
-	ui_y = 350
 	var/last_status = SUPERMATTER_INACTIVE
 	var/list/supermatters
 	var/obj/machinery/power/supermatter_crystal/active		// Currently selected supermatter crystal.