cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts all tgui_ to ui_

Browse Source
This commit is contained in:
AffectedArc07
2020-11-21 12:10:58 +00:00
parent 984ac231e0
commit 54dd2765b4
153 changed files with 1185 additions and 1214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+2 -2
View File
@@ -422,7 +422,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!orbit_menu)
orbit_menu = new(src)
orbit_menu.tgui_interact(src)
orbit_menu.ui_interact(src)
// This is the ghost's follow verb with an argument
/mob/dead/observer/proc/ManualFollow(atom/movable/target)
@@ -785,4 +785,4 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set category = "Ghost"
var/datum/spawners_menu/menu = new /datum/spawners_menu(src)
menu.tgui_interact(src)
menu.ui_interact(src)
code/modules/mob/dead/observer/orbit.dm
+5 -5
View File
@@ -6,13 +6,13 @@
qdel(src)
owner = new_owner
/datum/orbit_menu/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_observer_state)
/datum/orbit_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Orbit", "Orbit", 700, 500, master_ui, state)
ui.open()
/datum/orbit_menu/tgui_act(action, list/params, datum/tgui/ui)
/datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui)
. = ..()
if(.)
return
@@ -28,14 +28,14 @@
owner.ManualFollow(poi)
. = TRUE
if("refresh")
update_tgui_static_data(owner, ui)
update_static_data(owner, ui)
. = TRUE
/datum/orbit_menu/tgui_data(mob/user)
/datum/orbit_menu/ui_data(mob/user)
var/list/data = list()
return data
/datum/orbit_menu/tgui_static_data(mob/user)
/datum/orbit_menu/ui_static_data(mob/user)
var/list/data = list()
var/list/alive = list()
code/modules/mob/living/carbon/brain/MMI.dm
+2 -2
View File
@@ -278,8 +278,8 @@
return 1
// As a synthetic, the only limit on visibility is view range
/obj/item/mmi/contents_tgui_distance(src_object, mob/living/user)
/obj/item/mmi/contents_ui_distance(src_object, mob/living/user)
. = ..()
if((src_object in view(src)) && get_dist(src_object, src) <= user.client.view)
return STATUS_INTERACTIVE // interactive (green visibility)
return user.shared_living_tgui_distance()
return user.shared_living_ui_distance()
code/modules/mob/living/carbon/human/appearance.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/mob/living/carbon/human/proc/change_appearance(flags = APPEARANCE_ALL_HAIR, datum/location = src, mob/user = src, check_species_whitelist = TRUE, list/species_whitelist = list(), list/species_blacklist = list())
var/datum/tgui_module/appearance_changer/AC = new(location, src, check_species_whitelist, species_whitelist, species_blacklist)
var/datum/ui_module/appearance_changer/AC = new(location, src, check_species_whitelist, species_whitelist, species_blacklist)
AC.flags = flags
AC.tgui_interact(user)
AC.ui_interact(user)
/mob/living/carbon/human/proc/change_gender(var/new_gender, var/update_dna = 1)
var/obj/item/organ/external/head/H = bodyparts_by_name["head"]
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -41,7 +41,7 @@
GLOB.human_list += src
/mob/living/carbon/human/OpenCraftingMenu()
handcrafting.tgui_interact(src)
handcrafting.ui_interact(src)
/mob/living/carbon/human/prepare_data_huds()
//Update med hud images...
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -211,7 +211,7 @@
return
// See software.dm for tgui_act()
// See software.dm for ui_act()
/mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M)
. = ..()
code/modules/mob/living/silicon/pai/software.dm
+5 -5
View File
@@ -16,15 +16,15 @@ GLOBAL_LIST_EMPTY(pai_software_by_key)
set category = "pAI Commands"
set name = "Software Interface"
tgui_interact(src)
ui_interact(src)
/mob/living/silicon/pai/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_self_state)
/mob/living/silicon/pai/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.self_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "PAI", name, 600, 650, master_ui, state)
ui.open()
/mob/living/silicon/pai/tgui_data(mob/user)
/mob/living/silicon/pai/ui_data(mob/user)
var/list/data = list()
data["app_template"] = active_software.template_file
data["app_icon"] = active_software.ui_icon
@@ -34,7 +34,7 @@ GLOBAL_LIST_EMPTY(pai_software_by_key)
return data
// Yes the stupid amount of args here is important, so we can proxy stuff to child UIs
/mob/living/silicon/pai/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
/mob/living/silicon/pai/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
@@ -47,4 +47,4 @@ GLOBAL_LIST_EMPTY(pai_software_by_key)
// Bail early
return
else
active_software.tgui_act(action, params, ui, state)
active_software.ui_act(action, params, ui, state)
code/modules/mob/living/silicon/pai/software/_base.dm
+2 -2
View File
@@ -101,11 +101,11 @@
return M
/**
* tgui_act sanity check helper
* ui_act sanity check helper
*
* Basically checks the existing href exploit stuff, as well as making sure the user using the UI is the pAI itself
*/
/datum/pai_software/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
/datum/pai_software/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return TRUE
code/modules/mob/living/silicon/pai/software/pai_apps.dm
+11 -11
View File
@@ -42,7 +42,7 @@
return data
/datum/pai_software/main_menu/tgui_act(action, list/params)
/datum/pai_software/main_menu/ui_act(action, list/params)
if(..())
return
@@ -83,7 +83,7 @@
return data
/datum/pai_software/directives/tgui_act(action, list/params)
/datum/pai_software/directives/ui_act(action, list/params)
if(..())
return
@@ -140,11 +140,11 @@
integrated_records.update_ui(user, data)
return data
/datum/pai_software/med_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
/datum/pai_software/med_records/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
// Double proxy here
integrated_records.tgui_act(action, params, ui, state)
integrated_records.ui_act(action, params, ui, state)
// Sec Records //
/datum/pai_software/sec_records
@@ -162,11 +162,11 @@
integrated_records.update_ui(user, data)
return data
/datum/pai_software/sec_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
/datum/pai_software/sec_records/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
// Double proxy here
integrated_records.tgui_act(action, params, ui, state)
integrated_records.ui_act(action, params, ui, state)
// Atmos Scan //
/datum/pai_software/atmosphere_sensor
@@ -208,14 +208,14 @@
return data
/datum/pai_software/messenger/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
/datum/pai_software/messenger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
// Grab their messenger
var/datum/data/pda/app/messenger/PM = pai_holder.pda.find_program(/datum/data/pda/app/messenger)
// Double proxy here
PM.tgui_act(action, params, ui, state)
PM.ui_act(action, params, ui, state)
// Radio
/datum/pai_software/radio_config
@@ -233,7 +233,7 @@
data["broadcasting"] = user.radio.broadcasting
return data
/datum/pai_software/radio_config/tgui_act(action, list/params)
/datum/pai_software/radio_config/ui_act(action, list/params)
if(..())
return
@@ -264,7 +264,7 @@
return data
/datum/pai_software/signaler/tgui_act(action, list/params)
/datum/pai_software/signaler/ui_act(action, list/params)
if(..())
return
@@ -305,7 +305,7 @@
return data
/datum/pai_software/door_jack/tgui_act(action, list/params)
/datum/pai_software/door_jack/ui_act(action, list/params)
if(..())
return
code/modules/mob/living/silicon/subsystems.dm
+8 -8
View File
@@ -1,9 +1,9 @@
/mob/living/silicon
var/register_alarms = TRUE
var/datum/tgui_module/atmos_control/atmos_control
var/datum/tgui_module/crew_monitor/crew_monitor
var/datum/tgui_module/law_manager/law_manager
var/datum/tgui_module/power_monitor/digital/power_monitor
var/datum/ui_module/atmos_control/atmos_control
var/datum/ui_module/crew_monitor/crew_monitor
var/datum/ui_module/law_manager/law_manager
var/datum/ui_module/power_monitor/digital/power_monitor
/mob/living/silicon
var/list/silicon_subsystems = list(
@@ -40,7 +40,7 @@
set category = "Subsystems"
set name = "Atmospherics Control"
atmos_control.tgui_interact(usr, state = GLOB.tgui_self_state)
atmos_control.ui_interact(usr, state = GLOB.self_state)
/********************
* Crew Monitor *
@@ -48,7 +48,7 @@
/mob/living/silicon/proc/subsystem_crew_monitor()
set category = "Subsystems"
set name = "Crew Monitor"
crew_monitor.tgui_interact(usr, state = GLOB.tgui_self_state)
crew_monitor.ui_interact(usr, state = GLOB.self_state)
/****************
* Law Manager *
@@ -57,7 +57,7 @@
set name = "Law Manager"
set category = "Subsystems"
law_manager.tgui_interact(usr, state = GLOB.tgui_conscious_state)
law_manager.ui_interact(usr, state = GLOB.conscious_state)
/********************
* Power Monitor *
@@ -66,5 +66,5 @@
set category = "Subsystems"
set name = "Power Monitor"
power_monitor.tgui_interact(usr, state = GLOB.tgui_self_state)
power_monitor.ui_interact(usr, state = GLOB.self_state)