cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-22 15:06:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

tgui embedding hooks (#6212)

Browse Source 
Co-authored-by: silicons <no@you.cat>
This commit is contained in:
silicons
2023-12-26 22:49:06 +01:00
committed by GitHub
co-authored by silicons
parent 70313ff3e2
commit 20f4c5c7ff
221 changed files with 1115 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
+1 -1
View File
@@ -77,7 +77,7 @@
ntnet_global.intrusion_detection_alarm = TRUE
return TRUE
/datum/computer_file/program/access_decrypter/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/access_decrypter/ui_data(mob/user, datum/tgui/ui)
if(!ntnet_global)
return
var/list/data = get_header_data()
code/modules/modular_computers/file_system/programs/antagonist/dos.dm
+2 -2
View File
@@ -40,7 +40,7 @@
..(forced)
/datum/computer_file/program/ntnet_dos/ui_data(mob/user)
/datum/computer_file/program/ntnet_dos/ui_data(mob/user, datum/tgui/ui)
if(!ntnet_global)
return
@@ -62,7 +62,7 @@
return data
/datum/computer_file/program/ntnet_dos/ui_act(action, params)
/datum/computer_file/program/ntnet_dos/ui_act(action, list/params, datum/tgui/ui)
if(..())
return TRUE
switch(action)
code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
+2 -2
View File
@@ -37,7 +37,7 @@
if(computer.tesla_link && prob(50))
qdel(computer.tesla_link)
/datum/computer_file/program/revelation/ui_act(action, params)
/datum/computer_file/program/revelation/ui_act(action, list/params, datum/tgui/ui)
if(..())
return
switch(action)
@@ -59,7 +59,7 @@
temp.armed = armed
return temp
/datum/computer_file/program/revelation/ui_data(mob/user)
/datum/computer_file/program/revelation/ui_data(mob/user, datum/tgui/ui)
var/list/data = get_header_data()
data["armed"] = armed
code/modules/modular_computers/file_system/programs/command/card.dm
+11 -15
View File
@@ -18,21 +18,17 @@
. = ..()
QDEL_NULL(tgui_cardmod)
/datum/computer_file/program/card_mod/ui_static_data(mob/user, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/card_mod/ui_static_data(mob/user, datum/tgui/ui)
. = get_header_data()
/datum/computer_file/program/card_mod/ui_module_route(action, list/params, datum/tgui/ui, id)
. = ..()
if(.)
return
switch(id)
if("modify")
return tgui_cardmod.ui_act(action, params, ui)
/datum/computer_file/program/card_mod/ui_route(action, list/params, datum/tgui/ui, id)
. = ..()
if(.)
return
switch(id)
if("modify")
return tgui_cardmod.ui_act(action, params, ui)
/datum/computer_file/program/card_mod/ui_module_data(mob/user, datum/tgui/ui, datum/ui_state/state)
. = ..()
.["modify"] = tgui_cardmod.data(user, computer.card_slot.stored_card, user.GetIdCard())
/datum/computer_file/program/card_mod/ui_module_static(mob/user, datum/tgui/ui, datum/ui_state/state)
. = ..()
.["modify"] = tgui_cardmod.static_data(user, computer.card_slot.stored_card, user.GetIdCard())
/datum/computer_file/program/card_mod/ui_pre_open(datum/tgui/ui)
ui.register_module(tgui_cardmod, "modify")
return ..()
code/modules/modular_computers/file_system/programs/generic/file_browser.dm
+1 -1
View File
@@ -140,7 +140,7 @@
HDD.store_file(C)
return TRUE
/datum/computer_file/program/filemanager/ui_data(mob/user)
/datum/computer_file/program/filemanager/ui_data(mob/user, datum/tgui/ui)
var/list/data = get_header_data()
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
code/modules/modular_computers/file_system/programs/generic/game.dm
+2 -2
View File
@@ -90,7 +90,7 @@
/**
* This provides all of the relevant data to the UI in a list().
*/
/datum/computer_file/program/game/ui_data(mob/user)
/datum/computer_file/program/game/ui_data(mob/user, datum/tgui/ui)
var/list/data = get_header_data()
data["Hitpoints"] = boss_hp
data["PlayerHitpoints"] = player_hp
@@ -105,7 +105,7 @@
/**
* This is tgui's replacement for Topic(). It handles any user input from the UI.
*/
/datum/computer_file/program/game/ui_act(action, list/params)
/datum/computer_file/program/game/ui_act(action, list/params, datum/tgui/ui)
if(..()) // Always call parent in ui_act, it handles making sure the user is allowed to interact with the UI.
return TRUE
code/modules/modular_computers/file_system/programs/generic/news_browser.dm
+1 -1
View File
@@ -36,7 +36,7 @@
requires_ntnet = 0 // Turn off NTNet requirement as we already loaded the file into local memory.
SStgui.update_uis(src)
/datum/computer_file/program/newsbrowser/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/newsbrowser/ui_data(mob/user, datum/tgui/ui)
var/list/data = get_header_data()
var/list/all_articles = list()
code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm
+2 -2
View File
@@ -105,7 +105,7 @@
download_netspeed = NTNETSPEED_ETHERNET
download_completion += download_netspeed
/datum/computer_file/program/ntnetdownload/ui_act(action, params)
/datum/computer_file/program/ntnetdownload/ui_act(action, list/params, datum/tgui/ui)
if(..())
return TRUE
switch(action)
@@ -127,7 +127,7 @@
return TRUE
return FALSE
/datum/computer_file/program/ntnetdownload/ui_data(mob/user)
/datum/computer_file/program/ntnetdownload/ui_data(mob/user, datum/tgui/ui)
my_computer = computer
if(!istype(my_computer))
return
code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm
+3 -3
View File
@@ -24,7 +24,7 @@
username = "DefaultUser[rand(100, 999)]"
ntnet = ntnet_global
/datum/computer_file/program/chatclient/ui_act(action, params)
/datum/computer_file/program/chatclient/ui_act(action, list/params, datum/tgui/ui)
if(..())
return
@@ -170,12 +170,12 @@
channel.remove_client(src)
..()
/datum/computer_file/program/chatclient/ui_static_data(mob/user)
/datum/computer_file/program/chatclient/ui_static_data(mob/user, datum/tgui/ui)
var/list/data = list()
data["can_admin"] = can_run(user, FALSE, ACCESS_NETWORK)
return data
/datum/computer_file/program/chatclient/ui_data(mob/user)
/datum/computer_file/program/chatclient/ui_data(mob/user, datum/tgui/ui)
if(!ntnet_global || !ntnet_global.chat_channels)
return list()
code/modules/modular_computers/file_system/programs/generic/nttransfer.dm
+1 -1
View File
@@ -75,7 +75,7 @@ var/global/nttransfer_uid = 0
remote = null
download_completion = 0
/datum/computer_file/program/nttransfer/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/nttransfer/ui_data(mob/user, datum/tgui/ui)
var/list/data = get_header_data()
data["error"] = error
code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm
+1 -1
View File
@@ -182,7 +182,7 @@
return TRUE
return TRUE
/datum/computer_file/program/wordprocessor/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/wordprocessor/ui_data(mob/user, datum/tgui/ui)
var/list/data = get_header_data()
var/obj/item/computer_hardware/hard_drive/HDD = computer.hard_drive
code/modules/modular_computers/file_system/programs/research/email_administration.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/datum/computer_file/data/email_message/current_message = null
var/error = ""
/datum/computer_file/program/email_administration/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/email_administration/ui_data(mob/user, datum/tgui/ui)
var/list/data = get_header_data()
data["error"] = error
code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
+5 -5
View File
@@ -11,7 +11,7 @@
available_on_ntnet = TRUE
tgui_id = "NtosNetMonitor"
/datum/computer_file/program/ntnetmonitor/ui_data(mob/user)
/datum/computer_file/program/ntnetmonitor/ui_data(mob/user, datum/tgui/ui)
if(!ntnet_global)
return
var/list/data = get_header_data()
@@ -38,7 +38,7 @@
return data
/datum/computer_file/program/ntnetmonitor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/ntnetmonitor/ui_act(action, list/params, datum/tgui/ui)
if(..())
return
switch(action)
@@ -60,7 +60,7 @@
return TRUE
var/response = alert(usr, "Really disable NTNet wireless? If your computer is connected wirelessly you won't be able to turn it back on! This will affect all connected wireless devices.", "NTNet shutdown", "Yes", "No")
if(response == "Yes" && ui_status(usr, state) == UI_INTERACTIVE)
if(response == "Yes" && ui?.still_interactive())
ntnet_global.setting_disabled = TRUE
return TRUE
if("purgelogs")
@@ -81,13 +81,13 @@
if(!ntnet_global)
return
var/nid = input(usr,"Enter NID of device which you want to block from the network:", "Enter NID") as null|num
if(nid && ui_status(usr, state) == UI_INTERACTIVE)
if(nid && ui?.still_interactive())
ntnet_global.banned_nids |= nid
return TRUE
if("unban_nid")
if(!ntnet_global)
return
var/nid = input(usr,"Enter NID of device which you want to unblock from the network:", "Enter NID") as null|num
if(nid && ui_status(usr, state) == UI_INTERACTIVE)
if(nid && ui?.still_interactive())
ntnet_global.banned_nids -= nid
return TRUE
code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
+6 -6
View File
@@ -25,7 +25,7 @@ var/global/warrant_uid = 0
var/datum/data/record/warrant/activewarrant
/datum/computer_file/program/digitalwarrant/ui_data(mob/user, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/digitalwarrant/ui_data(mob/user, datum/tgui/ui)
var/list/data = get_header_data()
data["warrantname"] = null
@@ -52,7 +52,7 @@ var/global/warrant_uid = 0
return data
/datum/computer_file/program/digitalwarrant/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
/datum/computer_file/program/digitalwarrant/ui_act(action, list/params, datum/tgui/ui)
if(..())
return TRUE
@@ -81,7 +81,7 @@ var/global/warrant_uid = 0
. = TRUE
var/datum/data/record/warrant/W = new()
var/temp = sanitize(input(usr, "Do you want to create a search-, or an arrest warrant?") as null|anything in list("search","arrest"))
if(ui_status(usr, state) == UI_INTERACTIVE)
if(ui?.still_interactive())
if(temp == "arrest")
W.fields["namewarrant"] = "Unknown"
W.fields["charges"] = "No charges present"
@@ -110,7 +110,7 @@ var/global/warrant_uid = 0
for(var/datum/data/record/t in data_core.general)
namelist += t.fields["name"]
var/new_name = sanitize(input(usr, "Please input name") as null|anything in namelist)
if(ui_status(usr, state) == UI_INTERACTIVE)
if(ui?.still_interactive())
if (!new_name)
return
activewarrant.fields["namewarrant"] = new_name
@@ -118,7 +118,7 @@ var/global/warrant_uid = 0
if("editwarrantnamecustom")
. = TRUE
var/new_name = sanitize(input("Please input name") as null|text)
if(ui_status(usr, state) == UI_INTERACTIVE)
if(ui?.still_interactive())
if (!new_name)
return
activewarrant.fields["namewarrant"] = new_name
@@ -126,7 +126,7 @@ var/global/warrant_uid = 0
if("editwarrantcharges")
. = TRUE
var/new_charges = sanitize(input("Please input charges", "Charges", activewarrant.fields["charges"]) as null|text)
if(ui_status(usr, state) == UI_INTERACTIVE)
if(ui?.still_interactive())
if (!new_charges)
return
activewarrant.fields["charges"] = new_charges