diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
index c8a156991ff..2dd2705901d 100644
--- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -128,19 +128,18 @@
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/atmospherics/binary/passive_gate/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atmospherics/binary/passive_gate/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_default_state)
- user.set_machine(src)
+/obj/machinery/atmospherics/binary/passive_gate/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)
if(!ui)
ui = new(user, src, ui_key, "AtmosPump", name, 310, 110, master_ui, state)
ui.open()
-/obj/machinery/atmospherics/binary/passive_gate/tgui_data(mob/user)
+/obj/machinery/atmospherics/binary/passive_gate/ui_data(mob/user)
var/list/data = list(
"on" = on,
"rate" = round(target_pressure),
@@ -150,7 +149,7 @@
)
return data
-/obj/machinery/atmospherics/binary/passive_gate/tgui_act(action, list/params)
+/obj/machinery/atmospherics/binary/passive_gate/ui_act(action, list/params)
if(..())
return
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 7f758afc02e..0583ef83b2d 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -183,19 +183,18 @@ Thus, the two variables affect pump operation are set in New():
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/atmospherics/binary/pump/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atmospherics/binary/pump/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_default_state)
- user.set_machine(src)
+/obj/machinery/atmospherics/binary/pump/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)
if(!ui)
ui = new(user, src, ui_key, "AtmosPump", name, 310, 110, master_ui, state)
ui.open()
-/obj/machinery/atmospherics/binary/pump/tgui_data(mob/user)
+/obj/machinery/atmospherics/binary/pump/ui_data(mob/user)
var/list/data = list(
"on" = on,
"rate" = round(target_pressure),
@@ -205,7 +204,7 @@ Thus, the two variables affect pump operation are set in New():
)
return data
-/obj/machinery/atmospherics/binary/pump/tgui_act(action, list/params)
+/obj/machinery/atmospherics/binary/pump/ui_act(action, list/params)
if(..())
return
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index 8277e140ace..38a2f51e309 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -180,19 +180,18 @@ Thus, the two variables affect pump operation are set in New():
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/atmospherics/binary/volume_pump/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atmospherics/binary/volume_pump/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_default_state)
- user.set_machine(src)
+/obj/machinery/atmospherics/binary/volume_pump/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)
if(!ui)
ui = new(user, src, ui_key, "AtmosPump", name, 310, 110, master_ui, state)
ui.open()
-/obj/machinery/atmospherics/binary/volume_pump/tgui_data(mob/user)
+/obj/machinery/atmospherics/binary/volume_pump/ui_data(mob/user)
var/list/data = list(
"on" = on,
"rate" = round(transfer_rate),
@@ -202,7 +201,7 @@ Thus, the two variables affect pump operation are set in New():
)
return data
-/obj/machinery/atmospherics/binary/volume_pump/tgui_act(action, list/params)
+/obj/machinery/atmospherics/binary/volume_pump/ui_act(action, list/params)
if(..())
return
diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
index 9fd4e00f299..88bf257649a 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -21,7 +21,7 @@
var/target_pressure = ONE_ATMOSPHERE
/// The type of gas we want to filter. Valid values that go here are from the `FILTER` defines at the top of the file.
var/filter_type = FILTER_TOXINS
- /// A list of available filter options. Used with `tgui_data`.
+ /// A list of available filter options. Used with `ui_data`.
var/list/filter_list = list(
"Nothing" = FILTER_NOTHING,
"Plasma" = FILTER_TOXINS,
@@ -191,7 +191,7 @@
..()
/obj/machinery/atmospherics/trinary/filter/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/atmospherics/trinary/filter/attack_hand(mob/user)
if(..())
@@ -202,16 +202,15 @@
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atmospherics/trinary/filter/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_default_state)
- user.set_machine(src)
+/obj/machinery/atmospherics/trinary/filter/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)
if(!ui)
ui = new(user, src, ui_key, "AtmosFilter", name, 380, 140, master_ui, state)
ui.open()
-/obj/machinery/atmospherics/trinary/filter/tgui_data(mob/user)
+/obj/machinery/atmospherics/trinary/filter/ui_data(mob/user)
var/list/data = list(
"on" = on,
"pressure" = round(target_pressure),
@@ -224,7 +223,7 @@
return data
-/obj/machinery/atmospherics/trinary/filter/tgui_act(action, list/params)
+/obj/machinery/atmospherics/trinary/filter/ui_act(action, list/params)
if(..())
return
diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
index 52845f1154d..4897b01bf65 100644
--- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
+++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -152,7 +152,7 @@
return 1
/obj/machinery/atmospherics/trinary/mixer/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/atmospherics/trinary/mixer/attack_hand(mob/user)
if(..())
@@ -163,16 +163,15 @@
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atmospherics/trinary/mixer/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_default_state)
- user.set_machine(src)
+/obj/machinery/atmospherics/trinary/mixer/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)
if(!ui)
ui = new(user, src, ui_key, "AtmosMixer", name, 330, 165, master_ui, state)
ui.open()
-/obj/machinery/atmospherics/trinary/mixer/tgui_data(mob/user)
+/obj/machinery/atmospherics/trinary/mixer/ui_data(mob/user)
var/list/data = list(
"on" = on,
"pressure" = round(target_pressure, 0.01),
@@ -184,7 +183,7 @@
-/obj/machinery/atmospherics/trinary/mixer/tgui_act(action, list/params)
+/obj/machinery/atmospherics/trinary/mixer/ui_act(action, list/params)
if(..())
return
diff --git a/code/__DEFINES/tgui.dm b/code/__DEFINES/tgui.dm
index 0ef159f11c2..6257e24d9f8 100644
--- a/code/__DEFINES/tgui.dm
+++ b/code/__DEFINES/tgui.dm
@@ -1,8 +1,8 @@
// TGUI defines
-#define TGUI_MODAL_INPUT_MAX_LENGTH 1024
-#define TGUI_MODAL_INPUT_MAX_LENGTH_NAME 64 // Names for generally anything don't go past 32, let alone 64.
+#define UI_MODAL_INPUT_MAX_LENGTH 1024
+#define UI_MODAL_INPUT_MAX_LENGTH_NAME 64 // Names for generally anything don't go past 32, let alone 64.
-#define TGUI_MODAL_OPEN 1
-#define TGUI_MODAL_DELEGATE 2
-#define TGUI_MODAL_ANSWER 3
-#define TGUI_MODAL_CLOSE 4
+#define UI_MODAL_OPEN 1
+#define UI_MODAL_DELEGATE 2
+#define UI_MODAL_ANSWER 3
+#define UI_MODAL_CLOSE 4
diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm
index 0acaf130301..98dae1850e5 100644
--- a/code/controllers/subsystem/tgui.dm
+++ b/code/controllers/subsystem/tgui.dm
@@ -43,25 +43,25 @@ SUBSYSTEM_DEF(tgui)
if (MC_TICK_CHECK)
return
- /**
- * public
- *
- * Get a open UI given a user, src_object, and ui_key and try to update it with data.
- *
- * required user mob The mob who opened/is using the UI.
- * required src_object datum The object/datum which owns the UI.
- * required ui_key string The ui_key of the UI.
- * optional ui datum/tgui The UI to be updated, if it exists.
- * optional force_open bool If the UI should be re-opened instead of updated.
- *
- * return datum/tgui The found UI.
- **/
+/**
+ * public
+ *
+ * Get an open UI given a user, src_object, and ui_key and try to update it with data.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required src_object datum The object/datum which owns the UI.
+ * required ui_key string The ui_key of the UI.
+ * optional ui datum/tgui The UI to be updated, if it exists.
+ * optional force_open bool If the UI should be re-opened instead of updated.
+ *
+ * return datum/tgui The found UI.
+ */
/datum/controller/subsystem/tgui/proc/try_update_ui(mob/user, datum/src_object, ui_key, datum/tgui/ui, force_open = FALSE)
if(isnull(ui)) // No UI was passed, so look for one.
ui = get_open_ui(user, src_object, ui_key)
if(!isnull(ui))
- var/data = src_object.tgui_data(user) // Get data from the src_object.
+ var/data = src_object.ui_data(user) // Get data from the src_object.
if(!force_open) // UI is already open; update it.
ui.push_data(data)
else // Re-open it anyways.
@@ -70,17 +70,17 @@ SUBSYSTEM_DEF(tgui)
else
return null // We couldn't find a UI.
- /**
- * private
- *
- * Get a open UI given a user, src_object, and ui_key.
- *
- * required user mob The mob who opened/is using the UI.
- * required src_object datum The object/datum which owns the UI.
- * required ui_key string The ui_key of the UI.
- *
- * return datum/tgui The found UI.
- **/
+/**
+ * private
+ *
+ * Get an open UI given a user, src_object, and ui_key.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * required src_object datum The object/datum which owns the UI.
+ * required ui_key string The ui_key of the UI.
+ *
+ * return datum/tgui The found UI.
+ */
/datum/controller/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object, ui_key)
var/src_object_key = "[src_object.UID()]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
@@ -94,15 +94,15 @@ SUBSYSTEM_DEF(tgui)
return null // Couldn't find a UI!
- /**
- * private
- *
- * Update all UIs attached to src_object.
- *
- * required src_object datum The object/datum which owns the UIs.
- *
- * return int The number of UIs updated.
- **/
+/**
+ * private
+ *
+ * Update all UIs attached to src_object.
+ *
+ * required src_object datum The object/datum which owns the UIs.
+ *
+ * return int The number of UIs updated.
+ */
/datum/controller/subsystem/tgui/proc/update_uis(datum/src_object)
var/src_object_key = "[src_object.UID()]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
@@ -111,20 +111,20 @@ SUBSYSTEM_DEF(tgui)
var/update_count = 0
for(var/ui_key in open_uis[src_object_key])
for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.tgui_host(ui.user)) // Check the UI is valid.
+ if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid.
ui.process(force = 1) // Update the UI.
update_count++ // Count each UI we update.
return update_count
- /**
- * private
- *
- * Close all UIs attached to src_object.
- *
- * required src_object datum The object/datum which owns the UIs.
- *
- * return int The number of UIs closed.
- **/
+/**
+ * private
+ *
+ * Close all UIs attached to src_object.
+ *
+ * required src_object datum The object/datum which owns the UIs.
+ *
+ * return int The number of UIs closed.
+ */
/datum/controller/subsystem/tgui/proc/close_uis(datum/src_object)
if(!src_object.unique_datum_id) // First check if the datum has an UID set
return 0
@@ -135,79 +135,79 @@ SUBSYSTEM_DEF(tgui)
var/close_count = 0
for(var/ui_key in open_uis[src_object_key])
for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.tgui_host(ui.user)) // Check the UI is valid.
+ if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid.
ui.close() // Close the UI.
close_count++ // Count each UI we close.
return close_count
- /**
- * private
- *
- * Close *ALL* UIs
- *
- * return int The number of UIs closed.
- **/
+/**
+ * private
+ *
+ * Close *ALL* UIs
+ *
+ * return int The number of UIs closed.
+ */
/datum/controller/subsystem/tgui/proc/close_all_uis()
var/close_count = 0
for(var/src_object_key in open_uis)
for(var/ui_key in open_uis[src_object_key])
for(var/datum/tgui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.tgui_host(ui.user)) // Check the UI is valid.
+ if(ui && ui.src_object && ui.user && ui.src_object.ui_host(ui.user)) // Check the UI is valid.
ui.close() // Close the UI.
close_count++ // Count each UI we close.
return close_count
- /**
- * private
- *
- * Update all UIs belonging to a user.
- *
- * required user mob The mob who opened/is using the UI.
- * optional src_object datum If provided, only update UIs belonging this src_object.
- * optional ui_key string If provided, only update UIs with this UI key.
- *
- * return int The number of UIs updated.
- **/
+/**
+ * private
+ *
+ * Update all UIs belonging to a user.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * optional src_object datum If provided, only update UIs belonging this src_object.
+ * optional ui_key string If provided, only update UIs with this UI key.
+ *
+ * return int The number of UIs updated.
+ */
/datum/controller/subsystem/tgui/proc/update_user_uis(mob/user, datum/src_object = null, ui_key = null)
- if(isnull(user.open_tguis) || !istype(user.open_tguis, /list) || open_uis.len == 0)
+ if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
var/update_count = 0
- for(var/datum/tgui/ui in user.open_tguis)
+ for(var/datum/tgui/ui in user.open_uis)
if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
ui.process(force = 1) // Update the UI.
update_count++ // Count each UI we upadte.
return update_count
- /**
- * private
- *
- * Close all UIs belonging to a user.
- *
- * required user mob The mob who opened/is using the UI.
- * optional src_object datum If provided, only close UIs belonging this src_object.
- * optional ui_key string If provided, only close UIs with this UI key.
- *
- * return int The number of UIs closed.
- **/
+/**
+ * private
+ *
+ * Close all UIs belonging to a user.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * optional src_object datum If provided, only close UIs belonging this src_object.
+ * optional ui_key string If provided, only close UIs with this UI key.
+ *
+ * return int The number of UIs closed.
+ */
/datum/controller/subsystem/tgui/proc/close_user_uis(mob/user, datum/src_object = null, ui_key = null)
- if(isnull(user.open_tguis) || !istype(user.open_tguis, /list) || open_uis.len == 0)
+ if(isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
return 0 // Couldn't find any UIs for this user.
var/close_count = 0
- for(var/datum/tgui/ui in user.open_tguis)
+ for(var/datum/tgui/ui in user.open_uis)
if((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
ui.close() // Close the UI.
close_count++ // Count each UI we close.
return close_count
- /**
- * private
- *
- * Add a UI to the list of open UIs.
- *
- * required ui datum/tgui The UI to be added.
- **/
+/**
+ * private
+ *
+ * Add a UI to the list of open UIs.
+ *
+ * required ui datum/tgui The UI to be added.
+ */
/datum/controller/subsystem/tgui/proc/on_open(datum/tgui/ui)
var/src_object_key = "[ui.src_object.UID()]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
@@ -216,30 +216,30 @@ SUBSYSTEM_DEF(tgui)
open_uis[src_object_key][ui.ui_key] = list() // Make a list for the ui_key.
// Append the UI to all the lists.
- ui.user.open_tguis |= ui
+ ui.user.open_uis |= ui
var/list/uis = open_uis[src_object_key][ui.ui_key]
uis |= ui
processing_uis |= ui
- /**
- * private
- *
- * Remove a UI from the list of open UIs.
- *
- * required ui datum/tgui The UI to be removed.
- *
- * return bool If the UI was removed or not.
- **/
+/**
+ * private
+ *
+ * Remove a UI from the list of open UIs.
+ *
+ * required ui datum/tgui The UI to be removed.
+ *
+ * return bool If the UI was removed or not.
+ */
/datum/controller/subsystem/tgui/proc/on_close(datum/tgui/ui)
var/src_object_key = "[ui.src_object.UID()]"
if(isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
- return FALSE // It wasn't open.
+ return 0 // It wasn't open.
else if(isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
- return FALSE // It wasn't open.
+ return 0 // It wasn't open.
processing_uis.Remove(ui) // Remove it from the list of processing UIs.
if(ui.user) // If the user exists, remove it from them too.
- ui.user.open_tguis.Remove(ui)
+ ui.user.open_uis.Remove(ui)
var/Ukey = ui.ui_key
var/list/uis = open_uis[src_object_key][Ukey] // Remove it from the list of open UIs.
uis.Remove(ui)
@@ -249,40 +249,40 @@ SUBSYSTEM_DEF(tgui)
if(!uiobj.len)
open_uis.Remove(src_object_key)
- return TRUE // Let the caller know we did it.
+ return 1 // Let the caller know we did it.
- /**
- * private
- *
- * Handle client logout, by closing all their UIs.
- *
- * required user mob The mob which logged out.
- *
- * return int The number of UIs closed.
- **/
+/**
+ * private
+ *
+ * Handle client logout, by closing all their UIs.
+ *
+ * required user mob The mob which logged out.
+ *
+ * return int The number of UIs closed.
+ */
/datum/controller/subsystem/tgui/proc/on_logout(mob/user)
return close_user_uis(user)
- /**
- * private
- *
- * Handle clients switching mobs, by transferring their UIs.
- *
- * required user source The client's original mob.
- * required user target The client's new mob.
- *
- * return bool If the UIs were transferred.
- **/
+/**
+ * private
+ *
+ * Handle clients switching mobs, by transferring their UIs.
+ *
+ * required user source The client's original mob.
+ * required user target The client's new mob.
+ *
+ * return bool If the UIs were transferred.
+ */
/datum/controller/subsystem/tgui/proc/on_transfer(mob/source, mob/target)
- if(!source || isnull(source.open_tguis) || !istype(source.open_tguis, /list) || open_uis.len == 0)
- return FALSE // The old mob had no open UIs.
+ if(!source || isnull(source.open_uis) || !istype(source.open_uis, /list) || open_uis.len == 0)
+ return 0 // The old mob had no open UIs.
- if(isnull(target.open_tguis) || !istype(target.open_tguis, /list))
- target.open_tguis = list() // Create a list for the new mob if needed.
+ if(isnull(target.open_uis) || !istype(target.open_uis, /list))
+ target.open_uis = list() // Create a list for the new mob if needed.
- for(var/datum/tgui/ui in source.open_tguis)
+ for(var/datum/tgui/ui in source.open_uis)
ui.user = target // Inform the UIs of their new owner.
- target.open_tguis.Add(ui) // Transfer all the UIs.
+ target.open_uis.Add(ui) // Transfer all the UIs.
- source.open_tguis.Cut() // Clear the old list.
- return TRUE // Let the caller know we did it.
+ source.open_uis.Cut() // Clear the old list.
+ return 1 // Let the caller know we did it.
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index 45b71a0e381..7a9a37e9395 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -533,5 +533,5 @@
/**
* Return the object that is the host of any UI's that this component has
*/
-/datum/component/tgui_host(mob/user)
+/datum/component/ui_host(mob/user)
return parent
diff --git a/code/datums/spawners_menu.dm b/code/datums/spawners_menu.dm
index a196a60fcc5..0a69855638c 100644
--- a/code/datums/spawners_menu.dm
+++ b/code/datums/spawners_menu.dm
@@ -6,13 +6,13 @@
qdel(src)
owner = new_owner
-/datum/spawners_menu/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui_state/state = GLOB.tgui_observer_state, datum/tgui/master_ui = null)
+/datum/spawners_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/ui_state/state = GLOB.observer_state, datum/tgui/master_ui = null)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "SpawnersMenu", "Spawners Menu", 700, 600, master_ui, state = state)
ui.open()
-/datum/spawners_menu/tgui_data(mob/user)
+/datum/spawners_menu/ui_data(mob/user)
var/list/data = list()
data["spawners"] = list()
for(var/spawner in GLOB.mob_spawners)
@@ -37,7 +37,7 @@
data["spawners"] += list(this)
return data
-/datum/spawners_menu/tgui_act(action, params)
+/datum/spawners_menu/ui_act(action, params)
if(..())
return
var/spawners = replacetext(params["ID"], ",", ";")
diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 6282fcef75a..e1a8e83ed11 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
var/special = FALSE //Event/Station Goals/Admin enabled packs
var/special_enabled = FALSE
/// List of names for being done in TGUI
- var/list/tgui_manifest = list()
+ var/list/ui_manifest = list()
/datum/supply_packs/New()
@@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
var/atom/movable/AM = path
manifest += "[initial(AM.name)]"
// Add the name to the UI manifest
- tgui_manifest += "[initial(AM.name)]"
+ ui_manifest += "[initial(AM.name)]"
manifest += ""
diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index d2c092211ec..5707c0aa9a1 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -80,7 +80,7 @@
*/
/datum/wires/proc/Interact(mob/user)
if(user && istype(user) && holder && interactable(user))
- tgui_interact(user)
+ ui_interact(user)
/**
* Base proc, intended to be overriden. Wire datum specific checks you want to run before the TGUI is shown to the user should go here.
@@ -89,16 +89,16 @@
return TRUE
/// Users will be interacting with our holder object and not the wire datum directly, therefore we need to return the holder.
-/datum/wires/tgui_host()
+/datum/wires/ui_host()
return holder
-/datum/wires/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_physical_state)
+/datum/wires/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Wires", "[proper_name] wires", window_x, window_y + wire_count * 30, master_ui, state)
ui.open()
-/datum/wires/tgui_data(mob/user)
+/datum/wires/ui_data(mob/user)
var/list/data = list()
var/list/replace_colors
@@ -149,7 +149,7 @@
data["status"] = status
return data
-/datum/wires/tgui_act(action, list/params)
+/datum/wires/ui_act(action, list/params)
if(..())
return
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 290152d910d..5b1a14bba1f 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -408,9 +408,9 @@
if(stat & (NOPOWER|BROKEN))
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/scan_consolenew/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_default_state)
+/obj/machinery/computer/scan_consolenew/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)
if(user == connected.occupant)
return
@@ -419,8 +419,8 @@
ui = new(user, src, ui_key, "DNAModifier", name, 660, 700, master_ui, state)
ui.open()
-/obj/machinery/computer/scan_consolenew/tgui_data(mob/user)
- var/data[0]
+/obj/machinery/computer/scan_consolenew/ui_data(mob/user)
+ var/list/data = list()
data["selectedMenuKey"] = selected_menu_key
data["locked"] = connected.locked
data["hasOccupant"] = connected.occupant ? 1 : 0
@@ -494,11 +494,11 @@
data["beakerVolume"] += R.volume
// Transfer modal information if there is one
- data["modal"] = tgui_modal_data(src)
+ data["modal"] = ui_modal_data(src)
return data
-/obj/machinery/computer/scan_consolenew/tgui_act(action, params)
+/obj/machinery/computer/scan_consolenew/ui_act(action, params)
if(..())
return FALSE // don't update uis
if(!istype(usr.loc, /turf))
@@ -512,7 +512,7 @@
add_fingerprint(usr)
- if(tgui_act_modal(action, params))
+ if(ui_act_modal(action, params))
return TRUE
. = TRUE
@@ -721,7 +721,7 @@
if("clear")
buffers[bufferId] = new /datum/dna2/record()
if("changeLabel")
- tgui_modal_input(src, "changeBufferLabel", "Please enter the new buffer label:", null, list("id" = bufferId), buffer.name, TGUI_MODAL_INPUT_MAX_LENGTH_NAME)
+ ui_modal_input(src, "changeBufferLabel", "Please enter the new buffer label:", null, list("id" = bufferId), buffer.name, UI_MODAL_INPUT_MAX_LENGTH_NAME)
if("transfer")
if(!connected.occupant || (NOCLONE in connected.occupant.mutations && connected.scan_level < 3) || !connected.occupant.dna)
return
@@ -758,7 +758,7 @@
return
if(text2num(params["block"]) > 0)
var/list/choices = all_dna_blocks((buffer.types & DNA2_BUF_SE) ? buffer.dna.SE : buffer.dna.UI)
- tgui_modal_choice(src, "createInjectorBlock", "Please select the block to create an injector from:", null, list("id" = bufferId), null, choices)
+ ui_modal_choice(src, "createInjectorBlock", "Please select the block to create an injector from:", null, list("id" = bufferId), null, choices)
else
create_injector(bufferId, TRUE)
if("loadDisk")
@@ -814,18 +814,18 @@
injector_ready = TRUE
/**
- * Called in tgui_act() to process modal actions
+ * Called in ui_act() to process modal actions
*
* Arguments:
* * action - The action passed by tgui
* * params - The params passed by tgui
*/
-/obj/machinery/computer/scan_consolenew/proc/tgui_act_modal(action, params)
+/obj/machinery/computer/scan_consolenew/proc/ui_act_modal(action, params)
. = TRUE
var/id = params["id"] // The modal's ID
var/list/arguments = istext(params["arguments"]) ? json_decode(params["arguments"]) : params["arguments"]
- switch(tgui_modal_act(src, action, params))
- if(TGUI_MODAL_ANSWER)
+ switch(ui_modal_act(src, action, params))
+ if(UI_MODAL_ANSWER)
var/answer = params["answer"]
switch(id)
if("createInjectorBlock")
diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm
index 3002f139a39..83453f09b2a 100644
--- a/code/game/gamemodes/changeling/evolution_menu.dm
+++ b/code/game/gamemodes/changeling/evolution_menu.dm
@@ -32,16 +32,16 @@
))
/datum/action/changeling/evolution_menu/try_to_sting(mob/user, mob/target)
- tgui_interact(user)
+ ui_interact(user)
-/datum/action/changeling/evolution_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_always_state)
+/datum/action/changeling/evolution_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.always_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "EvolutionMenu", "Evolution Menu", 480, 574, master_ui, state)
ui.set_autoupdate(FALSE)
ui.open()
-/datum/action/changeling/evolution_menu/tgui_data(mob/user)
+/datum/action/changeling/evolution_menu/ui_data(mob/user)
var/datum/changeling/cling = owner.mind.changeling
var/list/data = list(
"can_respec" = cling.canrespec,
@@ -51,13 +51,13 @@
)
return data
-/datum/action/changeling/evolution_menu/tgui_static_data(mob/user)
+/datum/action/changeling/evolution_menu/ui_static_data(mob/user)
var/list/data = list(
"ability_list" = ability_list
)
return data
-/datum/action/changeling/evolution_menu/tgui_act(action, list/params)
+/datum/action/changeling/evolution_menu/ui_act(action, list/params)
if(..())
return
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 209f9689de1..5ea64829595 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -176,15 +176,15 @@ GLOBAL_VAR(bomb_set)
if(panel_open)
wires.Interact(user)
else
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/nuclearbomb/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
+/obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "NuclearBomb", name, 450, 300, master_ui, state)
ui.open()
-/obj/machinery/nuclearbomb/tgui_data(mob/user)
+/obj/machinery/nuclearbomb/ui_data(mob/user)
var/list/data = list()
data["extended"] = extended
data["authdisk"] = is_auth(user)
@@ -215,7 +215,7 @@ GLOBAL_VAR(bomb_set)
else
return FALSE
-/obj/machinery/nuclearbomb/tgui_act(action, params)
+/obj/machinery/nuclearbomb/ui_act(action, params)
if(..())
return
. = TRUE
diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm
index e6f8e0964b9..66b970e3806 100644
--- a/code/game/machinery/Freezer.dm
+++ b/code/game/machinery/Freezer.dm
@@ -110,15 +110,15 @@
to_chat(user, "Close the maintenance panel first.")
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atmospherics/unary/cold_sink/freezer/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "GasFreezer", "Gas Cooling System", 540, 200)
ui.open()
-/obj/machinery/atmospherics/unary/cold_sink/freezer/tgui_data(mob/user)
+/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_data(mob/user)
var/list/data = list()
data["on"] = on
data["pressure"] = round(air_contents.return_pressure())
@@ -132,7 +132,7 @@
data["targetCelsius"] = round(current_temperature - T0C, 1)
return data
-/obj/machinery/atmospherics/unary/cold_sink/freezer/tgui_act(action, params)
+/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_act(action, params)
if(..())
return
add_fingerprint(usr)
@@ -277,15 +277,15 @@
if(panel_open)
to_chat(user, "Close the maintenance panel first.")
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "GasFreezer", "Gas Heating System", 540, 200)
ui.open()
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/tgui_data(mob/user)
+/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_data(mob/user)
var/list/data = list()
data["on"] = on
data["pressure"] = round(air_contents.return_pressure())
@@ -299,7 +299,7 @@
data["targetCelsius"] = round(current_temperature - T0C, 1)
return data
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/tgui_act(action, params)
+/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_act(action, params)
if(..())
return
add_fingerprint(usr)
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index d95b38e3fa2..6cb53645302 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -125,7 +125,7 @@
return attack_hand(user)
/obj/machinery/sleeper/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/sleeper/attack_hand(mob/user)
if(stat & (NOPOWER|BROKEN))
@@ -135,16 +135,16 @@
to_chat(user, "Close the maintenance panel first.")
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/sleeper/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_default_state)
+/obj/machinery/sleeper/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)
if(!ui)
ui = new(user, src, ui_key, "Sleeper", "Sleeper", 550, 775)
ui.open()
-/obj/machinery/sleeper/tgui_data(mob/user)
- var/data[0]
+/obj/machinery/sleeper/ui_data(mob/user)
+ var/list/data = list()
data["amounts"] = amounts
data["hasOccupant"] = occupant ? 1 : 0
var/occupantData[0]
@@ -244,7 +244,7 @@
data["chemicals"] = chemicals
return data
-/obj/machinery/sleeper/tgui_act(action, params)
+/obj/machinery/sleeper/ui_act(action, params)
if(..())
return
if(!controls_inside && usr == occupant)
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index d9e0958d0bb..4978db6efce 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -134,7 +134,7 @@
return attack_hand(user)
/obj/machinery/bodyscanner/attack_ghost(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/bodyscanner/attack_hand(user)
if(stat & (NOPOWER|BROKEN))
@@ -147,7 +147,7 @@
to_chat(user, "Close the maintenance panel first.")
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/bodyscanner/relaymove(mob/user)
if(user.incapacitated())
@@ -195,14 +195,14 @@
new /obj/effect/gibspawner/generic(get_turf(loc)) //I REPLACE YOUR TECHNOLOGY WITH FLESH!
qdel(src)
-/obj/machinery/bodyscanner/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_default_state)
+/obj/machinery/bodyscanner/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)
if(!ui)
ui = new(user, src, ui_key, "BodyScanner", "Body Scanner", 690, 600)
ui.open()
-/obj/machinery/bodyscanner/tgui_data(mob/user)
- var/data[0]
+/obj/machinery/bodyscanner/ui_data(mob/user)
+ var/list/data = list()
data["occupied"] = occupant ? TRUE : FALSE
@@ -328,7 +328,7 @@
data["occupant"] = occupantData
return data
-/obj/machinery/bodyscanner/tgui_act(action, params)
+/obj/machinery/bodyscanner/ui_act(action, params)
if(..())
return
if(stat & (NOPOWER|BROKEN))
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index e9661508cf3..fa10d39d5ea 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -566,7 +566,7 @@
return
add_hiddenprint(user)
- return tgui_interact(user)
+ return ui_interact(user)
/obj/machinery/alarm/attack_ghost(mob/user)
return interact(user)
@@ -585,7 +585,7 @@
wires.Interact(user)
if(!shorted)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/alarm/proc/ui_air_status()
var/turf/location = get_turf(src)
@@ -656,7 +656,7 @@
return user && (isAI(user) || allowed(user) || emagged || rcon_setting == RCON_YES)
// Intentional nulls here
-/obj/machinery/alarm/tgui_data(mob/user)
+/obj/machinery/alarm/ui_data(mob/user)
var/list/data = list()
data["name"] = sanitize(name)
@@ -767,7 +767,7 @@
return thresholds
-/obj/machinery/alarm/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_default_state)
+/obj/machinery/alarm/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)
if(!ui)
ui = new(user, src, ui_key, "AirAlarm", name, 570, 410, master_ui, state)
@@ -776,7 +776,7 @@
/obj/machinery/alarm/proc/is_authenticated(mob/user, datum/tgui/ui=null)
// Return true if they are connecting with a remote console
// DO NOT CHANGE THIS TO USE ISTYPE, IT WILL NOT WORK
- if(ui?.master_ui?.src_object.type == /datum/tgui_module/atmos_control)
+ if(ui?.master_ui?.src_object.type == /datum/ui_module/atmos_control)
return TRUE
if(user.can_admin_interact())
return TRUE
@@ -785,7 +785,7 @@
else
return !locked
-/obj/machinery/alarm/tgui_status(mob/user, datum/tgui_state/state)
+/obj/machinery/alarm/ui_status(mob/user, datum/ui_state/state)
if(buildstage != 2)
return STATUS_CLOSE
@@ -798,7 +798,7 @@
return min(..(), .)
// TODO: Refactor these utter pieces of garbage
-/obj/machinery/alarm/tgui_act(action, list/params)
+/obj/machinery/alarm/ui_act(action, list/params)
if(..())
return
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index b950f3d51a3..07edc75c590 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -283,18 +283,18 @@ update_flag
return attack_hand(user)
/obj/machinery/portable_atmospherics/canister/attack_ghost(var/mob/user)
- return tgui_interact(user)
+ return ui_interact(user)
/obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user)
- return tgui_interact(user)
+ return ui_interact(user)
-/obj/machinery/portable_atmospherics/canister/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
+/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Canister", name, 600, 350, master_ui, state)
ui.open()
-/obj/machinery/portable_atmospherics/canister/tgui_data()
+/obj/machinery/portable_atmospherics/canister/ui_data()
var/data = list()
data["portConnected"] = connected_port ? 1 : 0
data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
@@ -312,7 +312,7 @@ update_flag
data["holdingTank"] = list("name" = holding.name, "tankPressure" = round(holding.air_contents.return_pressure()))
return data
-/obj/machinery/portable_atmospherics/canister/tgui_act(action, params)
+/obj/machinery/portable_atmospherics/canister/ui_act(action, params)
if(..())
return
var/can_min_release_pressure = round(ONE_ATMOSPHERE / 10)
diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm
index 8198976bc14..32671689d18 100644
--- a/code/game/machinery/atmoalter/pump.dm
+++ b/code/game/machinery/atmoalter/pump.dm
@@ -116,16 +116,15 @@
return attack_hand(user)
/obj/machinery/portable_atmospherics/pump/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/portable_atmospherics/pump/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_default_state)
+/obj/machinery/portable_atmospherics/pump/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)
if(!ui)
ui = new(user, src, ui_key, "PortablePump", "Portable Pump", 434, 377, master_ui, state)
ui.open()
- ui.set_autoupdate(TRUE)
-/obj/machinery/portable_atmospherics/pump/tgui_data(mob/user)
+/obj/machinery/portable_atmospherics/pump/ui_data(mob/user)
var/list/data = list(
"on" = on,
"direction" = direction,
@@ -142,7 +141,7 @@
return data
-/obj/machinery/portable_atmospherics/pump/tgui_act(action, list/params)
+/obj/machinery/portable_atmospherics/pump/ui_act(action, list/params)
if(..())
return
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index 6f2d19b31a5..2fbcc4b0392 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -107,17 +107,17 @@
return attack_hand(user)
/obj/machinery/portable_atmospherics/scrubber/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
return
-/obj/machinery/portable_atmospherics/scrubber/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_default_state)
+/obj/machinery/portable_atmospherics/scrubber/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)
if(!ui)
ui = new(user, src, ui_key, "PortableScrubber", "Portable Scrubber", 433, 346, master_ui, state)
ui.open()
ui.set_autoupdate(TRUE)
-/obj/machinery/portable_atmospherics/scrubber/tgui_data(mob/user)
+/obj/machinery/portable_atmospherics/scrubber/ui_data(mob/user)
var/list/data = list(
"on" = on,
"port_connected" = connected_port ? TRUE : FALSE,
@@ -133,7 +133,7 @@
return data
-/obj/machinery/portable_atmospherics/scrubber/tgui_act(action, list/params)
+/obj/machinery/portable_atmospherics/scrubber/ui_act(action, list/params)
if(..())
return
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 7d57c2edebe..9aa66700ca9 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -80,16 +80,16 @@
if(panel_open)
wires.Interact(user)
else if(!disabled)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/autolathe/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/autolathe/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Autolathe", name, 750, 700, master_ui, state)
ui.open()
-/obj/machinery/autolathe/tgui_static_data(mob/user)
+/obj/machinery/autolathe/ui_static_data(mob/user)
var/list/data = list()
data["categories"] = categories
if(!recipiecache.len)
@@ -129,8 +129,8 @@
data["recipes"] = recipiecache
return data
-/obj/machinery/autolathe/tgui_data(mob/user)
- var/list/data = list() //..()
+/obj/machinery/autolathe/ui_data(mob/user)
+ var/list/data = list()
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
data["total_amount"] = materials.total_amount
data["max_amount"] = materials.max_amount
@@ -148,7 +148,7 @@
data["buildQueueLen"] = queue.len
return data
-/obj/machinery/autolathe/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
+/obj/machinery/autolathe/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return FALSE
@@ -191,7 +191,7 @@
if(!is_stack && (multiplier > 1))
return
if(!(multiplier in list(1, 10, 25, max_multiplier))) //"enough materials ?" is checked in the build proc
- message_admins("Player [key_name_admin(usr)] attempted to pass invalid multiplier [multiplier] to an autolathe in tgui_act. Possible href exploit.")
+ message_admins("Player [key_name_admin(usr)] attempted to pass invalid multiplier [multiplier] to an autolathe in ui_act. Possible href exploit.")
return
if((queue.len + 1) < queue_max_len)
add_to_queue(design_last_ordered, multiplier)
@@ -202,7 +202,7 @@
process_queue()
busy = FALSE
-/obj/machinery/autolathe/tgui_status(mob/user, datum/tgui_state/state)
+/obj/machinery/autolathe/ui_status(mob/user, datum/ui_state/state)
. = disabled ? STATUS_DISABLED : STATUS_INTERACTIVE
return min(..(), .)
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 3cecf5f4e04..9d98bf6105d 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -43,7 +43,7 @@
add_fingerprint(user)
if(stat & (BROKEN|NOPOWER))
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/operating/attack_hand(mob/user)
if(..(user))
@@ -53,16 +53,16 @@
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/operating/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_default_state)
+/obj/machinery/computer/operating/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)
if(!ui)
ui = new(user, src, ui_key, "OperatingComputer", "Patient Monitor", 650, 455, master_ui, state)
ui.open()
-/obj/machinery/computer/operating/tgui_data(mob/user)
- var/data[0]
+/obj/machinery/computer/operating/ui_data(mob/user)
+ var/list/data = list()
var/mob/living/carbon/human/occupant
if(table)
occupant = table.patient
@@ -136,7 +136,7 @@
return data
-/obj/machinery/computer/operating/tgui_act(action, params)
+/obj/machinery/computer/operating/ui_act(action, params)
if(..())
return
if(stat & (NOPOWER|BROKEN))
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 6b198deba49..b1fef7a1b23 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -22,19 +22,18 @@
return ..()
/obj/machinery/computer/aifixer/attack_ai(var/mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/aifixer/attack_hand(var/mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/aifixer/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/aifixer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-
if(!ui)
ui = new(user, src, ui_key, "AIFixer", name, 550, 500, master_ui, state)
ui.open()
-/obj/machinery/computer/aifixer/tgui_data(mob/user, datum/topic_state/state)
+/obj/machinery/computer/aifixer/ui_data(mob/user)
var/data[0]
data["occupant"] = (occupant ? occupant.name : null) // a null occupant isn't passed on if this is below the if.
if(occupant)
@@ -56,7 +55,7 @@
return data
-/obj/machinery/computer/aifixer/tgui_act(action, params)
+/obj/machinery/computer/aifixer/ui_act(action, params)
if(..())
return
switch(action)
diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
index 2dd237e838f..8d54f21ad0f 100644
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -20,15 +20,15 @@
return ..()
/obj/machinery/computer/atmos_alert/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/atmos_alert/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_default_state)
+/obj/machinery/computer/atmos_alert/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)
if(!ui)
ui = new(user, src, ui_key, "AtmosAlertConsole", name, ui_x, ui_y, master_ui, state)
ui.open()
-/obj/machinery/computer/atmos_alert/tgui_data(mob/user)
+/obj/machinery/computer/atmos_alert/ui_data(mob/user)
var/list/data = list()
data["priority"] = list()
@@ -40,7 +40,7 @@
return data
-/obj/machinery/computer/atmos_alert/tgui_act(action, params)
+/obj/machinery/computer/atmos_alert/ui_act(action, params)
if(..())
return
switch(action)
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index 8014cea95a2..7083986242f 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -6,7 +6,7 @@
light_color = LIGHT_COLOR_CYAN
circuit = /obj/item/circuitboard/atmoscontrol
req_access = list(ACCESS_ATMOSPHERICS)
- var/datum/tgui_module/atmos_control/atmos_control
+ var/datum/ui_module/atmos_control/atmos_control
/obj/machinery/computer/atmoscontrol/Initialize()
. = ..()
@@ -19,12 +19,12 @@
density = FALSE
/obj/machinery/computer/atmoscontrol/attack_ai(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/atmoscontrol/attack_hand(mob/user)
if(..())
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/atmoscontrol/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_default_state)
- atmos_control.tgui_interact(user, ui_key, ui, force_open)
+/obj/machinery/computer/atmoscontrol/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)
+ atmos_control.ui_interact(user, ui_key, ui, force_open)
diff --git a/code/game/machinery/computer/brigcells.dm b/code/game/machinery/computer/brigcells.dm
index b220ded29c5..ae07fe12134 100644
--- a/code/game/machinery/computer/brigcells.dm
+++ b/code/game/machinery/computer/brigcells.dm
@@ -12,7 +12,7 @@
/obj/machinery/computer/brigcells/attack_ai(mob/user)
attack_hand(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/brigcells/attack_hand(mob/user)
add_fingerprint(user)
@@ -21,16 +21,15 @@
if(!allowed(user))
to_chat(user, "Access denied.")
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/brigcells/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/brigcells/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "BrigCells", "Brig Cell Management", 1000, 400, master_ui, state)
ui.open()
- ui.set_autoupdate(TRUE)
-/obj/machinery/computer/brigcells/tgui_data(mob/user)
+/obj/machinery/computer/brigcells/ui_data(mob/user)
var/list/data = list()
var/list/timers = list()
for(var/obj/machinery/door_timer/T in GLOB.celltimers_list)
@@ -47,7 +46,7 @@
data["cells"] = timers
return data
-/obj/machinery/computer/brigcells/tgui_act(action, params)
+/obj/machinery/computer/brigcells/ui_act(action, params)
if (..())
return FALSE
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index f5a0b78538e..58ff6388c2d 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -24,7 +24,7 @@
// Parent object this camera is assigned to. Used for camera bugs
var/atom/movable/parent
-/obj/machinery/computer/security/tgui_host()
+/obj/machinery/computer/security/ui_host()
return parent ? parent : src
/obj/machinery/computer/security/Initialize()
@@ -53,7 +53,7 @@
qdel(cam_background)
return ..()
-/obj/machinery/computer/security/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_default_state)
+/obj/machinery/computer/security/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)
// Update UI
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
// Show static if can't use the camera
@@ -79,7 +79,7 @@
ui = new(user, src, ui_key, "CameraConsole", name, 870, 708, master_ui, state)
ui.open()
-/obj/machinery/computer/security/tgui_data()
+/obj/machinery/computer/security/ui_data()
var/list/data = list()
data["network"] = network
data["activeCamera"] = null
@@ -90,7 +90,7 @@
)
return data
-/obj/machinery/computer/security/tgui_static_data()
+/obj/machinery/computer/security/ui_static_data()
var/list/data = list()
data["mapRef"] = map_name
var/list/cameras = get_available_cameras()
@@ -103,7 +103,7 @@
return data
-/obj/machinery/computer/security/tgui_act(action, params)
+/obj/machinery/computer/security/ui_act(action, params)
if(..())
return
@@ -158,14 +158,14 @@
user.unset_machine()
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/security/attack_ai(mob/user)
if(isAI(user))
to_chat(user, "You realise its kind of stupid to access a camera console when you have the entire camera network at your metaphorical fingertips")
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/security/proc/show_camera_static()
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 7211970fd14..01e8a26cb31 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -300,15 +300,15 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if(stat & (NOPOWER|BROKEN))
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/card/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/card/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "CardComputer", name, 800, 800, master_ui, state)
ui.open()
-/obj/machinery/computer/card/tgui_data(mob/user)
+/obj/machinery/computer/card/ui_data(mob/user)
var/list/data = list()
data["mode"] = mode
data["modify_name"] = modify ? modify.name : FALSE
@@ -377,7 +377,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if(modify)
modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
-/obj/machinery/computer/card/tgui_act(action, params)
+/obj/machinery/computer/card/ui_act(action, params)
if(..())
return
. = TRUE
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 04a4f7e0db4..73722f5e6a3 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -123,9 +123,9 @@
return
updatemodules()
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/cloning/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_default_state)
+/obj/machinery/computer/cloning/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)
if(stat & (NOPOWER|BROKEN))
return
@@ -137,7 +137,7 @@
ui = new(user, src, ui_key, "CloningConsole", "Cloning Console", 640, 520)
ui.open()
-/obj/machinery/computer/cloning/tgui_data(mob/user)
+/obj/machinery/computer/cloning/ui_data(mob/user)
var/data[0]
data["menu"] = src.menu
data["scanner"] = sanitize("[src.scanner]")
@@ -192,19 +192,19 @@
else
data["podready"] = 0
- data["modal"] = tgui_modal_data(src)
+ data["modal"] = ui_modal_data(src)
return data
-/obj/machinery/computer/cloning/tgui_act(action, params)
+/obj/machinery/computer/cloning/ui_act(action, params)
if(..())
return
if(stat & (NOPOWER|BROKEN))
return
. = TRUE
- switch(tgui_modal_act(src, action, params))
- if(TGUI_MODAL_ANSWER)
+ switch(ui_modal_act(src, action, params))
+ if(UI_MODAL_ANSWER)
if(params["id"] == "del_rec" && active_record)
var/obj/item/card/id/C = usr.get_active_hand()
if(!istype(C) && !istype(C, /obj/item/pda))
@@ -259,14 +259,14 @@
unidentity = active_record.dna.uni_identity,
strucenzymes = active_record.dna.struc_enzymes,
)
- tgui_modal_message(src, action, "", null, payload)
+ ui_modal_message(src, action, "", null, payload)
else
active_record = null
set_temp("Error: Record missing.", "danger")
if("del_rec")
if(!active_record)
return
- tgui_modal_boolean(src, action, "Please confirm that you want to delete the record by holding your ID and pressing Delete:", yes_text = "Delete", no_text = "Cancel")
+ ui_modal_boolean(src, action, "Please confirm that you want to delete the record by holding your ID and pressing Delete:", yes_text = "Delete", no_text = "Cancel")
if("disk") // Disk management.
if(!length(params["option"]))
return
@@ -323,7 +323,7 @@
var/datum/dna2/record/C = locate(ref)
//Look for that player! They better be dead!
if(istype(C))
- tgui_modal_clear(src)
+ ui_modal_clear(src)
//Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs.
if(!length(pods))
set_temp("Error: No cloning pod detected.", "danger")
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 60563e692b3..5b91586e8c5 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -74,7 +74,7 @@
feedback_inc("alert_comms_blue",1)
tmp_alertlevel = 0
-/obj/machinery/computer/communications/tgui_act(action, params)
+/obj/machinery/computer/communications/ui_act(action, params)
if(..())
return
if(!is_secure_level(z))
@@ -314,15 +314,15 @@
to_chat(user, "Unable to establish a connection: You're too far away from the station!")
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/communications/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/communications/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "CommunicationsComputer", name, 500, 600, master_ui, state)
ui.open()
-/obj/machinery/computer/communications/tgui_data(mob/user)
+/obj/machinery/computer/communications/ui_data(mob/user)
var/list/data = list()
data["is_ai"] = isAI(user) || isrobot(user)
data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index d6a1ccdd33c..3b2fa65b281 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -8,7 +8,7 @@
active_power_usage = 500
light_color = LIGHT_COLOR_DARKBLUE
circuit = /obj/item/circuitboard/crew
- var/datum/tgui_module/crew_monitor/crew_monitor
+ var/datum/ui_module/crew_monitor/crew_monitor
/obj/machinery/computer/crew/New()
crew_monitor = new(src)
@@ -25,10 +25,10 @@
add_fingerprint(user)
if(stat & (BROKEN|NOPOWER))
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/crew/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_default_state)
- crew_monitor.tgui_interact(user, ui_key, ui, force_open)
+/obj/machinery/computer/crew/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)
+ crew_monitor.ui_interact(user, ui_key, ui, force_open)
/obj/machinery/computer/crew/interact(mob/user)
- crew_monitor.tgui_interact(user)
+ crew_monitor.ui_interact(user)
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 48e946a999b..2a453e20c9f 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -62,7 +62,7 @@
return ..()
/obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params)
- if(tgui_login_attackby(O, user))
+ if(ui_login_attackby(O, user))
return
return ..()
@@ -73,22 +73,22 @@
to_chat(user, "Unable to establish a connection: You're too far away from the station!")
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/med_data/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_default_state)
+/obj/machinery/computer/med_data/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)
if(!ui)
ui = new(user, src, ui_key, "MedicalRecords", "Medical Records", 800, 380, master_ui, state)
ui.open()
ui.set_autoupdate(FALSE)
-/obj/machinery/computer/med_data/tgui_data(mob/user)
- var/data[0]
+/obj/machinery/computer/med_data/ui_data(mob/user)
+ var/list/data = list()
data["temp"] = temp
data["screen"] = screen
data["printing"] = printing
// This proc appends login state to data.
- tgui_login_data(data, user)
+ ui_login_data(data, user)
if(data["loginState"]["logged_in"])
switch(screen)
if(MED_DATA_R_LIST)
@@ -172,10 +172,10 @@
medbot["use_beaker"] = 0
data["medbots"] += list(medbot)
- data["modal"] = tgui_modal_data(src)
+ data["modal"] = ui_modal_data(src)
return data
-/obj/machinery/computer/med_data/tgui_act(action, params)
+/obj/machinery/computer/med_data/ui_act(action, params)
if(..())
return
if(stat & (NOPOWER|BROKEN))
@@ -187,9 +187,9 @@
active2 = null
. = TRUE
- if(tgui_act_modal(action, params))
+ if(ui_act_modal(action, params))
return
- if(tgui_login_act(action, params))
+ if(ui_login_act(action, params))
return
switch(action)
@@ -201,7 +201,7 @@
if(.)
return
- if(tgui_login_get().logged_in)
+ if(ui_login_get().logged_in)
. = TRUE
switch(action)
if("screen")
@@ -221,8 +221,8 @@
cure = D.cure_text || "None",
desc = D.desc,
severity = D.severity
- );
- tgui_modal_message(src, "virus", "", null, payload)
+ )
+ ui_modal_message(src, "virus", "", null, payload)
qdel(D)
if("del_all")
for(var/datum/data/record/R in GLOB.data_core.medical)
@@ -306,18 +306,18 @@
return FALSE
/**
- * Called in tgui_act() to process modal actions
+ * Called in ui_act() to process modal actions
*
* Arguments:
* * action - The action passed by tgui
* * params - The params passed by tgui
*/
-/obj/machinery/computer/med_data/proc/tgui_act_modal(action, params)
+/obj/machinery/computer/med_data/proc/ui_act_modal(action, params)
. = TRUE
var/id = params["id"] // The modal's ID
var/list/arguments = istext(params["arguments"]) ? json_decode(params["arguments"]) : params["arguments"]
- switch(tgui_modal_act(src, action, params))
- if(TGUI_MODAL_OPEN)
+ switch(ui_modal_act(src, action, params))
+ if(UI_MODAL_OPEN)
switch(id)
if("edit")
var/field = arguments["field"]
@@ -326,14 +326,14 @@
var/question = field_edit_questions[field]
var/choices = field_edit_choices[field]
if(length(choices))
- tgui_modal_choice(src, id, question, arguments = arguments, value = arguments["value"], choices = choices)
+ ui_modal_choice(src, id, question, arguments = arguments, value = arguments["value"], choices = choices)
else
- tgui_modal_input(src, id, question, arguments = arguments, value = arguments["value"])
+ ui_modal_input(src, id, question, arguments = arguments, value = arguments["value"])
if("add_c")
- tgui_modal_input(src, id, "Please enter your message:")
+ ui_modal_input(src, id, "Please enter your message:")
else
return FALSE
- if(TGUI_MODAL_ANSWER)
+ if(UI_MODAL_ANSWER)
var/answer = params["answer"]
switch(id)
if("edit")
@@ -356,7 +356,7 @@
else if(istype(active1) && (field in active1.fields))
active1.fields[field] = answer
if("add_c")
- var/datum/tgui_login/state = tgui_login_get()
+ var/datum/ui_login/state = ui_login_get()
if(!length(answer) || !istype(active2) || !length(state.name))
return
active2.fields["comments"] += list(list(
@@ -447,7 +447,7 @@
..(severity)
-/obj/machinery/computer/med_data/tgui_login_on_login(datum/tgui_login/state)
+/obj/machinery/computer/med_data/ui_login_on_login(datum/ui_login/state)
active1 = null
active2 = null
screen = MED_DATA_R_LIST
diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm
index 5fe88b844a5..6af1ab0bdf4 100644
--- a/code/game/machinery/computer/pod_tracking_console.dm
+++ b/code/game/machinery/computer/pod_tracking_console.dm
@@ -11,15 +11,15 @@
return attack_hand(user)
/obj/machinery/computer/podtracker/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/podtracker/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_default_state)
+/obj/machinery/computer/podtracker/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)
if(!ui)
ui = new(user, src, ui_key, "PodTracking", name, 400, 500, master_ui, state)
ui.open()
-/obj/machinery/computer/podtracker/tgui_data(mob/user)
+/obj/machinery/computer/podtracker/ui_data(mob/user)
var/list/data = list()
var/list/pods = list()
for(var/obj/item/spacepod_equipment/misc/tracker/TR in GLOB.pod_trackers)
diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm
index a0bbedf2f73..e45746486d4 100644
--- a/code/game/machinery/computer/power.dm
+++ b/code/game/machinery/computer/power.dm
@@ -9,7 +9,7 @@
light_color = LIGHT_COLOR_ORANGE
circuit = /obj/item/circuitboard/powermonitor
var/datum/powernet/powernet = null
- var/datum/tgui_module/power_monitor/power_monitor
+ var/datum/ui_module/power_monitor/power_monitor
/// Will this monitor be hidden from viewers?
var/is_secret_monitor = FALSE
/// How many records to keep of supply and demand
@@ -67,13 +67,13 @@
return
// Update the powernet
powernet = find_powernet()
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/monitor/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_default_state)
- power_monitor.tgui_interact(user, ui_key, ui, force_open)
+/obj/machinery/computer/monitor/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)
+ power_monitor.ui_interact(user, ui_key, ui, force_open)
/obj/machinery/computer/monitor/interact(mob/user)
- power_monitor.tgui_interact(user)
+ power_monitor.ui_interact(user)
/obj/machinery/computer/monitor/process()
record()
diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index f676d861f96..79c2cb35566 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -20,7 +20,7 @@
return
if(stat & (NOPOWER|BROKEN))
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/robotics/proc/is_authenticated(mob/user)
if(!istype(user))
@@ -114,13 +114,13 @@
return FALSE
return TRUE
-/obj/machinery/computer/robotics/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/robotics/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "RoboticsControlConsole", name, 500, 460, master_ui, state)
ui.open()
-/obj/machinery/computer/robotics/tgui_data(mob/user)
+/obj/machinery/computer/robotics/ui_data(mob/user)
var/list/data = list()
data["auth"] = is_authenticated(user)
data["can_hack"] = can_hack_any(user)
@@ -149,7 +149,7 @@
data["show_detonate_all"] = (data["auth"] && length(data["cyborgs"]) > 0 && ishuman(user))
return data
-/obj/machinery/computer/robotics/tgui_act(action, params)
+/obj/machinery/computer/robotics/ui_act(action, params)
if(..())
return
. = FALSE
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index b1a1e8a5b88..60e1d2814f2 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -59,7 +59,7 @@
return ..()
/obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params)
- if(tgui_login_attackby(O, user))
+ if(ui_login_attackby(O, user))
return
return ..()
@@ -70,21 +70,21 @@
to_chat(user, "Unable to establish a connection: You're too far away from the station!")
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/secure_data/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/secure_data/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "SecurityRecords", name, 800, 800)
ui.open()
ui.set_autoupdate(FALSE)
-/obj/machinery/computer/secure_data/tgui_data(mob/user)
+/obj/machinery/computer/secure_data/ui_data(mob/user)
var/list/data = list()
data["currentPage"] = current_page
data["isPrinting"] = is_printing
- tgui_login_data(data, user)
- data["modal"] = tgui_modal_data()
+ ui_login_data(data, user)
+ data["modal"] = ui_modal_data()
data["temp"] = temp_notice
if(data["loginState"]["logged_in"])
switch(current_page)
@@ -149,17 +149,17 @@
return data
-/obj/machinery/computer/secure_data/tgui_act(action, list/params)
+/obj/machinery/computer/secure_data/ui_act(action, list/params)
if(..())
return
. = TRUE
- if(tgui_act_modal(action, params))
+ if(ui_act_modal(action, params))
return
- if(tgui_login_act(action, params))
+ if(ui_login_act(action, params))
return
- var/logged_in = tgui_login_get().logged_in
+ var/logged_in = ui_login_get().logged_in
switch(action)
if("cleartemp")
temp_notice = null
@@ -292,20 +292,20 @@
add_fingerprint(usr)
/**
- * Called in tgui_act() to process modal actions
+ * Called in ui_act() to process modal actions
*
* Arguments:
* * action - The action passed by tgui
* * params - The params passed by tgui
*/
-/obj/machinery/computer/secure_data/proc/tgui_act_modal(action, list/params)
- if(!tgui_login_get().logged_in)
+/obj/machinery/computer/secure_data/proc/ui_act_modal(action, list/params)
+ if(!ui_login_get().logged_in)
return
. = TRUE
var/id = params["id"]
var/list/arguments = istext(params["arguments"]) ? json_decode(params["arguments"]) : params["arguments"]
- switch(tgui_modal_act(src, action, params))
- if(TGUI_MODAL_OPEN)
+ switch(ui_modal_act(src, action, params))
+ if(UI_MODAL_OPEN)
switch(id)
if("edit")
var/field = arguments["field"]
@@ -314,11 +314,11 @@
var/question = field_edit_questions[field]
var/choices = field_edit_choices[field]
if(length(choices))
- tgui_modal_choice(src, id, question, arguments = arguments, value = arguments["value"], choices = choices)
+ ui_modal_choice(src, id, question, arguments = arguments, value = arguments["value"], choices = choices)
else
- tgui_modal_input(src, id, question, arguments = arguments, value = arguments["value"])
+ ui_modal_input(src, id, question, arguments = arguments, value = arguments["value"])
if("comment_add")
- tgui_modal_input(src, id, "Please enter your message:")
+ ui_modal_input(src, id, "Please enter your message:")
if("print_cell_log")
if(is_printing)
return
@@ -333,10 +333,10 @@
continue
choices += P.name
already_in[P.name] = TRUE
- tgui_modal_choice(src, id, "Please select the cell log you would like printed:", choices = choices)
+ ui_modal_choice(src, id, "Please select the cell log you would like printed:", choices = choices)
else
return FALSE
- if(TGUI_MODAL_ANSWER)
+ if(UI_MODAL_ANSWER)
var/answer = params["answer"]
switch(id)
if("edit")
@@ -359,7 +359,7 @@
text = "Please explain why they are being executed. Include a list of their crimes, and victims."
else if(answer == SEC_RECORD_STATUS_DEMOTE)
text = "Please explain why they are being demoted. Include a list of their offenses."
- tgui_modal_input(src, "criminal_reason", text, arguments = list("status" = answer))
+ ui_modal_input(src, "criminal_reason", text, arguments = list("status" = answer))
return
if(record_security && (field in record_security.fields))
@@ -373,11 +373,11 @@
if((status in list(SEC_RECORD_STATUS_EXECUTE, SEC_RECORD_STATUS_DEMOTE)) && !length(answer))
set_temp("A valid reason must be provided for this status.", "danger")
return
- var/datum/tgui_login/state = tgui_login_get()
+ var/datum/ui_login/state = ui_login_get()
if(!set_criminal_status(usr, record_security, status, answer, state.rank, state.access, state.name))
set_temp("Required permissions to set this criminal status not found!", "danger")
if("comment_add")
- var/datum/tgui_login/state = tgui_login_get()
+ var/datum/ui_login/state = ui_login_get()
if(!length(answer) || !record_security || !length(state.name))
return
record_security.fields["comments"] += list(list(
diff --git a/code/game/machinery/computer/sm_monitor.dm b/code/game/machinery/computer/sm_monitor.dm
index f2e01e6c4fa..01cd72549f3 100644
--- a/code/game/machinery/computer/sm_monitor.dm
+++ b/code/game/machinery/computer/sm_monitor.dm
@@ -23,15 +23,15 @@
add_fingerprint(user)
if(stat & (BROKEN|NOPOWER))
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/sm_monitor/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_default_state)
+/obj/machinery/computer/sm_monitor/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)
if(!ui)
ui = new(user, src, ui_key, "SupermatterMonitor", name, 600, 325, master_ui, state)
ui.open()
-/obj/machinery/computer/sm_monitor/tgui_data(mob/user)
+/obj/machinery/computer/sm_monitor/ui_data(mob/user)
var/list/data = list()
if(istype(active))
@@ -95,7 +95,7 @@
*/
/obj/machinery/computer/sm_monitor/proc/refresh()
supermatters = list()
- var/turf/T = get_turf(tgui_host()) // Get the TGUI host incase this ever turned into a supermatter monitoring module for AIs to use or something
+ var/turf/T = get_turf(ui_host()) // Get the UI host incase this ever turned into a supermatter monitoring module for AIs to use or something
if(!T)
return
for(var/obj/machinery/power/supermatter_shard/S in SSair.atmos_machinery)
@@ -122,7 +122,7 @@
return TRUE
-/obj/machinery/computer/sm_monitor/tgui_act(action, params)
+/obj/machinery/computer/sm_monitor/ui_act(action, params)
if(..())
return
diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm
index 3b4631b171a..e3abb5b4842 100644
--- a/code/game/machinery/computer/station_alert.dm
+++ b/code/game/machinery/computer/station_alert.dm
@@ -24,21 +24,21 @@
add_fingerprint(user)
if(stat & (BROKEN|NOPOWER))
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/station_alert/attack_hand(mob/user)
add_fingerprint(user)
if(stat & (BROKEN|NOPOWER))
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/station_alert/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_default_state)
+/obj/machinery/computer/station_alert/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)
if(!ui)
ui = new(user, src, ui_key, "StationAlertConsole", name, ui_x, ui_y, master_ui, state)
ui.open()
-/obj/machinery/computer/station_alert/tgui_data(mob/user)
+/obj/machinery/computer/station_alert/ui_data(mob/user)
var/list/data = list()
data["alarms"] = list()
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 8fd121901ea..8c11ea9618d 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -186,7 +186,7 @@
return
/obj/machinery/atmospherics/unary/cryo_cell/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user)
if(user == occupant)
@@ -196,16 +196,16 @@
to_chat(usr, "Close the maintenance panel first.")
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atmospherics/unary/cryo_cell/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_default_state)
+/obj/machinery/atmospherics/unary/cryo_cell/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)
if(!ui)
ui = new(user, src, ui_key, "Cryo", "Cryo Cell", 520, 490)
ui.open()
-/obj/machinery/atmospherics/unary/cryo_cell/tgui_data(mob/user)
- var/data[0]
+/obj/machinery/atmospherics/unary/cryo_cell/ui_data(mob/user)
+ var/list/data = list()
data["isOperating"] = on
data["hasOccupant"] = occupant ? TRUE : FALSE
@@ -243,7 +243,7 @@
data["auto_eject_dead"] = (auto_eject_prefs & AUTO_EJECT_DEAD) ? TRUE : FALSE
return data
-/obj/machinery/atmospherics/unary/cryo_cell/tgui_act(action, params)
+/obj/machinery/atmospherics/unary/cryo_cell/ui_act(action, params)
if(..() || usr == occupant)
return
if(stat & (NOPOWER|BROKEN))
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index e0256ccf9a8..e6399f82fb5 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -38,9 +38,9 @@
#define AIRLOCK_DAMAGE_DEFLECTION_N 21 // Normal airlock damage deflection
#define AIRLOCK_DAMAGE_DEFLECTION_R 30 // Reinforced airlock damage deflection
-#define TGUI_GREEN 2
-#define TGUI_ORANGE 1
-#define TGUI_RED 0
+#define UI_GREEN 2
+#define UI_ORANGE 1
+#define UI_RED 0
GLOBAL_LIST_EMPTY(airlock_overlays)
@@ -578,33 +578,33 @@ About the new airlock wires panel:
/obj/machinery/door/airlock/attack_ghost(mob/user)
if(panel_open)
wires.Interact(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/door/airlock/attack_ai(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/door/airlock/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/door/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "AiAirlock", name, 600, 400, master_ui, state)
ui.open()
-/obj/machinery/door/airlock/tgui_data(mob/user)
+/obj/machinery/door/airlock/ui_data(mob/user)
var/list/data = list()
var/list/power = list()
- power["main"] = main_power_lost_until ? TGUI_RED : TGUI_GREEN
+ power["main"] = main_power_lost_until ? UI_RED : UI_GREEN
power["main_timeleft"] = max(main_power_lost_until - world.time, 0) / 10
- power["backup"] = backup_power_lost_until ? TGUI_RED : TGUI_GREEN
+ power["backup"] = backup_power_lost_until ? UI_RED : UI_GREEN
power["backup_timeleft"] = max(backup_power_lost_until - world.time, 0) / 10
data["power"] = power
if(electrified_until == -1)
- data["shock"] = TGUI_RED
+ data["shock"] = UI_RED
else if(electrified_until > 0)
- data["shock"] = TGUI_ORANGE
+ data["shock"] = UI_ORANGE
else
- data["shock"] = TGUI_GREEN
+ data["shock"] = UI_GREEN
data["shock_timeleft"] = max(electrified_until - world.time, 0) / 10
data["id_scanner"] = !aiDisabledIdScanner
@@ -782,7 +782,7 @@ About the new airlock wires panel:
return FALSE
return TRUE
-/obj/machinery/door/airlock/tgui_act(action, params)
+/obj/machinery/door/airlock/ui_act(action, params)
if(..())
return
if(!issilicon(usr) && !usr.can_admin_interact())
@@ -1485,6 +1485,6 @@ About the new airlock wires panel:
#undef AIRLOCK_DAMAGE_DEFLECTION_N
#undef AIRLOCK_DAMAGE_DEFLECTION_R
-#undef TGUI_GREEN
-#undef TGUI_ORANGE
-#undef TGUI_RED
+#undef UI_GREEN
+#undef UI_ORANGE
+#undef UI_RED
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index b2f061e1d67..ce5b516c8c7 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -275,10 +275,10 @@
return
/obj/machinery/door_timer/attack_ai(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/door_timer/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
//Allows humans to use door_timer
//Opens dialog window when someone clicks on door timer
@@ -287,15 +287,15 @@
/obj/machinery/door_timer/attack_hand(mob/user)
if(..())
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/door_timer/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/door_timer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "BrigTimer", name, 500, 450, master_ui, state)
ui.open()
-/obj/machinery/door_timer/tgui_static_data(mob/user)
+/obj/machinery/door_timer/ui_static_data(mob/user)
var/list/data = list()
data["spns"] = list()
for(var/mob/living/carbon/human/H in range(4, get_turf(src)))
@@ -303,7 +303,7 @@
data["spns"] += H.name
return data
-/obj/machinery/door_timer/tgui_data(mob/user)
+/obj/machinery/door_timer/ui_data(mob/user)
var/list/data = list()
data["cell_id"] = name
data["occupant"] = occupant
@@ -324,7 +324,7 @@
return TRUE
return ..()
-/obj/machinery/door_timer/tgui_act(action, params)
+/obj/machinery/door_timer/ui_act(action, params)
if(..())
return
if(!allowed(usr))
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 2135d3e8b7b..e02bcce1315 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -61,10 +61,10 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
if(..())
return
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/doppler_array/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/doppler_array/AltClick(mob/user)
rotate(user)
@@ -173,13 +173,13 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
icon_state = "[initial(icon_state)]-off"
stat |= NOPOWER
-/obj/machinery/doppler_array/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_default_state)
+/obj/machinery/doppler_array/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)
if(!ui)
ui = new(user, src, ui_key, "TachyonArray", name, 500, 600, master_ui, state)
ui.open()
-/obj/machinery/doppler_array/tgui_data(mob/user)
+/obj/machinery/doppler_array/ui_data(mob/user)
var/list/data = list()
var/list/records = list()
for(var/i in 1 to length(logged_explosions))
@@ -196,7 +196,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
data["printing"] = active_timers
return data
-/obj/machinery/doppler_array/tgui_act(action, params)
+/obj/machinery/doppler_array/ui_act(action, params)
if(..())
return
switch(action)
diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm
index 925b5e883d1..3cf506d96ba 100644
--- a/code/game/machinery/embedded_controller/airlock_controllers.dm
+++ b/code/game/machinery/embedded_controller/airlock_controllers.dm
@@ -36,13 +36,13 @@
tag_chamber_sensor = given_tag_chamber_sensor
..()
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller/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_default_state)
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller/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)
if(!ui)
ui = new(user, src, ui_key, "ExternalAirlockController", name, 470, 290, master_ui, state)
ui.open()
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller/tgui_data(mob/user)
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user)
var/list/data = list()
data["chamber_pressure"] = round(program.memory["chamber_sensor_pressure"])
@@ -53,7 +53,7 @@
return data
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller/tgui_act(action, params)
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_act(action, params)
if(..())
return
@@ -83,13 +83,13 @@
else
icon_state = "access_control_off"
-/obj/machinery/embedded_controller/radio/airlock/access_controller/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_default_state)
+/obj/machinery/embedded_controller/radio/airlock/access_controller/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)
if(!ui)
ui = new(user, src, ui_key, "AirlockAccessController", name, 470, 290, master_ui, state)
ui.open()
-/obj/machinery/embedded_controller/radio/airlock/access_controller/tgui_data(mob/user)
+/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user)
var/list/data = list()
data["exterior_status"] = program.memory["exterior_status"]
@@ -98,7 +98,7 @@
return data
-/obj/machinery/embedded_controller/radio/airlock/access_controller/tgui_act(action, params)
+/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_act(action, params)
if(..())
return
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index 47ff67c0935..a58118b31f0 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -27,15 +27,15 @@
src.updateDialog()
/obj/machinery/embedded_controller/attack_ghost(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/embedded_controller/attack_ai(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/embedded_controller/attack_hand(mob/user as mob)
if(!user.IsAdvancedToolUser())
return FALSE
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/embedded_controller/radio
icon = 'icons/obj/airlock_machines.dmi'
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 7196798b559..4564fb36fab 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -315,7 +315,7 @@ Class Procs:
update_multitool_menu(usr)
return TRUE
-/obj/machinery/Topic(href, href_list, var/nowindow = 0, var/datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/Topic(href, href_list, var/nowindow = 0, var/datum/ui_state/state = GLOB.default_state)
if(..(href, href_list, nowindow, state))
return 1
@@ -329,13 +329,13 @@ Class Procs:
/obj/machinery/proc/inoperable(var/additional_flags = 0)
return (stat & (NOPOWER|BROKEN|additional_flags))
-/obj/machinery/tgui_status(mob/user, datum/tgui_state/state)
+/obj/machinery/ui_status(mob/user, datum/ui_state/state)
if(!interact_offline && (stat & (NOPOWER|BROKEN)))
return STATUS_CLOSE
return ..()
-/obj/machinery/tgui_status(mob/user, datum/tgui_state/state)
+/obj/machinery/ui_status(mob/user, datum/ui_state/state)
if(!interact_offline && (stat & (NOPOWER|BROKEN)))
return STATUS_CLOSE
diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm
index 777aa155a62..5673ba8d204 100644
--- a/code/game/machinery/poolcontroller.dm
+++ b/code/game/machinery/poolcontroller.dm
@@ -67,7 +67,7 @@
to_chat(user, "Nothing happens.")//If not emagged, don't do anything, and don't tell the user that it can be emagged.
/obj/machinery/poolcontroller/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/poolcontroller/process()
processMob() //Call the mob affecting proc
@@ -150,7 +150,7 @@
linkedmist.Cut()
-/obj/machinery/poolcontroller/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/poolcontroller/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "PoolController", "Pool Controller Interface", 520, 410)
@@ -200,7 +200,7 @@
set_temp(temp)
-/obj/machinery/poolcontroller/tgui_data(mob/user)
+/obj/machinery/poolcontroller/ui_data(mob/user)
var/list/data = list()
data["currentTemp"] = temp_to_str(temperature)
data["emagged"] = emagged
@@ -208,7 +208,7 @@
return data
-/obj/machinery/poolcontroller/tgui_act(action, list/params)
+/obj/machinery/poolcontroller/ui_act(action, list/params)
if(..())
return
diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm
index 4b22315f387..562db4074f3 100644
--- a/code/game/machinery/portable_tag_turret.dm
+++ b/code/game/machinery/portable_tag_turret.dm
@@ -28,7 +28,7 @@
/obj/machinery/porta_turret/tag/weapon_setup(var/obj/item/gun/energy/E)
return
-/obj/machinery/porta_turret/tag/tgui_data(mob/user)
+/obj/machinery/porta_turret/tag/ui_data(mob/user)
var/list/data = list(
"locked" = isLocked(user), // does the current user have access?
"on" = enabled, // is turret turned on?
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 346008fce3f..ea84cf39cd4 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -192,15 +192,15 @@ GLOBAL_LIST_EMPTY(turret_icons)
return FALSE
/obj/machinery/porta_turret/attack_ai(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/porta_turret/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/porta_turret/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/porta_turret/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/porta_turret/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
if(HasController())
to_chat(user, "[src] can only be controlled using the assigned turret controller.")
return
@@ -212,7 +212,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
ui = new(user, src, ui_key, "PortableTurret", name, 500, access_is_configurable() ? 800 : 400)
ui.open()
-/obj/machinery/porta_turret/tgui_data(mob/user)
+/obj/machinery/porta_turret/ui_data(mob/user)
var/list/data = list(
"locked" = isLocked(user), // does the current user have access?
"on" = enabled,
@@ -232,12 +232,12 @@ GLOBAL_LIST_EMPTY(turret_icons)
)
return data
-/obj/machinery/porta_turret/tgui_static_data(mob/user)
+/obj/machinery/porta_turret/ui_static_data(mob/user)
var/list/data = list()
data["regions"] = get_accesslist_static_data(region_min, region_max)
return data
-/obj/machinery/porta_turret/tgui_act(action, params)
+/obj/machinery/porta_turret/ui_act(action, params)
if (..())
return
if(isLocked(usr))
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 981fb9fa2e1..351366c1501 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -125,21 +125,21 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
if(stat & NOPOWER)
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/requests_console/attack_hand(user as mob)
if(..(user))
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/requests_console/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_default_state)
+/obj/machinery/requests_console/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)
if(!ui)
ui = new(user, src, ui_key, "RequestConsole", "[department] Request Console", 520, 410, master_ui, state)
ui.open()
-/obj/machinery/requests_console/tgui_data(mob/user)
+/obj/machinery/requests_console/ui_data(mob/user)
var/list/data = list()
data["department"] = department
@@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
return data
-/obj/machinery/requests_console/tgui_act(action, list/params)
+/obj/machinery/requests_console/ui_act(action, list/params)
if(..())
return
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index 1624ef4bb92..0adbfd5b693 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -12,15 +12,15 @@
var/resultlvl = null
/obj/machinery/slot_machine/attack_hand(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/slot_machine/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/slot_machine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "SlotMachine", name, 350, 200, master_ui, state)
ui.open()
-/obj/machinery/slot_machine/tgui_data(mob/user)
+/obj/machinery/slot_machine/ui_data(mob/user)
var/list/data = list()
// Get account
account = user.get_worn_id_account()
@@ -39,7 +39,7 @@
data["resultlvl"] = resultlvl
return data
-/obj/machinery/slot_machine/tgui_act(action, params)
+/obj/machinery/slot_machine/ui_act(action, params)
if(..())
return
add_fingerprint(usr)
diff --git a/code/game/machinery/tcomms/_base.dm b/code/game/machinery/tcomms/_base.dm
index f04a93b9de0..71e05b2b217 100644
--- a/code/game/machinery/tcomms/_base.dm
+++ b/code/game/machinery/tcomms/_base.dm
@@ -94,15 +94,15 @@ GLOBAL_LIST_EMPTY(tcomms_machines)
// Attack overrides. These are needed so the UIs can be opened up //
/obj/machinery/tcomms/attack_ai(mob/user)
add_hiddenprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/tcomms/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/tcomms/attack_hand(mob/user)
if(..(user))
return
- tgui_interact(user)
+ ui_interact(user)
// If we do not override the default process(), the machine defaults to not processing, meaning it uses no power.
diff --git a/code/game/machinery/tcomms/core.dm b/code/game/machinery/tcomms/core.dm
index 0801d34510f..f0b340459c7 100644
--- a/code/game/machinery/tcomms/core.dm
+++ b/code/game/machinery/tcomms/core.dm
@@ -168,7 +168,7 @@
// UI STUFF //
//////////////
-/obj/machinery/tcomms/core/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_default_state)
+/obj/machinery/tcomms/core/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)
// This needs to happen here because of how late the language datum initializes. I dont like it
if(length(nttc.valid_languages) == 1)
nttc.update_languages()
@@ -178,7 +178,7 @@
ui = new(user, src, ui_key, "TcommsCore", name, 900, 600, master_ui, state)
ui.open()
-/obj/machinery/tcomms/core/tgui_data(mob/user)
+/obj/machinery/tcomms/core/ui_data(mob/user)
var/list/data = list()
data["ion"] = ion
@@ -219,7 +219,7 @@
return data
-/obj/machinery/tcomms/core/tgui_act(action, list/params)
+/obj/machinery/tcomms/core/ui_act(action, list/params)
// Check against href exploits
if(..())
return
diff --git a/code/game/machinery/tcomms/relay.dm b/code/game/machinery/tcomms/relay.dm
index ebd2d5bda10..77f93e7e471 100644
--- a/code/game/machinery/tcomms/relay.dm
+++ b/code/game/machinery/tcomms/relay.dm
@@ -136,13 +136,13 @@
// UI STUFF //
//////////////
-/obj/machinery/tcomms/relay/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_default_state)
+/obj/machinery/tcomms/relay/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)
if(!ui)
ui = new(user, src, ui_key, "TcommsRelay", name, 600, 400, master_ui, state)
ui.open()
-/obj/machinery/tcomms/relay/tgui_data(mob/user)
+/obj/machinery/tcomms/relay/ui_data(mob/user)
var/list/data = list()
// Are we on or not
data["active"] = active
@@ -165,7 +165,7 @@
return data
-/obj/machinery/tcomms/relay/tgui_act(action, list/params)
+/obj/machinery/tcomms/relay/ui_act(action, list/params)
// Check against href exploits
if(..())
return
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 005e6720b8b..c665d511fa6 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -67,16 +67,16 @@
emagged = TRUE
to_chat(user, "The teleporter can now lock on to Syndicate beacons!")
else
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/computer/teleporter/attack_ai(mob/user)
attack_hand(user)
/obj/machinery/computer/teleporter/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/teleporter/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/teleporter/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
if(stat & (NOPOWER|BROKEN))
return
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -84,7 +84,7 @@
ui = new(user, src, ui_key, "Teleporter", "Teleporter Console", 380, 260)
ui.open()
-/obj/machinery/computer/teleporter/tgui_data(mob/user)
+/obj/machinery/computer/teleporter/ui_data(mob/user)
var/list/data = list()
data["powerstation"] = power_station
if(power_station?.teleporter_hub)
@@ -101,7 +101,7 @@
data["targetsTeleport"] = target_list
return data
-/obj/machinery/computer/teleporter/tgui_act(action, params)
+/obj/machinery/computer/teleporter/ui_act(action, params)
if(..())
return
@@ -153,7 +153,7 @@
addtimer(CALLBACK(src, .proc/calibrateCallback), 50 * (3 - power_station.teleporter_hub.accurate)) //Better parts mean faster calibration
/**
-* Resets the connected powerstation to initial values. Helper function of tgui_act
+* Resets the connected powerstation to initial values. Helper function of ui_act
*/
/obj/machinery/computer/teleporter/proc/resetPowerstation()
power_station.engaged = FALSE
@@ -161,7 +161,7 @@
power_station.teleporter_hub.update_icon()
/**
-* Calibrates the hub. Helper function of tgui_act
+* Calibrates the hub. Helper function of ui_act
*/
/obj/machinery/computer/teleporter/proc/calibrateCallback()
calibrating = FALSE
@@ -179,7 +179,7 @@
return TRUE
/**
-* Helper function of tgui_act
+* Helper function of ui_act
*
* Triggered when ejecting a gps device. Sets the gps to the ground and resets the console
*/
@@ -191,7 +191,7 @@
target_list = targets_teleport()
/**
-* Creates a list of viable targets for the teleport. Helper function of tgui_data
+* Creates a list of viable targets for the teleport. Helper function of ui_data
*/
/obj/machinery/computer/teleporter/proc/targets_teleport()
var/list/L = list()
@@ -240,7 +240,7 @@
return L
/**
-* Creates a list of viable targets for the gate. Helper function of tgui_data
+* Creates a list of viable targets for the gate. Helper function of ui_data
*/
/obj/machinery/computer/teleporter/proc/targets_gate(mob/users)
var/list/L = list()
@@ -267,7 +267,7 @@
return L
/**
-* Helper function of tgui_act.
+* Helper function of ui_act.
*
* Called after selecting a target for the gate in the UI. Sets area_bypass and cc_beacon.
*/
@@ -281,7 +281,7 @@
cc_beacon = B.cc_beacon
/**
-* Helper function of tgui_act.
+* Helper function of ui_act.
*
* Called after selecting a target for the teleporter in the UI.
*/
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 71cb58c6478..8d028ffe09e 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -133,21 +133,21 @@
return
/obj/machinery/turretid/attack_ai(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/turretid/attack_ghost(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/turretid/attack_hand(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/turretid/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/turretid/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "PortableTurret", name, 500, 400)
ui.open()
-/obj/machinery/turretid/tgui_data(mob/user)
+/obj/machinery/turretid/ui_data(mob/user)
var/list/data = list(
"locked" = isLocked(user), // does the current user have access?
"on" = enabled,
@@ -167,7 +167,7 @@
)
return data
-/obj/machinery/turretid/tgui_act(action, params)
+/obj/machinery/turretid/ui_act(action, params)
if (..())
return
if(isLocked(usr))
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 7503f43cfa4..affab85794e 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -485,10 +485,10 @@
if(src.shock(user, 100))
return
- tgui_interact(user)
+ ui_interact(user)
wires.Interact(user)
-/obj/machinery/vending/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/vending/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
var/estimated_height = 100 + min(length(product_records) * 34, 500)
@@ -497,7 +497,7 @@
ui = new(user, src, ui_key, "Vending", name, 470, estimated_height, master_ui, state)
ui.open()
-/obj/machinery/vending/tgui_data(mob/user)
+/obj/machinery/vending/ui_data(mob/user)
var/list/data = list()
var/mob/living/carbon/human/H
var/obj/item/card/id/C
@@ -533,7 +533,7 @@
return data
-/obj/machinery/vending/tgui_static_data(mob/user)
+/obj/machinery/vending/ui_static_data(mob/user)
var/list/data = list()
data["chargesMoney"] = length(prices) > 0 ? TRUE : FALSE
data["product_records"] = list()
@@ -581,7 +581,7 @@
data["imagelist"] = imagelist
return data
-/obj/machinery/vending/tgui_act(action, params)
+/obj/machinery/vending/ui_act(action, params)
. = ..()
if(.)
return
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 34e8648c59e..01d3fe3e4a1 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -158,15 +158,15 @@
/obj/machinery/computer/mech_bay_power_console/attack_hand(mob/user as mob)
if(..())
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/mech_bay_power_console/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/mech_bay_power_console/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "MechBayConsole", name, 400, 150, master_ui, state)
ui.open()
-/obj/machinery/computer/mech_bay_power_console/tgui_act(action, params)
+/obj/machinery/computer/mech_bay_power_console/ui_act(action, params)
if(..())
return
switch(action)
@@ -175,7 +175,7 @@
. = TRUE
update_icon()
-/obj/machinery/computer/mech_bay_power_console/tgui_data(mob/user)
+/obj/machinery/computer/mech_bay_power_console/ui_data(mob/user)
var/data = list()
if(!recharge_port)
reconnect()
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 72c8985a126..5b7ebd1c478 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -14,15 +14,15 @@
return attack_hand(user)
/obj/machinery/computer/mecha/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/mecha/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/mecha/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "MechaControlConsole", name, 420, 500, master_ui, state)
ui.open()
-/obj/machinery/computer/mecha/tgui_data(mob/user)
+/obj/machinery/computer/mecha/ui_data(mob/user)
var/list/data = list()
data["beacons"] = list()
var/list/trackerlist = list()
@@ -40,7 +40,7 @@
return data
-/obj/machinery/computer/mecha/tgui_act(action, params)
+/obj/machinery/computer/mecha/ui_act(action, params)
if(..())
return
switch(action)
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index fcba936a7b3..6e0854fefdc 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -37,18 +37,18 @@
overlays.Cut()
/obj/item/aicard/attack_self(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/aicard/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/aicard/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "AICard", "[name]", 600, 394, master_ui, state)
ui.open()
-/obj/item/aicard/tgui_data(mob/user)
- var/data[0]
+/obj/item/aicard/ui_data(mob/user)
+ var/list/data = list()
var/mob/living/silicon/ai/AI = locate() in src
if(istype(AI))
@@ -75,7 +75,7 @@
return data
-/obj/item/aicard/tgui_act(action, params)
+/obj/item/aicard/ui_act(action, params)
if(..())
return
@@ -90,7 +90,7 @@
to_chat(user, "You are already wiping this AI!")
return
var/confirm = alert("Are you sure you want to wipe this card's memory? This cannot be undone once started.", "Confirm Wipe", "Yes", "No")
- if(confirm == "Yes" && (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE)) // And make doubly sure they want to wipe (three total clicks)
+ if(confirm == "Yes" && (ui_status(user, GLOB.inventory_state) == STATUS_INTERACTIVE)) // And make doubly sure they want to wipe (three total clicks)
msg_admin_attack("[key_name_admin(user)] wiped [key_name_admin(AI)] with \the [src].", ATKLOG_FEW)
add_attack_logs(user, AI, "Wiped with [src].")
INVOKE_ASYNC(src, .proc/wipe_ai)
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index d9fb3846d48..ba53f45d0ce 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -28,10 +28,10 @@
return ..()
/obj/item/camera_bug/attack_self(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/camera_bug/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_inventory_state)
- integrated_console.tgui_interact(user, ui_key, ui, force_open, master_ui, state)
+/obj/item/camera_bug/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
+ integrated_console.ui_interact(user, ui_key, ui, force_open, master_ui, state)
/obj/item/camera_bug/ert
diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm
index 2c8042c7012..f4c1e4903e2 100644
--- a/code/game/objects/items/devices/floor_painter.dm
+++ b/code/game/objects/items/devices/floor_painter.dm
@@ -50,11 +50,10 @@
if(!user)
return 0
user.set_machine(src)
- tgui_interact(user)
+ ui_interact(user)
return 1
-/obj/item/floor_painter/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_inventory_state)
+/obj/item/floor_painter/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "FloorPainter", name, 405, 470, master_ui, state)
@@ -64,7 +63,7 @@
ui.set_autoupdate(FALSE)
ui.open()
-/obj/item/floor_painter/tgui_data(mob/user)
+/obj/item/floor_painter/ui_data(mob/user)
var/list/data = list()
data["availableStyles"] = allowed_states
data["selectedStyle"] = floor_state
@@ -78,7 +77,7 @@
return data
-/obj/item/floor_painter/tgui_static_data(mob/user)
+/obj/item/floor_painter/ui_static_data(mob/user)
var/list/data = list()
data["allStylesPreview"] = list()
@@ -88,7 +87,7 @@
return data
-/obj/item/floor_painter/tgui_act(action, params)
+/obj/item/floor_painter/ui_act(action, params)
if(..())
return
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index c9d95dd8a99..e61dd9126c4 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -77,13 +77,13 @@
return
-/obj/item/radio/electropack/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/radio/electropack/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Electropack", name, 360, 150, master_ui, state)
ui.open()
-/obj/item/radio/electropack/tgui_data(mob/user)
+/obj/item/radio/electropack/ui_data(mob/user)
var/list/data = list()
data["power"] = on
data["frequency"] = frequency
@@ -92,7 +92,7 @@
data["maxFrequency"] = PUBLIC_HIGH_FREQ
return data
-/obj/item/radio/electropack/tgui_act(action, params)
+/obj/item/radio/electropack/ui_act(action, params)
if(..())
return
. = TRUE
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 01a8096e599..1ee9114a322 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -118,16 +118,16 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
return interact(user)
/obj/item/radio/attack_self(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/item/radio/interact(mob/user)
if(!user)
return 0
if(b_stat)
wires.Interact(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/radio/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/item/radio/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
var/list/schannels = list_secure_channels(user)
@@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
ui = new(user, src, ui_key, "Radio", name, 400, calc_height, master_ui, state)
ui.open()
-/obj/item/radio/tgui_data(mob/user)
+/obj/item/radio/ui_data(mob/user)
var/list/data = list()
data["broadcasting"] = broadcasting
@@ -153,7 +153,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
data["loudspeaker"] = loudspeaker
return data
-/obj/item/radio/tgui_act(action, params, datum/tgui/ui)
+/obj/item/radio/ui_act(action, params, datum/tgui/ui)
if(..())
return
. = TRUE
@@ -622,7 +622,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
/obj/item/radio/borg/syndicate
keyslot = new /obj/item/encryptionkey/syndicate/nukeops
-/obj/item/radio/borg/syndicate/tgui_status(mob/user, datum/tgui_state/state)
+/obj/item/radio/borg/syndicate/ui_status(mob/user, datum/ui_state/state)
. = ..()
if(. == STATUS_UPDATE && istype(user, /mob/living/silicon/robot/syndicate))
. = STATUS_INTERACTIVE
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index 9133bf37b9c..0f2d6fc7822 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -6,7 +6,7 @@
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
origin_tech = "programming=3;materials=3;magnets=3"
- var/datum/tgui_module/crew_monitor/crew_monitor
+ var/datum/ui_module/crew_monitor/crew_monitor
/obj/item/sensor_device/New()
..()
@@ -17,7 +17,7 @@
return ..()
/obj/item/sensor_device/attack_self(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/sensor_device/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_default_state)
- crew_monitor.tgui_interact(user, ui_key, ui, force_open)
+/obj/item/sensor_device/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)
+ crew_monitor.ui_interact(user, ui_key, ui, force_open)
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 9035207018a..869fc1620cc 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -88,15 +88,15 @@
O.hear_message(M, msg)
/obj/item/transfer_valve/attack_self(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/transfer_valve/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/transfer_valve/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "TransferValve", name, 460, 320, master_ui, state)
ui.open()
-/obj/item/transfer_valve/tgui_data(mob/user)
+/obj/item/transfer_valve/ui_data(mob/user)
var/list/data = list()
data["tank_one"] = tank_one ? tank_one.name : null
data["tank_two"] = tank_two ? tank_two.name : null
@@ -106,7 +106,7 @@
-/obj/item/transfer_valve/tgui_act(action, params)
+/obj/item/transfer_valve/ui_act(action, params)
if(..())
return
. = TRUE
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 06f728ad748..2cdb80cc697 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -24,7 +24,7 @@ GLOBAL_LIST_EMPTY(world_uplinks)
var/temp_category
var/uplink_type = "traitor"
-/obj/item/uplink/tgui_host()
+/obj/item/uplink/ui_host()
return loc
/obj/item/uplink/New()
@@ -150,20 +150,20 @@ GLOBAL_LIST_EMPTY(world_uplinks)
return TRUE
return FALSE
-/obj/item/uplink/hidden/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_inventory_state)
+/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Uplink", name, 900, 600, master_ui, state)
ui.open()
-/obj/item/uplink/hidden/tgui_data(mob/user)
+/obj/item/uplink/hidden/ui_data(mob/user)
var/list/data = list()
data["crystals"] = uses
return data
-/obj/item/uplink/hidden/tgui_static_data(mob/user)
+/obj/item/uplink/hidden/ui_static_data(mob/user)
var/list/data = list()
// Actual items
@@ -190,10 +190,10 @@ GLOBAL_LIST_EMPTY(world_uplinks)
// Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button.
/obj/item/uplink/hidden/interact(mob/user)
- tgui_interact(user)
+ ui_interact(user)
// The purchasing code.
-/obj/item/uplink/hidden/tgui_act(action, list/params)
+/obj/item/uplink/hidden/ui_act(action, list/params)
if(..())
return
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index cf299cb6580..c65410b5129 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -199,15 +199,15 @@
if(MODE_AIRLOCK, MODE_DECON, MODE_WINDOW, MODE_TURF)
mode = choice
if("UI")
- tgui_interact(user)
+ ui_interact(user)
return
if("Change Access")
ui_tab = TAB_AIRLOCK_ACCESS
- tgui_interact(user)
+ ui_interact(user)
return
if("Change Airlock Type")
ui_tab = TAB_AIRLOCK_TYPE
- tgui_interact(user)
+ ui_interact(user)
return
else
return
@@ -222,13 +222,13 @@
/obj/item/rcd/attack_self_tk(mob/user)
radial_menu(user)
-/obj/item/rcd/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_inventory_state)
+/obj/item/rcd/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "RCD", "Rapid Construction Device", 471, 673, master_ui, state)
ui.open()
-/obj/item/rcd/tgui_data(mob/user)
+/obj/item/rcd/ui_data(mob/user)
var/list/data = list(
"tab" = ui_tab,
"mode" = mode,
@@ -238,11 +238,11 @@
"door_name" = door_name,
"one_access" = one_access,
"selected_accesses" = selected_accesses,
- "modal" = tgui_modal_data(src)
+ "modal" = ui_modal_data(src)
)
return data
-/obj/item/rcd/tgui_static_data(mob/user)
+/obj/item/rcd/ui_static_data(mob/user)
var/list/data = list(
"max_matter" = max_matter,
"regions" = get_accesslist_static_data(REGION_GENERAL, REGION_COMMAND),
@@ -251,14 +251,14 @@
)
return data
-/obj/item/rcd/tgui_act(action, list/params)
+/obj/item/rcd/ui_act(action, list/params)
if(..())
return
if(prob(20))
spark_system.start()
- if(tgui_act_modal(action, params))
+ if(ui_act_modal(action, params))
return TRUE
. = TRUE
@@ -319,22 +319,22 @@
selected_accesses = get_all_accesses()
/**
- * Called in tgui_act() to process modal actions
+ * Called in ui_act() to process modal actions
*
* Arguments:
* * action - The action passed by tgui
* * params - The params passed by tgui
*/
-/obj/item/rcd/proc/tgui_act_modal(action, list/params)
+/obj/item/rcd/proc/ui_act_modal(action, list/params)
. = TRUE
- switch(tgui_modal_act(src, action, params))
- if(TGUI_MODAL_OPEN)
- tgui_modal_input(src, "renameAirlock", "Enter a new name:", value = door_name, max_length = TGUI_MODAL_INPUT_MAX_LENGTH_NAME)
- if(TGUI_MODAL_ANSWER)
+ switch(ui_modal_act(src, action, params))
+ if(UI_MODAL_OPEN)
+ ui_modal_input(src, "renameAirlock", "Enter a new name:", value = door_name, max_length = UI_MODAL_INPUT_MAX_LENGTH_NAME)
+ if(UI_MODAL_ANSWER)
var/answer = params["answer"]
if(!answer)
return
- door_name = sanitize(copytext(answer, 1, TGUI_MODAL_INPUT_MAX_LENGTH_NAME))
+ door_name = sanitize(copytext(answer, 1, UI_MODAL_INPUT_MAX_LENGTH_NAME))
else
return FALSE
diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm
index cf52238b2d9..1d91ef24848 100644
--- a/code/game/objects/items/weapons/rpd.dm
+++ b/code/game/objects/items/weapons/rpd.dm
@@ -168,9 +168,9 @@
// TGUI stuff
/obj/item/rpd/attack_self(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/rpd/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_inventory_state)
+/obj/item/rpd/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
user.set_machine(src)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
@@ -181,7 +181,7 @@
/obj/item/rpd/AltClick(mob/user)
radial_menu(user)
-/obj/item/rpd/tgui_data(mob/user)
+/obj/item/rpd/ui_data(mob/user)
var/list/data = list()
data["iconrotation"] = iconrotation
data["mainmenu"] = mainmenu
@@ -193,7 +193,7 @@
data["whatpipe"] = whatpipe
return data
-/obj/item/rpd/tgui_act(action, list/params)
+/obj/item/rpd/ui_act(action, list/params)
if(..())
return
@@ -235,7 +235,7 @@
if(!check_menu(user))
return
if(selected_mode == "UI")
- tgui_interact(user)
+ ui_interact(user)
else
switch(selected_mode)
if(RPD_MENU_ROTATE)
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 5d40efc81dd..73a75919af8 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -137,15 +137,15 @@
if(!(air_contents))
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/tank/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/tank/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Tank", name, 300, 150, master_ui, state)
ui.open()
-/obj/item/tank/tgui_data(mob/user)
+/obj/item/tank/ui_data(mob/user)
var/list/data = list()
data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0)
@@ -161,7 +161,7 @@
data["connected"] = (C.internal && C.internal == src) ? TRUE : FALSE
return data
-/obj/item/tank/tgui_act(action, params)
+/obj/item/tank/ui_act(action, params)
if(..())
return
. = TRUE
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index b658623de26..e07c651924d 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -50,14 +50,14 @@
else if(!istype(armor, /datum/armor))
stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()")
-/obj/Topic(href, href_list, nowindow = FALSE, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/Topic(href, href_list, nowindow = FALSE, datum/ui_state/state = GLOB.default_state)
// Calling Topic without a corresponding window open causes runtime errors
if(!nowindow && ..())
return TRUE
// In the far future no checks are made in an overriding Topic() beyond if(..()) return
// Instead any such checks are made in CanUseTopic()
- if(tgui_status(usr, state, href_list) == STATUS_INTERACTIVE)
+ if(ui_status(usr, state, href_list) == STATUS_INTERACTIVE)
CouldUseTopic(usr)
return FALSE
@@ -65,7 +65,7 @@
return TRUE
/obj/proc/CouldUseTopic(mob/user)
- var/atom/host = tgui_host()
+ var/atom/host = ui_host()
host.add_fingerprint(user)
/obj/proc/CouldNotUseTopic(mob/user)
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 4a5c7f1c992..22c5aab1715 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -28,13 +28,13 @@
return
if(ishuman(user))
- var/datum/tgui_module/appearance_changer/AC = ui_users[user]
+ var/datum/ui_module/appearance_changer/AC = ui_users[user]
if(!AC)
AC = new(src, user)
AC.name = "SalonPro Nano-Mirror"
AC.flags = APPEARANCE_ALL_BODY
ui_users[user] = AC
- AC.tgui_interact(user)
+ AC.ui_interact(user)
/obj/structure/mirror/obj_break(damage_flag, mapload)
if(!broken && !(flags & NODECONSTRUCT))
@@ -121,14 +121,14 @@
else
race_list += GLOB.whitelisted_species
- var/datum/tgui_module/appearance_changer/AC = ui_users[user]
+ var/datum/ui_module/appearance_changer/AC = ui_users[user]
if(!AC)
AC = new(src, user)
AC.name = "Magic Mirror"
AC.flags = APPEARANCE_ALL
AC.whitelist = race_list
ui_users[user] = AC
- AC.tgui_interact(user)
+ AC.ui_interact(user)
if("Voice")
var/voice_choice = input(user, "Perhaps...", "Voice effects") as null|anything in list("Comic Sans", "Wingdings", "Swedish", "Chav", "Mute")
@@ -155,7 +155,7 @@
if(voice_choice)
curse(user)
-/obj/structure/mirror/magic/tgui_close(mob/user)
+/obj/structure/mirror/magic/ui_close(mob/user)
curse(user)
/obj/structure/mirror/magic/attackby(obj/item/I, mob/living/user, params)
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 4d5f0996cd1..5799a267f87 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(safes)
/obj/structure/safe/attack_ghost(mob/user)
if(..() || drill)
return TRUE
- tgui_interact(user)
+ ui_interact(user)
/obj/structure/safe/attack_hand(mob/user)
if(..())
@@ -171,7 +171,7 @@ GLOBAL_LIST_EMPTY(safes)
if("Cancel")
return
else
- tgui_interact(user)
+ ui_interact(user)
/obj/structure/safe/attackby(obj/item/I, mob/user, params)
if(open)
@@ -209,7 +209,7 @@ GLOBAL_LIST_EMPTY(safes)
to_chat(user, "You can't put [I] into the safe while it is closed!")
return
-/obj/structure/safe/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
+/obj/structure/safe/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
var/datum/asset/safe_assets = get_asset_datum(/datum/asset/simple/safe)
safe_assets.send(user)
@@ -219,7 +219,7 @@ GLOBAL_LIST_EMPTY(safes)
ui.open()
ui.set_autoupdate(FALSE)
-/obj/structure/safe/tgui_data(mob/user)
+/obj/structure/safe/ui_data(mob/user)
var/list/data = list()
data["dial"] = dial
data["open"] = open
@@ -234,7 +234,7 @@ GLOBAL_LIST_EMPTY(safes)
return data
-/obj/structure/safe/tgui_act(action, params)
+/obj/structure/safe/ui_act(action, params)
if(..())
return
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index b6796755b79..87af8fe4e95 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -57,24 +57,24 @@
if(..())
return 1
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/structure/dispenser/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/structure/dispenser/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_default_state)
+/obj/structure/dispenser/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)
if(!ui)
ui = new(user, src, ui_key, "TankDispenser", name, 275, 100, master_ui, state)
ui.open()
-/obj/structure/dispenser/tgui_data(user)
+/obj/structure/dispenser/ui_data(user)
var/list/data = list()
data["o_tanks"] = LAZYLEN(stored_oxygen_tanks)
data["p_tanks"] = LAZYLEN(stored_plasma_tanks)
return data
-/obj/structure/dispenser/tgui_act(action, list/params)
+/obj/structure/dispenser/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 5f05df4b6f5..7309abf6c6b 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -772,8 +772,8 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
var/mob/living/silicon/S = input("Select silicon.", "Manage Silicon Laws") as null|anything in GLOB.silicon_mob_list
if(!S) return
- var/datum/tgui_module/law_manager/L = new(S)
- L.tgui_interact(usr, state = GLOB.tgui_admin_state)
+ var/datum/ui_module/law_manager/L = new(S)
+ L.ui_interact(usr, state = GLOB.admin_state)
log_and_message_admins("has opened [S]'s law manager.")
feedback_add_details("admin_verb","MSL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm
index a6a858b20b6..83d02f3321e 100644
--- a/code/modules/crafting/craft.dm
+++ b/code/modules/crafting/craft.dm
@@ -297,7 +297,7 @@
Deletion.Cut(Deletion.len)
qdel(DL)
-/datum/personal_crafting/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_not_incapacitated_turf_state)
+/datum/personal_crafting/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.not_incapacitated_turf_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "PersonalCrafting", "Crafting Menu", 700, 800, master_ui, state)
@@ -308,7 +308,7 @@
if(ui)
ui.close()
-/datum/personal_crafting/tgui_data(mob/user)
+/datum/personal_crafting/ui_data(mob/user)
var/list/data = list()
var/list/subs = list()
var/cur_subcategory = CAT_NONE
@@ -349,7 +349,7 @@
data["cant_craft"] = cant_craft
return data
-/datum/personal_crafting/tgui_act(action, list/params)
+/datum/personal_crafting/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index c188b7f94db..62a8b85194d 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -116,18 +116,18 @@ log transactions
return
if(!linked_db)
reconnect_database()
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/atm/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/atm/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_default_state)
+/obj/machinery/atm/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)
if (!ui)
ui = new(user, src, ui_key, "ATM", name, 550, 650)
ui.open()
-/obj/machinery/atm/tgui_data(mob/user)
+/obj/machinery/atm/ui_data(mob/user)
var/list/data = list()
data["view_screen"] = view_screen
data["machine_id"] = machine_id
@@ -154,7 +154,7 @@ log transactions
return data
-/obj/machinery/atm/tgui_act(action, params)
+/obj/machinery/atm/ui_act(action, params)
switch(action)
if("transfer")
if(!authenticated_account || !linked_db)
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
index 67a6f117465..0d0b1d317e6 100644
--- a/code/modules/economy/Accounts.dm
+++ b/code/modules/economy/Accounts.dm
@@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(all_money_accounts)
R.name = "Account information: [M.owner_name]"
var/overseer = "Unknown"
- var/datum/tgui_login/L = source_db.tgui_login_get()
+ var/datum/ui_login/L = source_db.ui_login_get()
if(L.id)
overseer = L.id.registered_name
R.info = {"Account details (confidential)
diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm
index 5b196e16a44..874c64c5ead 100644
--- a/code/modules/economy/Accounts_DB.dm
+++ b/code/modules/economy/Accounts_DB.dm
@@ -42,7 +42,7 @@ GLOBAL_VAR(current_date_string)
..()
/obj/machinery/computer/account_database/proc/accounting_letterhead(report_name)
- var/datum/tgui_login/L = tgui_login_get()
+ var/datum/ui_login/L = ui_login_get()
return {"
[report_name]
[station_name()] Accounting Report
@@ -51,24 +51,24 @@ GLOBAL_VAR(current_date_string)
"}
/obj/machinery/computer/account_database/attackby(obj/O, mob/user, params)
- if(tgui_login_attackby(O, user))
+ if(ui_login_attackby(O, user))
return
return ..()
/obj/machinery/computer/account_database/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/account_database/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_default_state)
+/obj/machinery/computer/account_database/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)
if(!ui)
ui = new(user, src, ui_key, "AccountsUplinkTerminal", name, 800, 600, master_ui, state)
ui.open()
-/obj/machinery/computer/account_database/tgui_data(mob/user)
+/obj/machinery/computer/account_database/ui_data(mob/user)
var/list/data = list()
data["currentPage"] = current_page
data["is_printing"] = (next_print > world.time)
- tgui_login_data(data, user)
+ ui_login_data(data, user)
if(data["loginState"]["logged_in"])
switch(current_page)
if(AUT_ACCLST)
@@ -103,16 +103,16 @@ GLOBAL_VAR(current_date_string)
return data
-/obj/machinery/computer/account_database/tgui_act(action, list/params)
+/obj/machinery/computer/account_database/ui_act(action, list/params)
if(..())
return
. = TRUE
- if(tgui_login_act(action, params))
+ if(ui_login_act(action, params))
return
- if(!tgui_login_get().logged_in)
+ if(!ui_login_get().logged_in)
return
switch(action)
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index bfa3954af63..55a6541dfaf 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -54,7 +54,7 @@
break
/obj/item/eftpos/attack_self(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/item/eftpos/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/card))
@@ -72,13 +72,13 @@
else
return ..()
-/obj/item/eftpos/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_inventory_state)
+/obj/item/eftpos/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "EFTPOS", name, 800, 300, master_ui, state)
ui.open()
-/obj/item/eftpos/tgui_data(mob/user)
+/obj/item/eftpos/ui_data(mob/user)
var/list/data = list()
data["machine_name"] = machine_name
data["transaction_locked"] = transaction_locked
@@ -88,7 +88,7 @@
data["linked_account"] = linked_account ? linked_account.owner_name : null
return data
-/obj/item/eftpos/tgui_act(action, list/params)
+/obj/item/eftpos/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 2245a2053be..7e4fc8915ab 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -172,7 +172,7 @@
if(stat & (BROKEN|NOPOWER))
return
wires.Interact(user)
- tgui_interact(user)
+ ui_interact(user)
return ..()
//Drag pill bottle to fridge to empty it into the fridge
@@ -199,7 +199,7 @@
if(failed)
to_chat(user, "[failed] item\s [failed == 1 ? "is" : "are"] refused.")
-/obj/machinery/smartfridge/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
user.set_machine(src)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -207,7 +207,7 @@
ui = new(user, src, ui_key, "Smartfridge", name, 500, 500)
ui.open()
-/obj/machinery/smartfridge/tgui_data(mob/user)
+/obj/machinery/smartfridge/ui_data(mob/user)
var/list/data = list()
data["contents"] = null
@@ -227,7 +227,7 @@
return data
-/obj/machinery/smartfridge/tgui_act(action, params)
+/obj/machinery/smartfridge/ui_act(action, params)
if(..())
return
@@ -647,7 +647,7 @@
..()
atmos_spawn_air(LINDA_SPAWN_HEAT)
-/obj/machinery/smartfridge/drying_rack/tgui_act(action, params)
+/obj/machinery/smartfridge/drying_rack/ui_act(action, params)
. = ..()
switch(action)
diff --git a/code/modules/instruments/objs/items/_instrument.dm b/code/modules/instruments/objs/items/_instrument.dm
index 936a9b4c85d..e1897572863 100644
--- a/code/modules/instruments/objs/items/_instrument.dm
+++ b/code/modules/instruments/objs/items/_instrument.dm
@@ -28,20 +28,20 @@
return BRUTELOSS
/obj/item/instrument/attack_self(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/instrument/tgui_data(mob/user)
- return song.tgui_data(user)
+/obj/item/instrument/ui_data(mob/user)
+ return song.ui_data(user)
-/obj/item/instrument/tgui_interact(mob/user)
+/obj/item/instrument/ui_interact(mob/user)
if(!isliving(user) || user.incapacitated())
return
- song.tgui_interact(user)
+ song.ui_interact(user)
-/obj/item/instrument/tgui_act(action, params)
+/obj/item/instrument/ui_act(action, params)
if(..())
return
- return song.tgui_act(action, params)
+ return song.ui_act(action, params)
/**
* Whether the instrument should stop playing
diff --git a/code/modules/instruments/objs/items/headphones.dm b/code/modules/instruments/objs/items/headphones.dm
index ef1a76bdc3b..d55807bcd5a 100644
--- a/code/modules/instruments/objs/items/headphones.dm
+++ b/code/modules/instruments/objs/items/headphones.dm
@@ -20,20 +20,20 @@
return ..()
/obj/item/clothing/ears/headphones/attack_self(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/item/clothing/ears/headphones/tgui_data(mob/user)
- return song.tgui_data(user)
+/obj/item/clothing/ears/headphones/ui_data(mob/user)
+ return song.ui_data(user)
-/obj/item/clothing/ears/headphones/tgui_interact(mob/user)
+/obj/item/clothing/ears/headphones/ui_interact(mob/user)
if(should_stop_playing(user) || user.incapacitated())
return
- song.tgui_interact(user)
+ song.ui_interact(user)
-/obj/item/clothing/ears/headphones/tgui_act(action, params)
+/obj/item/clothing/ears/headphones/ui_act(action, params)
if(..())
return
- return song.tgui_act(action, params)
+ return song.ui_act(action, params)
/obj/item/clothing/ears/headphones/update_icon()
var/mob/living/carbon/human/user = loc
diff --git a/code/modules/instruments/objs/structures/_musician.dm b/code/modules/instruments/objs/structures/_musician.dm
index df7530a3313..645cf3c9250 100644
--- a/code/modules/instruments/objs/structures/_musician.dm
+++ b/code/modules/instruments/objs/structures/_musician.dm
@@ -16,18 +16,18 @@
/obj/structure/musician/attack_hand(mob/user)
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/structure/musician/tgui_data(mob/user)
- return song.tgui_data(user)
+/obj/structure/musician/ui_data(mob/user)
+ return song.ui_data(user)
-/obj/structure/musician/tgui_interact(mob/user)
- song.tgui_interact(user)
+/obj/structure/musician/ui_interact(mob/user)
+ song.ui_interact(user)
-/obj/structure/musician/tgui_act(action, params)
+/obj/structure/musician/ui_act(action, params)
if(..())
return
- return song.tgui_act(action, params)
+ return song.ui_act(action, params)
/obj/structure/musician/wrench_act(mob/living/user, obj/item/I)
default_unfasten_wrench(user, I, 40)
@@ -44,4 +44,4 @@
return TRUE
if(!user)
return FALSE
- return !tgui_status(user, GLOB.tgui_physical_state)
+ return !ui_status(user, GLOB.physical_state)
diff --git a/code/modules/instruments/songs/_song_ui.dm b/code/modules/instruments/songs/_song_ui.dm
index cbd0f646f5c..c061b2426df 100644
--- a/code/modules/instruments/songs/_song_ui.dm
+++ b/code/modules/instruments/songs/_song_ui.dm
@@ -1,5 +1,5 @@
-/datum/song/tgui_data(mob/user)
- var/data[0]
+/datum/song/ui_data(mob/user)
+ var/list/data = list()
// General
data["playing"] = playing
@@ -44,14 +44,14 @@
return data
-/datum/song/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_default_state)
+/datum/song/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, parent, ui_key, ui, force_open)
if(!ui)
ui = new(user, parent, ui_key, "Instrument", parent?.name || "Instrument", 700, 500)
ui.open()
ui.set_autoupdate(FALSE) // NO!!! Don't auto-update this!!
-/datum/song/tgui_act(action, params)
+/datum/song/ui_act(action, params)
. = TRUE
switch(action)
if("newsong")
diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm
index be2a1d4ad35..5ff1c23685a 100644
--- a/code/modules/mining/equipment/marker_beacons.dm
+++ b/code/modules/mining/equipment/marker_beacons.dm
@@ -58,10 +58,10 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
transfer_fingerprints_to(M)
/obj/item/stack/marker_beacon/AltClick(mob/living/user)
- if(!istype(user) || tgui_status(user, GLOB.tgui_physical_state) != STATUS_INTERACTIVE)
+ if(!istype(user) || ui_status(user, GLOB.physical_state) != STATUS_INTERACTIVE)
return
var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors
- if(!istype(user) || tgui_status(user, GLOB.tgui_physical_state) != STATUS_INTERACTIVE)
+ if(!istype(user) || ui_status(user, GLOB.physical_state) != STATUS_INTERACTIVE)
return
if(input_color)
picked_color = input_color
@@ -130,10 +130,10 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
/obj/structure/marker_beacon/AltClick(mob/living/user)
..()
- if(!istype(user) || tgui_status(user, GLOB.tgui_physical_state) != STATUS_INTERACTIVE)
+ if(!istype(user) || ui_status(user, GLOB.physical_state) != STATUS_INTERACTIVE)
return
var/input_color = input(user, "Choose a color.", "Beacon Color") as null|anything in GLOB.marker_beacon_colors
- if(!istype(user) || tgui_status(user, GLOB.tgui_physical_state) != STATUS_INTERACTIVE)
+ if(!istype(user) || ui_status(user, GLOB.physical_state) != STATUS_INTERACTIVE)
return
if(input_color)
picked_color = input_color
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index 62858b428e0..f0b0871987f 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -50,18 +50,18 @@
return ..()
/obj/machinery/mineral/labor_claim_console/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/mineral/labor_claim_console/attack_ghost(mob/user)
attack_hand(user)
-/obj/machinery/mineral/labor_claim_console/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_default_state)
+/obj/machinery/mineral/labor_claim_console/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)
if(!ui)
ui = new(user, src, ui_key, "LaborClaimConsole", name, 315, 470, master_ui, state)
ui.open()
-/obj/machinery/mineral/labor_claim_console/tgui_data(mob/user)
+/obj/machinery/mineral/labor_claim_console/ui_data(mob/user)
var/list/data = list()
var/can_go_home = FALSE
@@ -82,7 +82,7 @@
return data
-/obj/machinery/mineral/labor_claim_console/tgui_act(action, params)
+/obj/machinery/mineral/labor_claim_console/ui_act(action, params)
if(..())
return
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 47c59a676c9..8b3d7d93ca3 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -109,13 +109,13 @@
/obj/machinery/mineral/equipment_vendor/attack_hand(mob/user)
if(..())
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/mineral/equipment_vendor/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/mineral/equipment_vendor/tgui_data(mob/user)
- var/list/data[0]
+/obj/machinery/mineral/equipment_vendor/ui_data(mob/user)
+ var/list/data = list()
// ID
if(inserted_id)
@@ -129,8 +129,8 @@
return data
-/obj/machinery/mineral/equipment_vendor/tgui_static_data(mob/user)
- var/list/static_data[0]
+/obj/machinery/mineral/equipment_vendor/ui_static_data(mob/user)
+ var/list/static_data = list()
// Available items - in static data because we don't wanna compute this list every time! It hardly changes.
static_data["items"] = list()
@@ -149,13 +149,13 @@
dirty_items = TRUE
return ..()
-/obj/machinery/mineral/equipment_vendor/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_default_state)
+/obj/machinery/mineral/equipment_vendor/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)
// Update static data if need be
if(dirty_items)
if(!ui)
ui = SStgui.get_open_ui(user, src, ui_key)
if(ui) // OK so ui?. somehow breaks the implied src so this is needed
- ui.initial_static_data = tgui_static_data(user)
+ ui.initial_static_data = ui_static_data(user)
dirty_items = FALSE
// Open the window
@@ -165,7 +165,7 @@
ui.open()
ui.set_autoupdate(FALSE)
-/obj/machinery/mineral/equipment_vendor/tgui_act(action, params)
+/obj/machinery/mineral/equipment_vendor/ui_act(action, params)
if(..())
return
@@ -217,7 +217,7 @@
return
C.forceMove(src)
inserted_id = C
- tgui_interact(user)
+ ui_interact(user)
return
return ..()
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index a795f71cb82..7300f02672c 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -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)
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 5f455c61484..b0b16cdd6e8 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -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()
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 051d0274468..4903ddf21ce 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -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()
diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index bd1e0339068..f0bfdb31b7b 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -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"]
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 7972edcb69d..93f0d3c6e82 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -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...
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index aaa62690fb5..0a71c54524c 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -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)
. = ..()
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index ecc177a641c..4016a05ae63 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -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)
diff --git a/code/modules/mob/living/silicon/pai/software/_base.dm b/code/modules/mob/living/silicon/pai/software/_base.dm
index c761e900f46..67e47a5eca3 100644
--- a/code/modules/mob/living/silicon/pai/software/_base.dm
+++ b/code/modules/mob/living/silicon/pai/software/_base.dm
@@ -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
diff --git a/code/modules/mob/living/silicon/pai/software/pai_apps.dm b/code/modules/mob/living/silicon/pai/software/pai_apps.dm
index e5c7b7ac725..2dc05917e32 100644
--- a/code/modules/mob/living/silicon/pai/software/pai_apps.dm
+++ b/code/modules/mob/living/silicon/pai/software/pai_apps.dm
@@ -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
diff --git a/code/modules/mob/living/silicon/subsystems.dm b/code/modules/mob/living/silicon/subsystems.dm
index 7c80c907757..8b99d0c8141 100644
--- a/code/modules/mob/living/silicon/subsystems.dm
+++ b/code/modules/mob/living/silicon/subsystems.dm
@@ -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)
diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm
index 198250689f3..d9ac93875f2 100644
--- a/code/modules/newscaster/obj/newscaster.dm
+++ b/code/modules/newscaster/obj/newscaster.dm
@@ -166,14 +166,14 @@
update_icon()
/obj/machinery/newscaster/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/newscaster/attack_hand(mob/user)
if(..())
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/newscaster/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/newscaster/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
if(can_scan(user))
scanned_user = get_scanned_user(user)["name"]
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -182,7 +182,7 @@
ui.open()
ui.set_autoupdate(FALSE)
-/obj/machinery/newscaster/tgui_data(mob/user)
+/obj/machinery/newscaster/ui_data(mob/user)
var/list/data = list()
data["unit_number"] = unit_number
data["is_security"] = is_security
@@ -190,7 +190,7 @@
data["is_silent"] = is_silent
data["is_printing"] = is_printing
data["screen"] = screen
- data["modal"] = tgui_modal_data(src)
+ data["modal"] = ui_modal_data(src)
if(data["modal"] && !isnull(data["modal"]["args"]["is_admin"]))
data["modal"]["args"]["is_admin"] = user.can_admin_interact()
data["temp"] = temp_notice
@@ -208,7 +208,7 @@
if(screen == NEWSCASTER_CHANNEL)
if(!viewing_channel) // Uh oh, channel doesn't exist! Redirect to Headlines
screen = NEWSCASTER_HEADLINES
- return tgui_data(user)
+ return ui_data(user)
message_list = viewing_channel.messages
data["channel_idx"] = GLOB.news_network.channels.Find(viewing_channel)
data["channel_can_manage"] = viewing_channel.can_modify(usr, user_name)
@@ -326,12 +326,12 @@
has_photo = !isnull(FM.img),
))
-/obj/machinery/newscaster/tgui_act(action, list/params)
+/obj/machinery/newscaster/ui_act(action, list/params)
if(..())
return
. = TRUE
- if(tgui_act_modal(action, params))
+ if(ui_act_modal(action, params))
return
switch(action)
@@ -352,7 +352,7 @@
screen = NEWSCASTER_CHANNEL
viewing_channel = FC
if("attach_photo")
- var/list/open_modal = tgui_modal_data(src)
+ var/list/open_modal = ui_modal_data(src)
if(photo || !open_modal || !(open_modal["id"] in list("create_story", "wanted_notice")))
return
if(ishuman(usr))
@@ -432,18 +432,18 @@
add_fingerprint(usr)
/**
- * Called in tgui_act() to process modal actions
+ * Called in ui_act() to process modal actions
*
* Arguments:
* * action - The action passed by tgui
* * params - The params passed by tgui
*/
-/obj/machinery/newscaster/proc/tgui_act_modal(action, list/params)
+/obj/machinery/newscaster/proc/ui_act_modal(action, list/params)
. = TRUE
var/id = params["id"]
var/list/arguments = istext(params["arguments"]) ? json_decode(params["arguments"]) : params["arguments"]
- switch(tgui_modal_act(src, action, params))
- if(TGUI_MODAL_OPEN)
+ switch(ui_modal_act(src, action, params))
+ if(UI_MODAL_OPEN)
switch(id)
if("create_channel", "manage_channel")
// If trying to manage the channel, make sure the user is allowed to!
@@ -451,7 +451,7 @@
var/datum/feed_channel/FC = locateUID(arguments["uid"])
if(!istype(FC) || !FC.can_modify(usr, get_scanned_user(usr)["name"]))
return
- tgui_modal_message(src, id, "", arguments = list(
+ ui_modal_message(src, id, "", arguments = list(
uid = arguments["uid"], // Only when managing a channel
scanned_user = scanned_user,
is_admin = usr.can_admin_interact(),
@@ -459,13 +459,13 @@
if("create_story", "wanted_notice") // Other modals
if(id == "wanted_notice" && !(is_security || usr.can_admin_interact()))
return
- tgui_modal_message(src, id, "", arguments = list(
+ ui_modal_message(src, id, "", arguments = list(
scanned_user = scanned_user,
is_admin = usr.can_admin_interact(),
))
else
return FALSE
- if(TGUI_MODAL_ANSWER)
+ if(UI_MODAL_ANSWER)
switch(id)
if("create_channel", "manage_channel")
var/author = trim(arguments["author"])
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 32416a8d5e7..bcf6bcc07db 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -66,10 +66,10 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
GLOB.hidden_departments |= department
/obj/machinery/photocopier/faxmachine/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/photocopier/faxmachine/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/photocopier/faxmachine/attackby(obj/item/item, mob/user, params)
if(istype(item,/obj/item/card/id) && !scan)
@@ -95,13 +95,13 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
return TRUE
return FALSE
-/obj/machinery/photocopier/faxmachine/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "FaxMachine", name, 540, 300, master_ui, state)
ui.open()
-/obj/machinery/photocopier/faxmachine/tgui_data(mob/user)
+/obj/machinery/photocopier/faxmachine/ui_data(mob/user)
var/list/data = list()
data["authenticated"] = is_authenticated(user)
data["scan_name"] = scan ? scan.name : FALSE
@@ -130,7 +130,7 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
return data
-/obj/machinery/photocopier/faxmachine/tgui_act(action, params)
+/obj/machinery/photocopier/faxmachine/ui_act(action, params)
if(..())
return
var/is_authenticated = is_authenticated(usr)
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index 69b01b53f39..f7d5e0f7163 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -106,7 +106,7 @@ GLOBAL_LIST_EMPTY(PDAs)
user.set_machine(src)
if(active_uplink_check(user))
return
- tgui_interact(user)
+ ui_interact(user)
/obj/item/pda/proc/start_program(datum/data/pda/P)
if(P && ((P in programs) || (cartridge && (P in cartridge.programs))))
diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm
index 59168c58871..fae5140429e 100644
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -12,7 +12,7 @@
"message1" = message1 ? message1 : "(none)",
"message2" = message2 ? message2 : "(none)")
-/datum/data/pda/app/status_display/tgui_act(action, list/params)
+/datum/data/pda/app/status_display/ui_act(action, list/params)
if(..())
return
@@ -72,7 +72,7 @@
data["minFrequency"] = PUBLIC_LOW_FREQ
data["maxFrequency"] = PUBLIC_HIGH_FREQ
-/datum/data/pda/app/signaller/tgui_act(action, list/params)
+/datum/data/pda/app/signaller/ui_act(action, list/params)
if(..())
return
@@ -100,19 +100,19 @@
category = "Engineering"
update = PDA_APP_UPDATE_SLOW
- var/datum/tgui_module/power_monitor/digital/pm = new
+ var/datum/ui_module/power_monitor/digital/pm = new
/datum/data/pda/app/power/update_ui(mob/user as mob, list/data)
- data.Add(pm.tgui_data())
+ data.Add(pm.ui_data())
// All 4 args are important here because proxying matters
-/datum/data/pda/app/power/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
+/datum/data/pda/app/power/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
. = TRUE
// Observe
- pm.tgui_act(action, params, ui, state)
+ pm.ui_act(action, params, ui, state)
/datum/data/pda/app/crew_records
var/datum/data/record/general_records = null
@@ -133,7 +133,7 @@
data["records"] = null
return null
-/datum/data/pda/app/crew_records/tgui_act(action, list/params)
+/datum/data/pda/app/crew_records/ui_act(action, list/params)
if(..())
return
@@ -248,7 +248,7 @@
data["beepsky"] = beepskyData
-/datum/data/pda/app/secbot_control/tgui_act(action, list/params)
+/datum/data/pda/app/secbot_control/ui_act(action, list/params)
if(..())
return
@@ -329,7 +329,7 @@
data["mulebot"] = muleData
-/datum/data/pda/app/mule_control/tgui_act(action, list/params)
+/datum/data/pda/app/mule_control/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm
index 1b4be7e8274..7a86ad11ee5 100644
--- a/code/modules/pda/core_apps.dm
+++ b/code/modules/pda/core_apps.dm
@@ -17,7 +17,7 @@
notifying["[P.UID()]"] = TRUE
data["notifying"] = notifying
-/datum/data/pda/app/main_menu/tgui_act(action, list/params)
+/datum/data/pda/app/main_menu/ui_act(action, list/params)
if(..())
return
@@ -57,7 +57,7 @@
/datum/data/pda/app/notekeeper/update_ui(mob/user as mob, list/data)
data["note"] = note // current pda notes
-/datum/data/pda/app/notekeeper/tgui_act(action, params)
+/datum/data/pda/app/notekeeper/ui_act(action, params)
if(..())
return
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index e7d57c3d5f8..32cfe362e17 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -58,7 +58,7 @@
if(pda.cartridge)
data["charges"] = pda.cartridge.charges ? pda.cartridge.charges : 0
-/datum/data/pda/app/messenger/tgui_act(action, list/params)
+/datum/data/pda/app/messenger/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/pda/mob_hunt_game_app.dm b/code/modules/pda/mob_hunt_game_app.dm
index 256ec0f91d9..12818a92be1 100644
--- a/code/modules/pda/mob_hunt_game_app.dm
+++ b/code/modules/pda/mob_hunt_game_app.dm
@@ -152,7 +152,7 @@
bait = bait.type
new bait(1, get_turf(pda))
-/datum/data/pda/app/mob_hunter_game/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
+/datum/data/pda/app/mob_hunter_game/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm
index 5f4a5699c7a..18f172d95a7 100644
--- a/code/modules/pda/pda_tgui.dm
+++ b/code/modules/pda/pda_tgui.dm
@@ -1,13 +1,13 @@
// All the TGUI interactions are in their own file to keep things simpler
-/obj/item/pda/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_inventory_state)
+/obj/item/pda/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "PDA", name, 600, 650, master_ui, state)
ui.open()
-/obj/item/pda/tgui_data(mob/user)
+/obj/item/pda/ui_data(mob/user)
var/list/data = list()
data["owner"] = owner
@@ -58,7 +58,7 @@
return data
// Yes the stupid amount of args here is important, see L102
-/obj/item/pda/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
+/obj/item/pda/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
@@ -99,7 +99,7 @@
return set_ringtone()
else
if(current_app)
- . = current_app.tgui_act(action, params, ui, state) // It needs proxying through down here so apps actually have their interacts called
+ . = current_app.ui_act(action, params, ui, state) // It needs proxying through down here so apps actually have their interacts called
if((honkamt > 0) && (prob(60)))//For clown virus.
honkamt--
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index fbad25dff64..0213f1c37c9 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -747,7 +747,7 @@
/obj/machinery/power/apc/attack_ghost(mob/user)
if(panel_open)
wires.Interact(user)
- return tgui_interact(user)
+ return ui_interact(user)
/obj/machinery/power/apc/interact(mob/user)
if(!user)
@@ -756,7 +756,7 @@
if(panel_open)
wires.Interact(user)
- return tgui_interact(user)
+ return ui_interact(user)
/obj/machinery/power/apc/proc/get_malf_status(mob/living/silicon/ai/malf)
@@ -777,13 +777,13 @@
else
return APC_MALF_NOT_HACKED
-/obj/machinery/power/apc/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_default_state)
+/obj/machinery/power/apc/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)
if(!ui)
ui = new(user, src, ui_key, "APC", name, 510, 460, master_ui, state)
ui.open()
-/obj/machinery/power/apc/tgui_data(mob/user)
+/obj/machinery/power/apc/ui_data(mob/user)
var/list/data = list()
data["locked"] = is_locked(user)
data["normallyLocked"] = locked
@@ -906,7 +906,7 @@
else
return locked
-/obj/machinery/power/apc/tgui_act(action, params)
+/obj/machinery/power/apc/ui_act(action, params)
if(..() || !can_use(usr, TRUE) || (locked && !usr.has_unlimited_silicon_privilege && (action != "toggle_nightshift") && !usr.can_admin_interact()))
return
. = TRUE
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index a0e10c73be8..08af8a3df17 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -314,7 +314,7 @@
/obj/machinery/power/port_gen/pacman/attack_hand(mob/user as mob)
..()
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/power/port_gen/pacman/attack_ai(var/mob/user as mob)
add_hiddenprint(user)
@@ -323,13 +323,13 @@
/obj/machinery/power/port_gen/pacman/attack_ghost(var/mob/user)
return attack_hand(user)
-/obj/machinery/power/port_gen/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/power/port_gen/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "Pacman", name, 500, 260)
ui.open()
-/obj/machinery/power/port_gen/pacman/tgui_data(mob/user)
+/obj/machinery/power/port_gen/pacman/ui_data(mob/user)
var/list/data = list()
data["active"] = active
@@ -357,7 +357,7 @@
return data
-/obj/machinery/power/port_gen/pacman/tgui_act(action, params)
+/obj/machinery/power/port_gen/pacman/ui_act(action, params)
if(..())
return
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 2fa2c4c1573..7fdb09c42dc 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -339,16 +339,16 @@
/obj/machinery/power/smes/attack_ai(mob/user)
add_hiddenprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/power/smes/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/power/smes/attack_hand(mob/user)
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/power/smes/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
if(stat & BROKEN)
return
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -356,7 +356,7 @@
ui = new(user, src, ui_key, "Smes", name, 340, 350, master_ui, state)
ui.open()
-/obj/machinery/power/smes/tgui_data(mob/user)
+/obj/machinery/power/smes/ui_data(mob/user)
var/list/data = list(
"capacity" = capacity,
"capacityPercent" = round(100*charge/capacity, 0.1),
@@ -376,7 +376,7 @@
)
return data
-/obj/machinery/power/smes/tgui_act(action, params)
+/obj/machinery/power/smes/ui_act(action, params)
if(..())
return
. = TRUE
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index e8295eedeb2..4d303158b6e 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -357,25 +357,25 @@
/obj/machinery/power/solar_control/attack_ai(mob/user as mob)
add_hiddenprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/power/solar_control/attack_ghost(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/power/solar_control/attack_hand(mob/user)
if(..(user))
return TRUE
if(stat & BROKEN)
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/power/solar_control/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/power/solar_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "SolarControl", name, 490, 300)
ui.open()
-/obj/machinery/power/solar_control/tgui_data(mob/user)
+/obj/machinery/power/solar_control/ui_data(mob/user)
var/list/data = list()
data["generated"] = round(lastgen) //generated power by all connected panels
data["generated_ratio"] = data["generated"] / round(max(connected_panels.len, 1) * SSsun.solar_gen_rate) //power generation ratio. Used for the power bar
@@ -388,7 +388,7 @@
data["connected_tracker"] = (connected_tracker ? TRUE : FALSE)
return data
-/obj/machinery/power/solar_control/tgui_act(action, params)
+/obj/machinery/power/solar_control/ui_act(action, params)
if(..())
return
. = TRUE
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index c114a8588c8..4f45e7d1570 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -143,15 +143,15 @@
beaker = null
overlays.Cut()
-/obj/machinery/chem_dispenser/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_default_state)
+/obj/machinery/chem_dispenser/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)
// update the ui if it exists, returns null if no ui is passed/found
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "ChemDispenser", ui_title, 390, 655)
ui.open()
-/obj/machinery/chem_dispenser/tgui_data(mob/user)
- var/data[0]
+/obj/machinery/chem_dispenser/ui_data(mob/user)
+ var/list/data = list()
data["glass"] = is_drink
data["amount"] = amount
@@ -183,7 +183,7 @@
return data
-/obj/machinery/chem_dispenser/tgui_act(actions, params)
+/obj/machinery/chem_dispenser/ui_act(actions, params)
if(..())
return
if(stat & (NOPOWER|BROKEN))
@@ -314,12 +314,12 @@
/obj/machinery/chem_dispenser/attack_ghost(mob/user)
if(stat & BROKEN)
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/chem_dispenser/attack_hand(mob/user)
if(stat & BROKEN)
return
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/chem_dispenser/soda
icon_state = "soda_dispenser"
@@ -452,18 +452,18 @@
/obj/item/handheld_chem_dispenser/attack_self(mob/user)
if(cell)
- tgui_interact(user)
+ ui_interact(user)
else
to_chat(user, "The [src] lacks a power cell!")
-/obj/item/handheld_chem_dispenser/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_inventory_state)
+/obj/item/handheld_chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "HandheldChemDispenser", name, 390, 500)
ui.open()
-/obj/item/handheld_chem_dispenser/tgui_data(mob/user)
+/obj/item/handheld_chem_dispenser/ui_data(mob/user)
var/list/data = list()
data["glass"] = is_drink
@@ -475,7 +475,7 @@
return data
-/obj/item/handheld_chem_dispenser/tgui_static_data()
+/obj/item/handheld_chem_dispenser/ui_static_data()
var/list/data = list()
var/list/chemicals = list()
for(var/re in dispensable_reagents)
@@ -487,7 +487,7 @@
return data
-/obj/item/handheld_chem_dispenser/tgui_act(action, list/params)
+/obj/item/handheld_chem_dispenser/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 8fddc97537f..5aa40e30e47 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -99,16 +99,16 @@
default_deconstruction_crowbar(user, I)
/obj/machinery/chem_heater/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/chem_heater/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/chem_heater/attack_ai(mob/user)
add_hiddenprint(user)
return attack_hand(user)
-/obj/machinery/chem_heater/tgui_act(action, params)
+/obj/machinery/chem_heater/ui_act(action, params)
if(..())
return
if(stat & (NOPOWER|BROKEN))
@@ -129,7 +129,7 @@
return FALSE
add_fingerprint(usr)
-/obj/machinery/chem_heater/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_default_state)
+/obj/machinery/chem_heater/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)
if(user.stat || user.restrained())
return
@@ -138,7 +138,7 @@
ui = new(user, src, ui_key, "ChemHeater", "Chemical Heater", 350, 270, master_ui, state)
ui.open()
-/obj/machinery/chem_heater/tgui_data(mob/user)
+/obj/machinery/chem_heater/ui_data(mob/user)
var/data[0]
var/cur_temp = beaker ? beaker.reagents.chem_temp : null
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index f2b3247fe4b..7c1b8d72c8a 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -146,13 +146,13 @@
power_change()
return TRUE
-/obj/machinery/chem_master/tgui_act(action, params, datum/tgui/ui, datum/tgui_state/state)
+/obj/machinery/chem_master/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
if(stat & (NOPOWER|BROKEN))
return
- if(tgui_act_modal(action, params, ui, state))
+ if(ui_act_modal(action, params, ui, state))
return TRUE
add_fingerprint(usr)
@@ -240,14 +240,14 @@
return attack_hand(user)
/obj/machinery/chem_master/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/chem_master/attack_hand(mob/user)
if(..())
return TRUE
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/chem_master/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_default_state)
+/obj/machinery/chem_master/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)
var/datum/asset/chem_master/assets = get_asset_datum(/datum/asset/chem_master)
assets.send(user)
@@ -256,7 +256,7 @@
ui = new(user, src, ui_key, "ChemMaster", name, 575, 500)
ui.open()
-/obj/machinery/chem_master/tgui_data(mob/user)
+/obj/machinery/chem_master/ui_data(mob/user)
var/data[0]
data["condi"] = condi
@@ -286,23 +286,23 @@
data["printing"] = printing
// Transfer modal information if there is one
- data["modal"] = tgui_modal_data(src)
+ data["modal"] = ui_modal_data(src)
return data
/**
- * Called in tgui_act() to process modal actions
+ * Called in ui_act() to process modal actions
*
* Arguments:
* * action - The action passed by tgui
* * params - The params passed by tgui
*/
-/obj/machinery/chem_master/proc/tgui_act_modal(action, params, datum/tgui/ui, datum/tgui_state/state)
+/obj/machinery/chem_master/proc/ui_act_modal(action, params, datum/tgui/ui, datum/ui_state/state)
. = TRUE
var/id = params["id"] // The modal's ID
var/list/arguments = istext(params["arguments"]) ? json_decode(params["arguments"]) : params["arguments"]
- switch(tgui_modal_act(src, action, params))
- if(TGUI_MODAL_OPEN)
+ switch(ui_modal_act(src, action, params))
+ if(UI_MODAL_OPEN)
switch(id)
if("analyze")
var/idx = text2num(arguments["idx"]) || 0
@@ -319,7 +319,7 @@
result["blood_dna"] = B.data["blood_DNA"]
arguments["analysis"] = result
- tgui_modal_message(src, id, "", null, arguments)
+ ui_modal_message(src, id, "", null, arguments)
if("change_pill_bottle_style")
if(!loaded_pill_bottle)
return
@@ -338,19 +338,19 @@
COLOR_MAROON = "Brown"
)
var/current = pill_bottle_wrappers[loaded_pill_bottle.wrapper_color] || "Default"
- tgui_modal_choice(src, id, "Please select a pill bottle wrapper:", null, arguments, current, pill_bottle_wrappers)
+ ui_modal_choice(src, id, "Please select a pill bottle wrapper:", null, arguments, current, pill_bottle_wrappers)
if("addcustom")
if(!beaker || !beaker.reagents.total_volume)
return
- tgui_modal_input(src, id, "Please enter the amount to transfer to buffer:", null, arguments, useramount)
+ ui_modal_input(src, id, "Please enter the amount to transfer to buffer:", null, arguments, useramount)
if("removecustom")
if(!reagents.total_volume)
return
- tgui_modal_input(src, id, "Please enter the amount to transfer to [mode ? "beaker" : "disposal"]:", null, arguments, useramount)
+ ui_modal_input(src, id, "Please enter the amount to transfer to [mode ? "beaker" : "disposal"]:", null, arguments, useramount)
if("create_condi_pack")
if(!condi || !reagents.total_volume)
return
- tgui_modal_input(src, id, "Please name your new condiment pack:", null, arguments, reagents.get_master_reagent_name(), MAX_CUSTOM_NAME_LEN)
+ ui_modal_input(src, id, "Please name your new condiment pack:", null, arguments, reagents.get_master_reagent_name(), MAX_CUSTOM_NAME_LEN)
if("create_pill")
if(condi || !reagents.total_volume)
return
@@ -361,16 +361,16 @@
var/amount_per_pill = clamp(reagents.total_volume / num, 0, MAX_UNITS_PER_PILL)
var/default_name = "[reagents.get_master_reagent_name()] ([amount_per_pill]u)"
var/pills_text = num == 1 ? "new pill" : "[num] new pills"
- tgui_modal_input(src, id, "Please name your [pills_text]:", null, arguments, default_name, MAX_CUSTOM_NAME_LEN)
+ ui_modal_input(src, id, "Please name your [pills_text]:", null, arguments, default_name, MAX_CUSTOM_NAME_LEN)
if("create_pill_multiple")
if(condi || !reagents.total_volume)
return
- tgui_modal_input(src, id, "Please enter the amount of pills to make (max [MAX_MULTI_AMOUNT] at a time):", null, arguments, pillamount, 5)
+ ui_modal_input(src, id, "Please enter the amount of pills to make (max [MAX_MULTI_AMOUNT] at a time):", null, arguments, pillamount, 5)
if("change_pill_style")
var/list/choices = list()
for(var/i = 1 to MAX_PILL_SPRITE)
choices += "pill[i].png"
- tgui_modal_bento(src, id, "Please select the new style for pills:", null, arguments, pillsprite, choices)
+ ui_modal_bento(src, id, "Please select the new style for pills:", null, arguments, pillsprite, choices)
if("create_patch")
if(condi || !reagents.total_volume)
return
@@ -381,25 +381,25 @@
var/amount_per_patch = clamp(reagents.total_volume / num, 0, MAX_UNITS_PER_PATCH)
var/default_name = "[reagents.get_master_reagent_name()] ([amount_per_patch]u)"
var/patches_text = num == 1 ? "new patch" : "[num] new patches"
- tgui_modal_input(src, id, "Please name your [patches_text]:", null, arguments, default_name, MAX_CUSTOM_NAME_LEN)
+ ui_modal_input(src, id, "Please name your [patches_text]:", null, arguments, default_name, MAX_CUSTOM_NAME_LEN)
if("create_patch_multiple")
if(condi || !reagents.total_volume)
return
- tgui_modal_input(src, id, "Please enter the amount of patches to make (max [MAX_MULTI_AMOUNT] at a time):", null, arguments, pillamount, 5)
+ ui_modal_input(src, id, "Please enter the amount of patches to make (max [MAX_MULTI_AMOUNT] at a time):", null, arguments, pillamount, 5)
if("create_bottle")
if(condi || !reagents.total_volume)
return
- tgui_modal_input(src, id, "Please name your bottle:", null, arguments, reagents.get_master_reagent_name(), MAX_CUSTOM_NAME_LEN)
+ ui_modal_input(src, id, "Please name your bottle:", null, arguments, reagents.get_master_reagent_name(), MAX_CUSTOM_NAME_LEN)
if("change_bottle_style")
if(!bottle_styles)
bottle_styles = list("bottle", "small_bottle", "wide_bottle", "round_bottle", "reagent_bottle")
var/list/bottle_styles_png = list()
for(var/style in bottle_styles)
bottle_styles_png += "[style].png"
- tgui_modal_bento(src, id, "Please select the new style for bottles:", null, arguments, bottlesprite, bottle_styles_png)
+ ui_modal_bento(src, id, "Please select the new style for bottles:", null, arguments, bottlesprite, bottle_styles_png)
else
return FALSE
- if(TGUI_MODAL_ANSWER)
+ if(UI_MODAL_ANSWER)
var/answer = params["answer"]
switch(id)
if("change_pill_bottle_style")
@@ -421,12 +421,12 @@
var/amount = isgoodnumber(text2num(answer))
if(!amount || !arguments["id"])
return
- tgui_act("add", list("id" = arguments["id"], "amount" = amount), ui, state)
+ ui_act("add", list("id" = arguments["id"], "amount" = amount), ui, state)
if("removecustom")
var/amount = isgoodnumber(text2num(answer))
if(!amount || !arguments["id"])
return
- tgui_act("remove", list("id" = arguments["id"], "amount" = amount), ui, state)
+ ui_act("remove", list("id" = arguments["id"], "amount" = amount), ui, state)
if("create_condi_pack")
if(!condi || !reagents.total_volume)
return
@@ -464,7 +464,7 @@
if("create_pill_multiple")
if(condi || !reagents.total_volume)
return
- tgui_act("modal_open", list("id" = "create_pill", "arguments" = list("num" = answer)), ui, state)
+ ui_act("modal_open", list("id" = "create_pill", "arguments" = list("num" = answer)), ui, state)
if("change_pill_style")
var/new_style = clamp(text2num(answer) || 0, 0, MAX_PILL_SPRITE)
if(!new_style)
@@ -500,7 +500,7 @@
if("create_patch_multiple")
if(condi || !reagents.total_volume)
return
- tgui_act("modal_open", list("id" = "create_patch", "arguments" = list("num" = answer)), ui, state)
+ ui_act("modal_open", list("id" = "create_patch", "arguments" = list("num" = answer)), ui, state)
if("create_bottle")
if(condi || !reagents.total_volume)
return
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 8ee54733840..e3a9e2b6905 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -357,16 +357,16 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/conveyor_switch/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_default_state)
+/obj/machinery/conveyor_switch/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)
user.set_machine(src)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "ConveyorSwitch", name, 350, 150, master_ui, state)
ui.open()
-/obj/machinery/conveyor_switch/tgui_data(mob/user)
+/obj/machinery/conveyor_switch/ui_data(mob/user)
var/list/data = list(
"slowFactor" = slow_factor,
"oneWay" = one_way,
@@ -374,7 +374,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
)
return data
-/obj/machinery/conveyor_switch/tgui_act(action, list/params)
+/obj/machinery/conveyor_switch/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index abb37e45c2a..9cc426aed0e 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -240,10 +240,10 @@
// ai as human but can't flush
/obj/machinery/disposal/attack_ai(mob/user as mob)
src.add_hiddenprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/disposal/attack_ghost(mob/user as mob)
- tgui_interact(user)
+ ui_interact(user)
// human interact with machine
/obj/machinery/disposal/attack_hand(mob/user as mob)
@@ -259,20 +259,20 @@
// Clumsy folks can only flush it.
if(user.IsAdvancedToolUser())
- tgui_interact(user)
+ ui_interact(user)
else
flush = !flush
update()
return
-/obj/machinery/disposal/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_default_state)
+/obj/machinery/disposal/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)
if(!ui)
ui = new(user, src, ui_key, "DisposalBin", name, 300, 250, master_ui, state)
ui.open()
-/obj/machinery/disposal/tgui_data(mob/user)
+/obj/machinery/disposal/ui_data(mob/user)
var/list/data = list()
data["isAI"] = isAI(user)
@@ -282,7 +282,7 @@
return data
-/obj/machinery/disposal/tgui_act(action, params)
+/obj/machinery/disposal/ui_act(action, params)
if(..())
return
if(usr.loc == src)
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index da10dbfe558..da2456b5de1 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -473,7 +473,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
clear_wait_message()
SStgui.update_uis(src)
-/obj/machinery/computer/rdconsole/tgui_act(action, list/params)
+/obj/machinery/computer/rdconsole/ui_act(action, list/params)
if(..())
return
@@ -693,15 +693,15 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(!allowed(user) && !isobserver(user))
to_chat(user, "Access denied.")
return TRUE
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/rdconsole/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/computer/rdconsole/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "RndConsole", name, 800, 550, master_ui, state)
ui.open()
-/obj/machinery/computer/rdconsole/proc/tgui_machine_data(obj/machinery/r_n_d/machine, list/data)
+/obj/machinery/computer/rdconsole/proc/ui_machine_data(obj/machinery/r_n_d/machine, list/data)
if(!machine)
return
@@ -791,7 +791,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
return FALSE
-/obj/machinery/computer/rdconsole/tgui_data(mob/user)
+/obj/machinery/computer/rdconsole/ui_data(mob/user)
var/list/data = list()
files.RefreshResearch()
@@ -899,9 +899,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
break
else if(menu == MENU_LATHE && linked_lathe)
- tgui_machine_data(linked_lathe, data)
+ ui_machine_data(linked_lathe, data)
else if(menu == MENU_IMPRINTER && linked_imprinter)
- tgui_machine_data(linked_imprinter, data)
+ ui_machine_data(linked_imprinter, data)
return data
diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm
index 78022bb6d7c..eef79ff3f3b 100644
--- a/code/modules/response_team/ert.dm
+++ b/code/modules/response_team/ert.dm
@@ -33,8 +33,8 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE)
to_chat(usr, "Central Command has already dispatched an emergency response team!")
return
- var/datum/tgui_module/ert_manager/E = new()
- E.tgui_interact(usr)
+ var/datum/ui_module/ert_manager/E = new()
+ E.ui_interact(usr)
/mob/dead/observer/proc/JoinResponseTeam()
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index e51355e89bb..25fbae7f1ab 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -62,21 +62,21 @@
stat |= NOPOWER
/obj/machinery/keycard_auth/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/keycard_auth/attack_hand(mob/user)
if(..())
return TRUE
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/keycard_auth/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "KeycardAuth", name, 540, 300, master_ui, state)
ui.open()
-/obj/machinery/keycard_auth/tgui_data()
+/obj/machinery/keycard_auth/ui_data()
var/list/data = list()
data["redAvailable"] = GLOB.security_level == SEC_LEVEL_RED ? FALSE : TRUE
data["swiping"] = swiping
@@ -88,7 +88,7 @@
data["hasConfirm"] = event_confirmed_by || (active && event_source && event_source.event_confirmed_by) ? TRUE : FALSE
return data
-/obj/machinery/keycard_auth/tgui_act(action, params)
+/obj/machinery/keycard_auth/ui_act(action, params)
if(..())
return
if(busy)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index b97d181bb15..686f772e86a 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -773,15 +773,15 @@
return
connect()
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/shuttle/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_default_state)
+/obj/machinery/computer/shuttle/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)
if(!ui)
ui = new(user, src, ui_key, "ShuttleConsole", name, 350, 150, master_ui, state)
ui.open()
-/obj/machinery/computer/shuttle/tgui_data(mob/user)
+/obj/machinery/computer/shuttle/ui_data(mob/user)
var/list/data = list()
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
data["status"] = M ? M.getStatusText() : null
@@ -800,7 +800,7 @@
data["admin_controlled"] = admin_controlled
return data
-/obj/machinery/computer/shuttle/tgui_act(action, params)
+/obj/machinery/computer/shuttle/ui_act(action, params)
if(..()) //we can't actually interact, so no action
return TRUE
if(!allowed(usr))
@@ -853,7 +853,7 @@
admin_controlled = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
-/obj/machinery/computer/shuttle/ferry/request/tgui_act(action, params)
+/obj/machinery/computer/shuttle/ferry/request/ui_act(action, params)
if(..()) // Note that the parent handels normal shuttle movement on top of security checks
return
if(action == "request")
diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm
index bfe0f95feb2..e5039fd3353 100644
--- a/code/modules/shuttle/shuttle_manipulator.dm
+++ b/code/modules/shuttle/shuttle_manipulator.dm
@@ -55,16 +55,16 @@
. = "ERROR"
/obj/machinery/shuttle_manipulator/attack_hand(mob/user)
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/shuttle_manipulator/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_admin_state)
+/obj/machinery/shuttle_manipulator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "ShuttleManipulator", name, 650, 700, master_ui, state)
ui.open()
-/obj/machinery/shuttle_manipulator/tgui_data(mob/user)
+/obj/machinery/shuttle_manipulator/ui_data(mob/user)
var/list/data = list()
data["templates"] = list()
@@ -122,7 +122,7 @@
data["shuttles"] += list(L)
return data
-/obj/machinery/shuttle_manipulator/tgui_act(action, list/params, datum/tgui/ui)
+/obj/machinery/shuttle_manipulator/ui_act(action, list/params, datum/tgui/ui)
if(..())
return
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 5d8e9a6f914..2bce922f05d 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -409,7 +409,7 @@
return 1
post_signal("supply")
- tgui_interact(user)
+ ui_interact(user)
return
/obj/machinery/computer/supplycomp/emag_act(user as mob)
@@ -418,13 +418,13 @@
hacked = TRUE
return
-/obj/machinery/computer/supplycomp/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_default_state)
+/obj/machinery/computer/supplycomp/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)
if(!ui)
ui = new(user, src, ui_key, "CargoConsole", name, 900, 800, master_ui, state)
ui.open()
-/obj/machinery/computer/supplycomp/tgui_data(mob/user)
+/obj/machinery/computer/supplycomp/ui_data(mob/user)
var/list/data = list()
var/list/requests_list = list()
@@ -455,14 +455,14 @@
return data
-/obj/machinery/computer/supplycomp/tgui_static_data(mob/user)
+/obj/machinery/computer/supplycomp/ui_static_data(mob/user)
var/list/data = list()
var/list/packs_list = list()
for(var/set_name in SSshuttle.supply_packs)
var/datum/supply_packs/pack = SSshuttle.supply_packs[set_name]
if((pack.hidden && hacked) || (pack.contraband && can_order_contraband) || (pack.special && pack.special_enabled) || (!pack.contraband && !pack.hidden && !pack.special))
- packs_list.Add(list(list("name" = pack.name, "cost" = pack.cost, "ref" = "[pack.UID()]", "contents" = pack.tgui_manifest, "cat" = pack.group)))
+ packs_list.Add(list(list("name" = pack.name, "cost" = pack.cost, "ref" = "[pack.UID()]", "contents" = pack.ui_manifest, "cat" = pack.group)))
data["supply_packs"] = packs_list
@@ -482,7 +482,7 @@
return FALSE
-/obj/machinery/computer/supplycomp/tgui_act(action, list/params)
+/obj/machinery/computer/supplycomp/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index 75434f28fa9..5bca3129d0f 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -336,8 +336,8 @@
-/obj/machinery/power/bluespace_tap/tgui_data(mob/user)
- var/data[0]
+/obj/machinery/power/bluespace_tap/ui_data(mob/user)
+ var/list/data = list()
data["desiredLevel"] = desired_level
data["inputLevel"] = input_level
@@ -364,13 +364,13 @@
/obj/machinery/power/bluespace_tap/attack_hand(mob/user)
add_fingerprint(user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/power/bluespace_tap/attack_ghost(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/obj/machinery/power/bluespace_tap/attack_ai(mob/user)
- tgui_interact(user)
+ ui_interact(user)
/**
* Produces the product with the desired key and increases product cost accordingly
@@ -393,7 +393,7 @@
//UI stuff below
-/obj/machinery/power/bluespace_tap/tgui_act(action, params)
+/obj/machinery/power/bluespace_tap/ui_act(action, params)
if(..())
return
. = TRUE // we want to refresh in all the cases below
@@ -408,7 +408,7 @@
var/key = text2num(params["target"])
produce(key)
-/obj/machinery/power/bluespace_tap/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/machinery/power/bluespace_tap/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "BluespaceTap", name, 650, 400, master_ui, state)
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 4e9b5e57630..f97638cbd28 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -305,15 +305,15 @@
/obj/machinery/computer/bsa_control/attack_hand(mob/user)
if(..())
return 1
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/bsa_control/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_default_state)
+/obj/machinery/computer/bsa_control/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)
if(!ui)
ui = new(user, src, ui_key, "BlueSpaceArtilleryControl", name, 400, 155, master_ui, state)
ui.open()
-/obj/machinery/computer/bsa_control/tgui_data(mob/user)
+/obj/machinery/computer/bsa_control/ui_data(mob/user)
var/list/data = list()
data["connected"] = cannon
data["notice"] = notice
@@ -332,7 +332,7 @@
data["ready"] = FALSE
return data
-/obj/machinery/computer/bsa_control/tgui_act(action, params)
+/obj/machinery/computer/bsa_control/ui_act(action, params)
if(..())
return
switch(action)
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 1f67ee28e16..78382b320e3 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -212,14 +212,14 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
/obj/machinery/dna_vault/attack_ghost(mob/user)
if(stat & (BROKEN|MAINT))
return
- return tgui_interact(user)
+ return ui_interact(user)
/obj/machinery/dna_vault/attack_hand(mob/user)
if(..())
return TRUE
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/dna_vault/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_default_state)
+/obj/machinery/dna_vault/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)
if(!ui)
roll_powers(user)
@@ -235,7 +235,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
L += pick_n_take(possible_powers)
power_lottery[user] = L
-/obj/machinery/dna_vault/tgui_data(mob/user)
+/obj/machinery/dna_vault/ui_data(mob/user)
var/list/data = list(
"plants" = length(plants),
"plants_max" = plants_max,
@@ -256,7 +256,7 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
data["choiceB"] = L[2]
return data
-/obj/machinery/dna_vault/tgui_act(action, params)
+/obj/machinery/dna_vault/ui_act(action, params)
if(..())
return
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 6c9a34e3b24..f4b5a02783a 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -50,15 +50,15 @@
/obj/machinery/computer/sat_control/attack_hand(mob/user)
if(..())
return 1
- tgui_interact(user)
+ ui_interact(user)
-/obj/machinery/computer/sat_control/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_default_state)
+/obj/machinery/computer/sat_control/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)
if(!ui)
ui = new(user, src, ui_key, "SatelliteControl", name, 475, 400)
ui.open()
-/obj/machinery/computer/sat_control/tgui_data(mob/user)
+/obj/machinery/computer/sat_control/ui_data(mob/user)
var/list/data = list()
data["satellites"] = list()
@@ -78,7 +78,7 @@
data["meteor_shield_coverage_percentage"] = (G.get_coverage() / G.coverage_goal) * 100
return data
-/obj/machinery/computer/sat_control/tgui_act(action, params)
+/obj/machinery/computer/sat_control/ui_act(action, params)
if(..())
return
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index fdd67da76d3..0945885a988 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -38,7 +38,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
overlays += "working"
/obj/item/gps/AltClick(mob/user)
- if(tgui_status(user, GLOB.tgui_inventory_state) != STATUS_INTERACTIVE)
+ if(ui_status(user, GLOB.inventory_state) != STATUS_INTERACTIVE)
return 1 //user not valid to use gps
if(emped)
to_chat(user, "It's busted!")
diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm
index d7a6423632d..6e000a8fd9c 100644
--- a/code/modules/tgui/external.dm
+++ b/code/modules/tgui/external.dm
@@ -17,8 +17,7 @@
* optional master_ui datum/tgui The parent UI.
* optional state datum/ui_state The state used to determine status.
*/
-
-/datum/proc/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_default_state)
+/datum/proc/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)
return FALSE // Not implemented.
/**
@@ -31,7 +30,7 @@
*
* return list Data to be sent to the UI.
*/
-/datum/proc/tgui_data(mob/user)
+/datum/proc/ui_data(mob/user)
return list() // Not implemented.
/**
@@ -47,7 +46,7 @@
*
* return list Statuic Data to be sent to the UI.
*/
-/datum/proc/tgui_static_data(mob/user)
+/datum/proc/ui_static_data(mob/user)
return list()
/**
@@ -59,12 +58,12 @@
* optional ui ui to be updated
* optional ui_key ui key of ui to be updated
*/
-/datum/proc/update_tgui_static_data(mob/user, datum/tgui/ui, ui_key = "main")
+/datum/proc/update_static_data(mob/user, datum/tgui/ui, ui_key = "main")
ui = SStgui.try_update_ui(user, src, ui_key, ui)
// If there was no ui to update, there's no static data to update either.
if(!ui)
return
- ui.push_data(null, tgui_static_data(user), TRUE)
+ ui.push_data(null, ui_static_data(user), TRUE)
/**
* public
@@ -77,10 +76,10 @@
*
* return bool If the UI should be updated or not.
*/
-/datum/proc/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
+/datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
// If UI is not interactive or usr calling Topic is not the UI user, bail.
if(!ui || ui.status != STATUS_INTERACTIVE)
- return TRUE
+ return 1
/**
* public
@@ -95,7 +94,7 @@
*
* required html the html base text
*/
-/datum/proc/tgui_base_html(html)
+/datum/proc/ui_base_html(html)
return html
/**
@@ -105,7 +104,7 @@
* This allows modules/datums to have the UI attached to them,
* and be a part of another object.
*/
-/datum/proc/tgui_host(mob/user)
+/datum/proc/ui_host(mob/user)
return src // Default src.
/**
@@ -114,7 +113,6 @@
* Associative list of JSON-encoded shared states that were set by
* tgui clients.
*/
-
/datum/var/list/tgui_shared_states
/**
@@ -122,14 +120,14 @@
*
* Used to track UIs for a mob.
*/
-/mob/var/list/open_tguis = list()
+/mob/var/list/open_uis = list()
/**
* public
*
* Called on a UI's object when the UI is closed, not to be confused with
* client/verb/uiclose(), which closes the ui window
*/
-/datum/proc/tgui_close(mob/user)
+/datum/proc/ui_close(mob/user)
/**
* verb
@@ -139,13 +137,13 @@
*
* required uiref ref The UI that was closed.
*/
-/client/verb/tguiclose(uid as text)
+/client/verb/uiclose(ref as text)
// Name the verb, and hide it from the user panel.
set name = "uiclose"
- set hidden = TRUE
+ set hidden = 1
// Get the UI based on the ref.
- var/datum/tgui/ui = locateUID(uid)
+ var/datum/tgui/ui = locateUID(ref)
// If we found the UI, close it.
if(istype(ui))
diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm
index d74d5d78716..4bbefd2b17d 100644
--- a/code/modules/tgui/modules/_base.dm
+++ b/code/modules/tgui/modules/_base.dm
@@ -1,21 +1,21 @@
/*
-TGUI MODULES
+UI MODULES
-This allows for datum-based TGUIs that can be hooked into objects.
+This allows for datum-based UIs that can be hooked into objects.
This is useful for things such as the power monitor, which needs to exist on a physical console in the world, but also as a virtual device the AI can use
Code is pretty much ripped verbatim from nano modules, but with un-needed stuff removed
*/
-/datum/tgui_module
+/datum/ui_module
var/name
var/datum/host
-/datum/tgui_module/New(datum/_host)
+/datum/ui_module/New(datum/_host)
host = _host
-/datum/tgui_module/tgui_host()
+/datum/ui_module/ui_host()
return host ? host : src
-/datum/tgui_module/tgui_close(mob/user)
+/datum/ui_module/ui_close(mob/user)
if(host)
- host.tgui_close(user)
+ host.ui_close(user)
diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm
index 64fb538d9f4..b6139792b71 100644
--- a/code/modules/tgui/modules/appearance_changer.dm
+++ b/code/modules/tgui/modules/appearance_changer.dm
@@ -1,4 +1,4 @@
-/datum/tgui_module/appearance_changer
+/datum/ui_module/appearance_changer
name = "Appearance Editor"
var/flags = APPEARANCE_ALL_HAIR
var/mob/living/carbon/human/owner = null
@@ -17,7 +17,7 @@
var/list/whitelist
var/list/blacklist
-/datum/tgui_module/appearance_changer/New(datum/host, mob/living/carbon/human/H, check_species_whitelist = TRUE, list/species_whitelist = list(), list/species_blacklist = list())
+/datum/ui_module/appearance_changer/New(datum/host, mob/living/carbon/human/H, check_species_whitelist = TRUE, list/species_whitelist = list(), list/species_blacklist = list())
..()
owner = H
head_organ = owner.get_organ("head")
@@ -25,7 +25,7 @@
whitelist = species_whitelist
blacklist = species_blacklist
-/datum/tgui_module/appearance_changer/tgui_act(action, list/params)
+/datum/ui_module/appearance_changer/ui_act(action, list/params)
if(..())
return
@@ -175,13 +175,13 @@
cut_and_generate_data()
-/datum/tgui_module/appearance_changer/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_default_state)
+/datum/ui_module/appearance_changer/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)
if(!ui)
ui = new(user, src, ui_key, "AppearanceChanger", name, 800, 450, master_ui, state)
ui.open()
-/datum/tgui_module/appearance_changer/tgui_data(mob/user)
+/datum/ui_module/appearance_changer/ui_data(mob/user)
generate_data(check_whitelist, whitelist, blacklist)
var/list/data = list()
@@ -277,26 +277,26 @@
return data
-/datum/tgui_module/appearance_changer/proc/update_dna()
+/datum/ui_module/appearance_changer/proc/update_dna()
if(owner && (flags & APPEARANCE_UPDATE_DNA))
owner.update_dna()
-/datum/tgui_module/appearance_changer/proc/can_change(flag)
+/datum/ui_module/appearance_changer/proc/can_change(flag)
return owner && (flags & flag)
-/datum/tgui_module/appearance_changer/proc/can_change_skin_tone()
+/datum/ui_module/appearance_changer/proc/can_change_skin_tone()
return owner && (flags & APPEARANCE_SKIN) && ((owner.dna.species.bodyflags & HAS_SKIN_TONE) || (owner.dna.species.bodyflags & HAS_ICON_SKIN_TONE))
-/datum/tgui_module/appearance_changer/proc/can_change_skin_color()
+/datum/ui_module/appearance_changer/proc/can_change_skin_color()
return owner && (flags & APPEARANCE_SKIN) && (owner.dna.species.bodyflags & HAS_SKIN_COLOR)
-/datum/tgui_module/appearance_changer/proc/can_change_head_accessory()
+/datum/ui_module/appearance_changer/proc/can_change_head_accessory()
if(!head_organ)
log_runtime(EXCEPTION("Missing head!"), owner)
return FALSE
return owner && (flags & APPEARANCE_HEAD_ACCESSORY) && (head_organ.dna.species.bodyflags & HAS_HEAD_ACCESSORY)
-/datum/tgui_module/appearance_changer/proc/can_change_markings(location = "body")
+/datum/ui_module/appearance_changer/proc/can_change_markings(location = "body")
var/marking_flag = HAS_BODY_MARKINGS
var/body_flags = owner.dna.species.bodyflags
if(location == "head")
@@ -312,16 +312,16 @@
return owner && (flags & APPEARANCE_MARKINGS) && (body_flags & marking_flag)
-/datum/tgui_module/appearance_changer/proc/can_change_body_accessory()
+/datum/ui_module/appearance_changer/proc/can_change_body_accessory()
return owner && (flags & APPEARANCE_BODY_ACCESSORY) && (owner.dna.species.bodyflags & HAS_TAIL)
-/datum/tgui_module/appearance_changer/proc/can_change_alt_head()
+/datum/ui_module/appearance_changer/proc/can_change_alt_head()
if(!head_organ)
log_debug("Missing head!")
return FALSE
return owner && (flags & APPEARANCE_ALT_HEAD) && (head_organ.dna.species.bodyflags & HAS_ALT_HEADS)
-/datum/tgui_module/appearance_changer/proc/cut_and_generate_data()
+/datum/ui_module/appearance_changer/proc/cut_and_generate_data()
// Making the assumption that the available species remain constant
valid_hairstyles.Cut()
valid_facial_hairstyles.Cut()
@@ -333,7 +333,7 @@
valid_alt_head_styles.Cut()
generate_data()
-/datum/tgui_module/appearance_changer/proc/generate_data()
+/datum/ui_module/appearance_changer/proc/generate_data()
if(!owner)
return
if(!length(valid_species))
diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm
index 09f566cadc3..21ee3023863 100644
--- a/code/modules/tgui/modules/atmos_control.dm
+++ b/code/modules/tgui/modules/atmos_control.dm
@@ -1,7 +1,7 @@
-/datum/tgui_module/atmos_control
+/datum/ui_module/atmos_control
name = "Atmospherics Control"
-/datum/tgui_module/atmos_control/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
+/datum/ui_module/atmos_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
@@ -9,9 +9,9 @@
if("open_alarm")
var/obj/machinery/alarm/alarm = locate(params["aref"]) in GLOB.air_alarms
if(alarm)
- alarm.tgui_interact(usr, master_ui = ui, state = GLOB.tgui_always_state) // ALWAYS is intentional here, as the master_ui pass will prevent fuckery
+ alarm.ui_interact(usr, master_ui = ui, state = GLOB.always_state) // ALWAYS is intentional here, as the master_ui pass will prevent fuckery
-/datum/tgui_module/atmos_control/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_default_state)
+/datum/ui_module/atmos_control/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)
if(!ui)
ui = new(user, src, ui_key, "AtmosControl", name, 800, 600, master_ui, state)
@@ -22,7 +22,7 @@
ui.open()
-/datum/tgui_module/atmos_control/tgui_data(mob/user)
+/datum/ui_module/atmos_control/ui_data(mob/user)
var/list/data = list()
data["alarms"] = GLOB.air_alarm_repository.air_alarm_data(GLOB.air_alarms, target_z=level_name_to_num(MAIN_STATION))
diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm
index a33a1d141f9..a500fc6aad1 100644
--- a/code/modules/tgui/modules/crew_monitor.dm
+++ b/code/modules/tgui/modules/crew_monitor.dm
@@ -1,11 +1,11 @@
-/datum/tgui_module/crew_monitor
+/datum/ui_module/crew_monitor
name = "Crew monitor"
-/datum/tgui_module/crew_monitor/tgui_act(action, params)
+/datum/ui_module/crew_monitor/ui_act(action, params)
if(..())
return TRUE
- var/turf/T = get_turf(tgui_host())
+ var/turf/T = get_turf(ui_host())
if(!T || !is_level_reachable(T.z))
to_chat(usr, "Unable to establish a connection: You're too far away from the station!")
return FALSE
@@ -20,7 +20,7 @@
return TRUE
-/datum/tgui_module/crew_monitor/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_default_state)
+/datum/ui_module/crew_monitor/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)
if(!ui)
ui = new(user, src, ui_key, "CrewMonitor", name, 800, 600, master_ui, state)
@@ -32,9 +32,9 @@
ui.open()
-/datum/tgui_module/crew_monitor/tgui_data(mob/user)
- var/data[0]
- var/turf/T = get_turf(tgui_host())
+/datum/ui_module/crew_monitor/ui_data(mob/user)
+ var/list/data = list()
+ var/turf/T = get_turf(ui_host())
data["isAI"] = isAI(user)
data["crewmembers"] = GLOB.crew_repository.health_data(T)
diff --git a/code/modules/tgui/modules/ert_manager.dm b/code/modules/tgui/modules/ert_manager.dm
index 582d03f5a54..b31adf47120 100644
--- a/code/modules/tgui/modules/ert_manager.dm
+++ b/code/modules/tgui/modules/ert_manager.dm
@@ -1,4 +1,4 @@
-/datum/tgui_module/ert_manager
+/datum/ui_module/ert_manager
name = "ERT Manager"
var/ert_type = "Red"
var/commander_slots = 1 // defaults for open slots
@@ -9,14 +9,14 @@
var/paranormal_slots = 0
var/cyborg_slots = 0
-/datum/tgui_module/ert_manager/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_admin_state)
+/datum/ui_module/ert_manager/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.admin_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "ERTManager", name, 350, 430, master_ui, state)
ui.autoupdate = TRUE
ui.open()
-/datum/tgui_module/ert_manager/tgui_data(mob/user)
+/datum/ui_module/ert_manager/ui_data(mob/user)
var/list/data = list()
data["str_security_level"] = capitalize(get_security_level())
switch(GLOB.security_level)
@@ -40,7 +40,7 @@
data["spawnpoints"] = GLOB.emergencyresponseteamspawn.len
return data
-/datum/tgui_module/ert_manager/tgui_act(action, params)
+/datum/ui_module/ert_manager/ui_act(action, params)
if(..())
return
. = TRUE
diff --git a/code/modules/tgui/modules/law_manager.dm b/code/modules/tgui/modules/law_manager.dm
index 012851da251..79f301702c6 100644
--- a/code/modules/tgui/modules/law_manager.dm
+++ b/code/modules/tgui/modules/law_manager.dm
@@ -1,4 +1,4 @@
-/datum/tgui_module/law_manager
+/datum/ui_module/law_manager
name = "Law manager"
var/ion_law = "IonLaw"
var/zeroth_law = "ZerothLaw"
@@ -12,7 +12,7 @@
var/global/list/datum/ai_laws/player_laws
var/mob/living/silicon/owner = null
-/datum/tgui_module/law_manager/New(var/mob/living/silicon/S)
+/datum/ui_module/law_manager/New(var/mob/living/silicon/S)
..()
owner = S
@@ -27,7 +27,7 @@
if(laws.selectable)
player_laws += laws
-/datum/tgui_module/law_manager/tgui_act(action, list/params)
+/datum/ui_module/law_manager/ui_act(action, list/params)
if(..())
return
@@ -144,13 +144,13 @@
to_chat(usr, "Laws displayed.")
-/datum/tgui_module/law_manager/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_default_state)
+/datum/ui_module/law_manager/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)
if(!ui)
ui = new(user, src, ui_key, "LawManager", sanitize("[src] - [owner.name]"), 800, is_malf(user) ? 600 : 400, master_ui, state)
ui.open()
-/datum/tgui_module/law_manager/tgui_data(mob/user)
+/datum/ui_module/law_manager/ui_data(mob/user)
var/list/data = list()
owner.lawsync()
@@ -181,14 +181,14 @@
return data
-/datum/tgui_module/law_manager/proc/package_laws(var/list/data, var/field, var/list/datum/ai_law/laws)
+/datum/ui_module/law_manager/proc/package_laws(var/list/data, var/field, var/list/datum/ai_law/laws)
var/list/packaged_laws = list()
for(var/datum/ai_law/AL in laws)
packaged_laws[++packaged_laws.len] = list("law" = AL.law, "index" = AL.get_index(), "state" = owner.laws.get_state_law(AL), "ref" = "\ref[AL]")
data[field] = packaged_laws
data["has_[field]"] = packaged_laws.len
-/datum/tgui_module/law_manager/proc/package_multiple_laws(var/list/datum/ai_laws/laws)
+/datum/ui_module/law_manager/proc/package_multiple_laws(var/list/datum/ai_laws/laws)
var/list/law_sets = list()
for(var/datum/ai_laws/ALs in laws)
var/list/packaged_laws = list()
@@ -200,7 +200,7 @@
return law_sets
-/datum/tgui_module/law_manager/proc/is_malf(var/mob/user)
+/datum/ui_module/law_manager/proc/is_malf(var/mob/user)
return (is_admin(user) && !owner.is_slaved()) || is_special_character(owner)
/mob/living/silicon/proc/is_slaved()
@@ -209,7 +209,7 @@
/mob/living/silicon/robot/is_slaved()
return lawupdate && connected_ai ? sanitize(connected_ai.name) : null
-/datum/tgui_module/law_manager/proc/sync_laws(var/mob/living/silicon/ai/AI)
+/datum/ui_module/law_manager/proc/sync_laws(var/mob/living/silicon/ai/AI)
if(!AI)
return
for(var/mob/living/silicon/robot/R in AI.connected_robots)
diff --git a/code/modules/tgui/modules/power_monitor.dm b/code/modules/tgui/modules/power_monitor.dm
index 1b959ec72cb..4ef678768fa 100644
--- a/code/modules/tgui/modules/power_monitor.dm
+++ b/code/modules/tgui/modules/power_monitor.dm
@@ -1,23 +1,23 @@
-/datum/tgui_module/power_monitor
+/datum/ui_module/power_monitor
name = "Power monitor"
var/select_monitor = FALSE
var/obj/machinery/computer/monitor/powermonitor
-/datum/tgui_module/power_monitor/digital
+/datum/ui_module/power_monitor/digital
select_monitor = TRUE
-/datum/tgui_module/power_monitor/New()
+/datum/ui_module/power_monitor/New()
..()
if(!select_monitor)
- powermonitor = tgui_host()
+ powermonitor = ui_host()
-/datum/tgui_module/power_monitor/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_default_state)
+/datum/ui_module/power_monitor/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)
if(!ui)
ui = new(user, src, ui_key, "PowerMonitor", name, 600, 650, master_ui, state)
ui.open()
-/datum/tgui_module/power_monitor/tgui_data(mob/user)
+/datum/ui_module/power_monitor/ui_data(mob/user)
var/list/data = list()
// Sanity check
@@ -40,7 +40,7 @@
return data
-/datum/tgui_module/power_monitor/tgui_act(action, list/params)
+/datum/ui_module/power_monitor/ui_act(action, list/params)
if(..())
return
diff --git a/code/modules/tgui/plugins/login.dm b/code/modules/tgui/plugins/login.dm
index 044ab46fad7..e558cc118be 100644
--- a/code/modules/tgui/plugins/login.dm
+++ b/code/modules/tgui/plugins/login.dm
@@ -4,52 +4,52 @@
* Allows the handling of logins using IDs within tgui.
*
* Two key procs:
- * * [/obj/proc/tgui_login_act] - Call in your tgui_act() proc to catch any login actions and handle them.
- * * [/obj/proc/tgui_login_data] - Call in your tgui_data() proc to pass login info.
+ * * [/obj/proc/ui_login_act] - Call in your ui_act() proc to catch any login actions and handle them.
+ * * [/obj/proc/ui_login_data] - Call in your ui_data() proc to pass login info.
*
* How to use (DM side):
- * 1. Call [/obj/proc/tgui_login_act] at the start of your tgui_act() proc
- * 2. Call [/obj/proc/tgui_login_data] in your tgui_data() proc while passing the data list
- * 3. In your object, call [/obj/proc/tgui_login_get] to get the current login state.
- * 4. Optional: call [/obj/proc/tgui_login_attackby] in your attackby() to make the login process easier.
+ * 1. Call [/obj/proc/ui_login_act] at the start of your ui_act() proc
+ * 2. Call [/obj/proc/ui_login_data] in your ui_data() proc while passing the data list
+ * 3. In your object, call [/obj/proc/ui_login_get] to get the current login state.
+ * 4. Optional: call [/obj/proc/ui_login_attackby] in your attackby() to make the login process easier.
*
* How to use (JS side): Use the and interfaces.
*/
-GLOBAL_LIST(tgui_logins)
+GLOBAL_LIST(ui_logins)
/**
- * Call this from a proc that is called in tgui_act() to process login actions
+ * Call this from a proc that is called in ui_act() to process login actions
*
* Arguments:
* * action - The called action
* * params - The params to the action
*/
-/obj/proc/tgui_login_act(action = "", params)
+/obj/proc/ui_login_act(action = "", params)
. = null
switch(action)
if("login_insert")
- var/datum/tgui_login/state = tgui_login_get()
+ var/datum/ui_login/state = ui_login_get()
if(state.id) // An ID is already inserted, eject it
- return tgui_login_eject(state = state)
+ return ui_login_eject(state = state)
else // No ID, attempt to insert one in
- return tgui_login_insert(usr.get_active_hand(), state = state)
+ return ui_login_insert(usr.get_active_hand(), state = state)
if("login_eject")
- return tgui_login_eject()
+ return ui_login_eject()
if("login_login")
- return tgui_login_login(text2num(params["login_type"]))
+ return ui_login_login(text2num(params["login_type"]))
if("login_logout")
- return tgui_login_logout()
+ return ui_login_logout()
/**
* Appends login state data.
*
* Arguments:
* * data - The data list to be returned
- * * user - The user calling tgui_data()
+ * * user - The user calling ui_data()
* * state - The current login state
*/
-/obj/proc/tgui_login_data(list/data, mob/user, datum/tgui_login/state = tgui_login_get())
+/obj/proc/ui_login_data(list/data, mob/user, datum/ui_login/state = ui_login_get())
data["loginState"] = list(
"id" = state.id ? state.id.name : null,
"name" = state.name,
@@ -68,9 +68,9 @@ GLOBAL_LIST(tgui_logins)
* * O - The object
* * user - The user
*/
-/obj/proc/tgui_login_attackby(obj/item/O, mob/user)
- if(istype(O, /obj/item/card/id) && tgui_login_insert(O))
- tgui_interact(user)
+/obj/proc/ui_login_attackby(obj/item/O, mob/user)
+ if(istype(O, /obj/item/card/id) && ui_login_insert(O))
+ ui_interact(user)
return TRUE
/**
@@ -80,7 +80,7 @@ GLOBAL_LIST(tgui_logins)
* * O - The object to try inserting
* * state - The current login state
*/
-/obj/proc/tgui_login_insert(obj/item/O, datum/tgui_login/state = tgui_login_get())
+/obj/proc/ui_login_insert(obj/item/O, datum/ui_login/state = ui_login_get())
if(state.id)
return
@@ -100,7 +100,7 @@ GLOBAL_LIST(tgui_logins)
* Arguments:
* * state - The current login state
*/
-/obj/proc/tgui_login_eject(datum/tgui_login/state = tgui_login_get())
+/obj/proc/ui_login_eject(datum/ui_login/state = ui_login_get())
if(!state.id)
return
@@ -121,7 +121,7 @@ GLOBAL_LIST(tgui_logins)
* * login_type - The login type: LOGIN_TYPE_NORMAL (checks for inserted ID), LOGIN_TYPE_AI, LOGIN_TYPE_ROBOT and LOGIN_TYPE_ADMIN
* * state - The current login state
*/
-/obj/proc/tgui_login_login(login_type = LOGIN_TYPE_NORMAL, datum/tgui_login/state = tgui_login_get())
+/obj/proc/ui_login_login(login_type = LOGIN_TYPE_NORMAL, datum/ui_login/state = ui_login_get())
if(state.logged_in)
return
@@ -146,7 +146,7 @@ GLOBAL_LIST(tgui_logins)
state.access = get_all_accesses() + get_all_centcom_access()
state.logged_in = TRUE
- tgui_login_on_login(state = state)
+ ui_login_on_login(state = state)
return TRUE
@@ -156,7 +156,7 @@ GLOBAL_LIST(tgui_logins)
* Arguments:
* * state - The current login state
*/
-/obj/proc/tgui_login_logout(datum/tgui_login/state = tgui_login_get())
+/obj/proc/ui_login_logout(datum/ui_login/state = ui_login_get())
if(!state.logged_in)
return
@@ -164,7 +164,7 @@ GLOBAL_LIST(tgui_logins)
state.rank = ""
state.access = null
state.logged_in = FALSE
- tgui_login_on_logout(state = state)
+ ui_login_on_logout(state = state)
return TRUE
@@ -174,12 +174,12 @@ GLOBAL_LIST(tgui_logins)
* Arguments:
* * state - The current login state
*/
-/obj/proc/tgui_login_get()
- RETURN_TYPE(/datum/tgui_login)
- . = LAZYACCESS(GLOB.tgui_logins, UID())
+/obj/proc/ui_login_get()
+ RETURN_TYPE(/datum/ui_login)
+ . = LAZYACCESS(GLOB.ui_logins, UID())
if(!.)
- LAZYINITLIST(GLOB.tgui_logins)
- . = GLOB.tgui_logins[UID()] = new /datum/tgui_login
+ LAZYINITLIST(GLOB.ui_logins)
+ . = GLOB.ui_logins[UID()] = new /datum/ui_login
/**
* Called on successful login.
@@ -187,7 +187,7 @@ GLOBAL_LIST(tgui_logins)
* Arguments:
* * state - The current login state
*/
-/obj/proc/tgui_login_on_login(datum/tgui_login/state = tgui_login_get())
+/obj/proc/ui_login_on_login(datum/ui_login/state = ui_login_get())
return
/**
@@ -196,20 +196,20 @@ GLOBAL_LIST(tgui_logins)
* Arguments:
* * state - The current login state
*/
-/obj/proc/tgui_login_on_logout(datum/tgui_login/state = tgui_login_get())
+/obj/proc/ui_login_on_logout(datum/ui_login/state = ui_login_get())
return
/**
* Login state (there should be only one for one datum)
*/
-/datum/tgui_login
+/datum/ui_login
var/obj/item/card/id/id = null
var/name = ""
var/rank = ""
var/list/access = null
var/logged_in = FALSE
-/datum/tgui_login/New(id, name, rank, access)
+/datum/ui_login/New(id, name, rank, access)
src.id = id
src.name = name
src.rank = rank
diff --git a/code/modules/tgui/plugins/modal.dm b/code/modules/tgui/plugins/modal.dm
index f09f54f627c..4f42cd76a2b 100644
--- a/code/modules/tgui/plugins/modal.dm
+++ b/code/modules/tgui/plugins/modal.dm
@@ -1,15 +1,15 @@
/**
- * tgui modals
+ * ui modals
*
* Allows creation of modals within tgui.
*/
-GLOBAL_LIST(tgui_modals)
+GLOBAL_LIST(ui_modals)
/**
- * Call this from a proc that is called in tgui_act() to process modal actions
+ * Call this from a proc that is called in ui_act() to process modal actions
*
- * Example: /obj/machinery/chem_master/proc/tgui_act_modal
+ * Example: /obj/machinery/chem_master/proc/ui_act_modal
* You can then switch based on the return value and show different
* modals depending on the answer.
* Arguments:
@@ -17,34 +17,34 @@ GLOBAL_LIST(tgui_modals)
* * action - The called action
* * params - The params to the action
*/
-/datum/proc/tgui_modal_act(datum/source = src, action = "", params)
+/datum/proc/ui_modal_act(datum/source = src, action = "", params)
ASSERT(istype(source))
. = null
switch(action)
if("modal_open") // Params: id, arguments
- return TGUI_MODAL_OPEN
+ return UI_MODAL_OPEN
if("modal_answer") // Params: id, answer, arguments
- params["answer"] = tgui_modal_preprocess_answer(source, params["answer"])
- if(tgui_modal_answer(source, params["id"], params["answer"])) // If there's a current modal with a delegate that returned TRUE, no need to continue
- . = TGUI_MODAL_DELEGATE
+ params["answer"] = ui_modal_preprocess_answer(source, params["answer"])
+ if(ui_modal_answer(source, params["id"], params["answer"])) // If there's a current modal with a delegate that returned TRUE, no need to continue
+ . = UI_MODAL_DELEGATE
else
- . = TGUI_MODAL_ANSWER
- tgui_modal_clear(source)
+ . = UI_MODAL_ANSWER
+ ui_modal_clear(source)
if("modal_close") // Params: id
- tgui_modal_clear(source)
- return TGUI_MODAL_CLOSE
+ ui_modal_clear(source)
+ return UI_MODAL_CLOSE
/**
- * Call this from tgui_data() to return modal information if needed
+ * Call this from ui_data() to return modal information if needed
* Arguments:
* * source - The source datum
*/
-/datum/proc/tgui_modal_data(datum/source = src)
+/datum/proc/ui_modal_data(datum/source = src)
ASSERT(istype(source))
- var/datum/tgui_modal/current = LAZYACCESS(GLOB.tgui_modals, source.UID())
+ var/datum/ui_modal/current = LAZYACCESS(GLOB.ui_modals, source.UID())
if(!current)
return null
@@ -56,25 +56,25 @@ GLOBAL_LIST(tgui_modals)
* Arguments:
* * source - The source datum
*/
-/datum/proc/tgui_modal_clear(datum/source = src)
+/datum/proc/ui_modal_clear(datum/source = src)
ASSERT(istype(source))
- LAZYINITLIST(GLOB.tgui_modals)
- var/datum/tgui_modal/previous = GLOB.tgui_modals[source.UID()]
+ LAZYINITLIST(GLOB.ui_modals)
+ var/datum/ui_modal/previous = GLOB.ui_modals[source.UID()]
if(!previous)
return FALSE
- for(var/i in 1 to length(GLOB.tgui_modals))
- var/key = GLOB.tgui_modals[i]
- if(previous == GLOB.tgui_modals[key])
- GLOB.tgui_modals.Cut(i, i + 1)
+ for(var/i in 1 to length(GLOB.ui_modals))
+ var/key = GLOB.ui_modals[i]
+ if(previous == GLOB.ui_modals[key])
+ GLOB.ui_modals.Cut(i, i + 1)
break
SStgui.update_uis(source)
return TRUE
/**
- * Opens a message TGUI modal
+ * Opens a message UI modal
*
* Arguments:
* * source - The source datum
@@ -83,14 +83,14 @@ GLOBAL_LIST(tgui_modals)
* * delegate - The proc to call when closed
* * arguments - List of arguments passed to and from JS (mostly useful for chaining modals)
*/
-/datum/proc/tgui_modal_message(datum/source = src, id, text = "Default modal message", delegate, arguments)
+/datum/proc/ui_modal_message(datum/source = src, id, text = "Default modal message", delegate, arguments)
ASSERT(length(id))
- var/datum/tgui_modal/modal = new(id, text, delegate, arguments)
- return tgui_modal_new(source, modal)
+ var/datum/ui_modal/modal = new(id, text, delegate, arguments)
+ return ui_modal_new(source, modal)
/**
- * Opens a text input TGUI modal
+ * Opens a text input UI modal
*
* Arguments:
* * source - The source datum
@@ -101,15 +101,15 @@ GLOBAL_LIST(tgui_modals)
* * value - The default value of the input
* * max_length - The maximum char length of the input
*/
-/datum/proc/tgui_modal_input(datum/source = src, id, text = "Default modal message", delegate, arguments, value = "", max_length = TGUI_MODAL_INPUT_MAX_LENGTH)
+/datum/proc/ui_modal_input(datum/source = src, id, text = "Default modal message", delegate, arguments, value = "", max_length = UI_MODAL_INPUT_MAX_LENGTH)
ASSERT(length(id))
ASSERT(max_length > 0)
- var/datum/tgui_modal/input/modal = new(id, text, delegate, arguments, value, max_length)
- return tgui_modal_new(source, modal)
+ var/datum/ui_modal/input/modal = new(id, text, delegate, arguments, value, max_length)
+ return ui_modal_new(source, modal)
/**
- * Opens a dropdown input TGUI modal
+ * Opens a dropdown input UI modal
*
* Internally checks if the answer is in the list of choices.
* Arguments:
@@ -121,14 +121,14 @@ GLOBAL_LIST(tgui_modals)
* * value - The default value of the dropdown
* * choices - The list of available choices in the dropdown
*/
-/datum/proc/tgui_modal_choice(datum/source = src, id, text = "Default modal message", delegate, arguments, value = "", choices)
+/datum/proc/ui_modal_choice(datum/source = src, id, text = "Default modal message", delegate, arguments, value = "", choices)
ASSERT(length(id))
- var/datum/tgui_modal/input/choice/modal = new(id, text, delegate, arguments, value, choices)
- return tgui_modal_new(source, modal)
+ var/datum/ui_modal/input/choice/modal = new(id, text, delegate, arguments, value, choices)
+ return ui_modal_new(source, modal)
/**
- * Opens a bento input TGUI modal
+ * Opens a bento input UI modal
*
* Internally checks if the answer is in the list of choices.
* Arguments:
@@ -140,14 +140,14 @@ GLOBAL_LIST(tgui_modals)
* * value - The default value of the bento
* * choices - The list of available choices in the bento
*/
-/datum/proc/tgui_modal_bento(datum/source = src, id, text = "Default modal message", delegate, arguments, value, choices)
+/datum/proc/ui_modal_bento(datum/source = src, id, text = "Default modal message", delegate, arguments, value, choices)
ASSERT(length(id))
- var/datum/tgui_modal/input/bento/modal = new(id, text, delegate, arguments, value, choices)
- return tgui_modal_new(source, modal)
+ var/datum/ui_modal/input/bento/modal = new(id, text, delegate, arguments, value, choices)
+ return ui_modal_new(source, modal)
/**
- * Opens a yes/no TGUI modal
+ * Opens a yes/no UI modal
*
* Arguments:
* * source - The source datum
@@ -159,33 +159,33 @@ GLOBAL_LIST(tgui_modals)
* * yes_text - The text to show in the "Yes" button
* * no_text - The text to show in the "No" button
*/
-/datum/proc/tgui_modal_boolean(datum/source = src, id, text = "Default modal message", delegate, delegate_no, arguments, yes_text = "Yes", no_text = "No")
+/datum/proc/ui_modal_boolean(datum/source = src, id, text = "Default modal message", delegate, delegate_no, arguments, yes_text = "Yes", no_text = "No")
ASSERT(length(id))
- var/datum/tgui_modal/boolean/modal = new(id, text, delegate, delegate_no, arguments, yes_text, no_text)
- return tgui_modal_new(source, modal)
+ var/datum/ui_modal/boolean/modal = new(id, text, delegate, delegate_no, arguments, yes_text, no_text)
+ return ui_modal_new(source, modal)
/**
* Registers a given modal to a source. Private.
*
* Arguments:
* * source - The source datum
- * * modal - The datum/tgui_modal to register
+ * * modal - The datum/ui_modal to register
* * replace_previous - Whether any modal currently assigned to source should be replaced
* * instant_update - Whether the changes should reflect immediately
*/
-/datum/proc/tgui_modal_new(datum/source = src, datum/tgui_modal/modal = null, replace_previous = TRUE, instant_update = TRUE)
+/datum/proc/ui_modal_new(datum/source = src, datum/ui_modal/modal = null, replace_previous = TRUE, instant_update = TRUE)
ASSERT(istype(source))
ASSERT(istype(modal))
- var/datum/tgui_modal/previous = LAZYACCESS(GLOB.tgui_modals, source.UID())
+ var/datum/ui_modal/previous = LAZYACCESS(GLOB.ui_modals, source.UID())
if(previous && !replace_previous)
return FALSE
modal.owning_source = source
// Previous one should get GC'd
- LAZYSET(GLOB.tgui_modals, source.UID(), modal)
+ LAZYSET(GLOB.ui_modals, source.UID(), modal)
if(instant_update)
SStgui.update_uis(source)
return TRUE
@@ -198,10 +198,10 @@ GLOBAL_LIST(tgui_modals)
* * id - The ID of the modal
* * answer - The provided answer
*/
-/datum/proc/tgui_modal_answer(datum/source = src, id, answer = "")
+/datum/proc/ui_modal_answer(datum/source = src, id, answer = "")
ASSERT(istype(source))
- var/datum/tgui_modal/current = LAZYACCESS(GLOB.tgui_modals, source.UID())
+ var/datum/ui_modal/current = LAZYACCESS(GLOB.ui_modals, source.UID())
if(!current)
return FALSE
@@ -216,10 +216,10 @@ GLOBAL_LIST(tgui_modals)
* * source - The source datum
* * answer - The provided answer
*/
-/datum/proc/tgui_modal_preprocess_answer(datum/source = src, answer = "")
+/datum/proc/ui_modal_preprocess_answer(datum/source = src, answer = "")
ASSERT(istype(source))
- var/datum/tgui_modal/current = LAZYACCESS(GLOB.tgui_modals, source.UID())
+ var/datum/ui_modal/current = LAZYACCESS(GLOB.ui_modals, source.UID())
if(!current)
return answer
@@ -228,7 +228,7 @@ GLOBAL_LIST(tgui_modals)
/**
* Modal datum (contains base information for a modal)
*/
-/datum/tgui_modal
+/datum/ui_modal
var/datum/owning_source
var/id
var/text
@@ -236,7 +236,7 @@ GLOBAL_LIST(tgui_modals)
var/list/arguments
var/modal_type = "message"
-/datum/tgui_modal/New(id, text, delegate, list/arguments)
+/datum/ui_modal/New(id, text, delegate, list/arguments)
src.id = id
src.text = text
src.delegate = delegate
@@ -248,8 +248,8 @@ GLOBAL_LIST(tgui_modals)
* Arguments:
* * answer - The answer, a nullable text
*/
-/datum/tgui_modal/proc/preprocess_answer(answer)
- return reject_bad_text(answer, TGUI_MODAL_INPUT_MAX_LENGTH) // bleh
+/datum/ui_modal/proc/preprocess_answer(answer)
+ return reject_bad_text(answer, UI_MODAL_INPUT_MAX_LENGTH) // bleh
/**
* Called when a modal receives an answer
@@ -257,7 +257,7 @@ GLOBAL_LIST(tgui_modals)
* Arguments:
* * answer - The answer, a nullable text
*/
-/datum/tgui_modal/proc/on_answer(answer)
+/datum/ui_modal/proc/on_answer(answer)
if(delegate)
return call(owning_source, delegate)(answer, arguments)
return FALSE
@@ -265,7 +265,7 @@ GLOBAL_LIST(tgui_modals)
/**
* Creates a list that describes a modal visually to be passed to JS
*/
-/datum/tgui_modal/proc/to_data()
+/datum/ui_modal/proc/to_data()
. = list()
.["id"] = id
.["text"] = text
@@ -275,42 +275,42 @@ GLOBAL_LIST(tgui_modals)
/**
* Input modal - has a text entry that can be used to enter an answer
*/
-/datum/tgui_modal/input
+/datum/ui_modal/input
modal_type = "input"
var/value
var/max_length
-/datum/tgui_modal/input/New(id, text, delegate, list/arguments, value, max_length)
+/datum/ui_modal/input/New(id, text, delegate, list/arguments, value, max_length)
..(id, text, delegate, arguments)
src.value = value
src.max_length = max_length
-/datum/tgui_modal/input/preprocess_answer(answer)
+/datum/ui_modal/input/preprocess_answer(answer)
. = ..(answer)
if(length(answer) > max_length)
. = copytext(., 1, max_length + 1)
-/datum/tgui_modal/input/to_data()
+/datum/ui_modal/input/to_data()
. = ..()
.["value"] = value
/**
* Choice modal - has a dropdown menu that can be used to select an answer
*/
-/datum/tgui_modal/input/choice
+/datum/ui_modal/input/choice
modal_type = "choice"
var/choices
-/datum/tgui_modal/input/choice/New(id, text, delegate, list/arguments, value, choices)
- ..(id, text, delegate, arguments, value, TGUI_MODAL_INPUT_MAX_LENGTH) // Max length doesn't really matter in dropdowns, but whatever
+/datum/ui_modal/input/choice/New(id, text, delegate, list/arguments, value, choices)
+ ..(id, text, delegate, arguments, value, UI_MODAL_INPUT_MAX_LENGTH) // Max length doesn't really matter in dropdowns, but whatever
src.choices = choices
-/datum/tgui_modal/input/choice/on_answer(answer)
+/datum/ui_modal/input/choice/on_answer(answer)
if(answer in choices) // Make sure the answer is actually in our choices!
return ..(answer, arguments)
return FALSE
-/datum/tgui_modal/input/choice/to_data()
+/datum/ui_modal/input/choice/to_data()
. = ..()
.["choices"] = choices
@@ -319,52 +319,52 @@ GLOBAL_LIST(tgui_modals)
*
* The returned answer is the index of the choice.
*/
-/datum/tgui_modal/input/bento
+/datum/ui_modal/input/bento
modal_type = "bento"
var/choices
-/datum/tgui_modal/input/bento/New(id, text, delegate, list/arguments, value, choices)
- ..(id, text, delegate, arguments, text2num(value), TGUI_MODAL_INPUT_MAX_LENGTH) // Max length doesn't really matter in here, but whatever
+/datum/ui_modal/input/bento/New(id, text, delegate, list/arguments, value, choices)
+ ..(id, text, delegate, arguments, text2num(value), UI_MODAL_INPUT_MAX_LENGTH) // Max length doesn't really matter in here, but whatever
src.choices = choices
-/datum/tgui_modal/input/bento/preprocess_answer(answer)
+/datum/ui_modal/input/bento/preprocess_answer(answer)
return text2num(answer) || 0
-/datum/tgui_modal/input/bento/on_answer(answer)
+/datum/ui_modal/input/bento/on_answer(answer)
if(answer >= 1 && answer <= length(choices)) // Make sure the answer index is actually in our indexes!
return ..(answer, arguments)
return FALSE
-/datum/tgui_modal/input/bento/to_data()
+/datum/ui_modal/input/bento/to_data()
. = ..()
.["choices"] = choices
/**
* Boolean modal - has yes/no buttons that do different actions depending on which is pressed
*/
-/datum/tgui_modal/boolean
+/datum/ui_modal/boolean
modal_type = "boolean"
var/delegate_no
var/yes_text
var/no_text
-/datum/tgui_modal/boolean/New(id, text, delegate, delegate_no, list/arguments, yes_text, no_text)
+/datum/ui_modal/boolean/New(id, text, delegate, delegate_no, list/arguments, yes_text, no_text)
..(id, text, delegate, arguments)
src.delegate_no = delegate_no
src.yes_text = yes_text
src.no_text = no_text
-/datum/tgui_modal/boolean/preprocess_answer(answer)
+/datum/ui_modal/boolean/preprocess_answer(answer)
return text2num(answer) || FALSE
-/datum/tgui_modal/boolean/on_answer(answer)
+/datum/ui_modal/boolean/on_answer(answer)
if(answer)
return ..(answer, arguments)
else if(delegate_no)
return call(owning_source, delegate_no)(arguments)
return FALSE
-/datum/tgui_modal/boolean/to_data()
+/datum/ui_modal/boolean/to_data()
. = ..()
.["yes_text"] = yes_text
.["no_text"] = no_text
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index 81152426d06..196f2bc4ccb 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -4,6 +4,7 @@
* Base state and helpers for states. Just does some sanity checks, implement a state for in-depth checks.
*/
+
/**
* public
*
@@ -14,8 +15,8 @@
*
* return UI_state The state of the UI.
*/
-/datum/proc/tgui_status(mob/user, datum/tgui_state/state)
- var/src_object = tgui_host(user)
+/datum/proc/ui_status(mob/user, datum/ui_state/state)
+ var/src_object = ui_host(user)
. = STATUS_CLOSE
if(!state)
return
@@ -45,7 +46,7 @@
*
* return UI_state The state of the UI.
*/
-/datum/tgui_state/proc/can_use_topic(src_object, mob/user)
+/datum/ui_state/proc/can_use_topic(src_object, mob/user)
return STATUS_CLOSE // Don't allow interaction by default.
/**
@@ -55,7 +56,7 @@
*
* return UI_state The state of the UI.
*/
-/mob/proc/shared_tgui_interaction(src_object)
+/mob/proc/shared_ui_interaction(src_object)
if(!client) // Close UIs if mindless.
return STATUS_CLOSE
else if(stat) // Disable UIs if unconcious.
@@ -64,12 +65,12 @@
return STATUS_UPDATE
return STATUS_INTERACTIVE
-/mob/living/silicon/ai/shared_tgui_interaction(src_object)
+/mob/living/silicon/ai/shared_ui_interaction(src_object)
if(lacks_power()) // Disable UIs if the AI is unpowered.
return STATUS_DISABLED
return ..()
-/mob/living/silicon/robot/shared_tgui_interaction(src_object)
+/mob/living/silicon/robot/shared_ui_interaction(src_object)
if(!cell || cell.charge <= 0 || lockcharge) // Disable UIs if the Borg is unpowered or locked.
return STATUS_DISABLED
return ..()
@@ -86,8 +87,8 @@
*
* return UI_state The state of the UI.
*/
-/atom/proc/contents_tgui_distance(src_object, mob/living/user)
- return user.shared_living_tgui_distance(src_object) // Just call this mob's check.
+/atom/proc/contents_ui_distance(src_object, mob/living/user)
+ return user.shared_living_ui_distance(src_object) // Just call this mob's check.
/**
* public
@@ -98,7 +99,7 @@
*
* return UI_state The state of the UI.
*/
-/mob/living/proc/shared_living_tgui_distance(atom/movable/src_object, viewcheck = TRUE)
+/mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE)
if(viewcheck && !(src_object in view(src))) // If the object is obscured, close it.
return STATUS_CLOSE
@@ -111,7 +112,7 @@
return STATUS_DISABLED
return STATUS_CLOSE // Otherwise, we got nothing.
-/mob/living/carbon/human/shared_living_tgui_distance(atom/movable/src_object)
+/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object)
if((TK in mutations) && (get_dist(src, src_object) <= 2))
return STATUS_INTERACTIVE
return ..()
diff --git a/code/modules/tgui/states/admin.dm b/code/modules/tgui/states/admin.dm
index 6d1c680927a..3f32f47adde 100644
--- a/code/modules/tgui/states/admin.dm
+++ b/code/modules/tgui/states/admin.dm
@@ -1,12 +1,12 @@
- /**
- * tgui state: admin_state
- *
- * Checks that the user is an admin, end-of-story.
- **/
+/**
+ * tgui state: admin_state
+ *
+ * Checks that the user is an admin, end-of-story.
+ */
-GLOBAL_DATUM_INIT(tgui_admin_state, /datum/tgui_state/admin_state, new)
+GLOBAL_DATUM_INIT(admin_state, /datum/ui_state/admin_state, new)
-/datum/tgui_state/admin_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/admin_state/can_use_topic(src_object, mob/user)
if(check_rights_for(user.client, R_ADMIN))
return STATUS_INTERACTIVE
return STATUS_CLOSE
diff --git a/code/modules/tgui/states/always.dm b/code/modules/tgui/states/always.dm
index 30915785442..56b887a1699 100644
--- a/code/modules/tgui/states/always.dm
+++ b/code/modules/tgui/states/always.dm
@@ -1,11 +1,10 @@
+/**
+ * tgui state: always_state
+ *
+ * Always grants the user STATUS_INTERACTIVE. Period.
+ */
- /**
- * tgui state: always_state
- *
- * Always grants the user UI_INTERACTIVE. Period.
- **/
+GLOBAL_DATUM_INIT(always_state, /datum/ui_state/always_state, new)
-GLOBAL_DATUM_INIT(tgui_always_state, /datum/tgui_state/always_state, new)
-
-/datum/tgui_state/always_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/always_state/can_use_topic(src_object, mob/user)
return STATUS_INTERACTIVE
diff --git a/code/modules/tgui/states/conscious.dm b/code/modules/tgui/states/conscious.dm
index 6bc0c7ec031..272ae9de68e 100644
--- a/code/modules/tgui/states/conscious.dm
+++ b/code/modules/tgui/states/conscious.dm
@@ -1,12 +1,12 @@
- /**
- * tgui state: conscious_state
- *
- * Only checks if the user is conscious.
- **/
+/**
+ * tgui state: conscious_state
+ *
+ * Only checks if the user is conscious.
+ */
-GLOBAL_DATUM_INIT(tgui_conscious_state, /datum/tgui_state/conscious_state, new)
+GLOBAL_DATUM_INIT(conscious_state, /datum/ui_state/conscious_state, new)
-/datum/tgui_state/conscious_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/conscious_state/can_use_topic(src_object, mob/user)
if(user.stat == CONSCIOUS)
return STATUS_INTERACTIVE
return STATUS_CLOSE
diff --git a/code/modules/tgui/states/contained.dm b/code/modules/tgui/states/contained.dm
index 15853787d48..07225d79fb1 100644
--- a/code/modules/tgui/states/contained.dm
+++ b/code/modules/tgui/states/contained.dm
@@ -1,15 +1,15 @@
- /**
- * tgui state: contained_state
- *
- * Checks that the user is inside the src_object.
- **/
+/**
+ * tgui state: contained_state
+ *
+ * Checks that the user is inside the src_object.
+ */
-GLOBAL_DATUM_INIT(tgui_contained_state, /datum/tgui_state/contained_state, new)
+GLOBAL_DATUM_INIT(contained_state, /datum/ui_state/contained_state, new)
-/datum/tgui_state/contained_state/can_use_topic(atom/src_object, mob/user)
+/datum/ui_state/contained_state/can_use_topic(atom/src_object, mob/user)
if(!src_object.contains(user))
return STATUS_CLOSE
- return user.shared_tgui_interaction(src_object)
+ return user.shared_ui_interaction(src_object)
/atom/proc/contains(atom/location)
if(!location)
diff --git a/code/modules/tgui/states/deep_inventory.dm b/code/modules/tgui/states/deep_inventory.dm
index 137f262a0ea..be2ea4c1bfd 100644
--- a/code/modules/tgui/states/deep_inventory.dm
+++ b/code/modules/tgui/states/deep_inventory.dm
@@ -1,12 +1,12 @@
- /**
- * tgui state: deep_inventory_state
- *
- * Checks that the src_object is in the user's deep (backpack, box, toolbox, etc) inventory.
- **/
+/**
+ * tgui state: deep_inventory_state
+ *
+ * Checks that the src_object is in the user's deep (backpack, box, toolbox, etc) inventory.
+ */
-GLOBAL_DATUM_INIT(tgui_deep_inventory_state, /datum/tgui_state/deep_inventory_state, new)
+GLOBAL_DATUM_INIT(deep_inventory_state, /datum/ui_state/deep_inventory_state, new)
-/datum/tgui_state/deep_inventory_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/deep_inventory_state/can_use_topic(src_object, mob/user)
if(!user.contains(src_object))
return STATUS_CLOSE
- return user.shared_tgui_interaction(src_object)
+ return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm
index 4067d6fc15b..c72d7f826c2 100644
--- a/code/modules/tgui/states/default.dm
+++ b/code/modules/tgui/states/default.dm
@@ -1,31 +1,31 @@
- /**
- * tgui state: default_state
- *
- * Checks a number of things -- mostly physical distance for humans and view for robots.
- **/
+/**
+ * tgui state: default_state
+ *
+ * Checks a number of things -- mostly physical distance for humans and view for robots.
+ */
-GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new)
+GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
-/datum/tgui_state/default/can_use_topic(src_object, mob/user)
- return user.default_can_use_tgui_topic(src_object) // Call the individual mob-overridden procs.
+/datum/ui_state/default/can_use_topic(src_object, mob/user)
+ return user.default_can_use_topic(src_object) // Call the individual mob-overridden procs.
-/mob/proc/default_can_use_tgui_topic(src_object)
+/mob/proc/default_can_use_topic(src_object)
return STATUS_CLOSE // Don't allow interaction by default.
-/mob/living/default_can_use_tgui_topic(src_object)
- . = shared_tgui_interaction(src_object)
+/mob/living/default_can_use_topic(src_object)
+ . = shared_ui_interaction(src_object)
if(. > STATUS_CLOSE && loc)
- . = min(., loc.contents_tgui_distance(src_object, src)) // Check the distance...
+ . = min(., loc.contents_ui_distance(src_object, src)) // Check the distance...
if(. == STATUS_INTERACTIVE) // Non-human living mobs can only look, not touch.
return STATUS_UPDATE
-/mob/living/carbon/human/default_can_use_tgui_topic(src_object)
- . = shared_tgui_interaction(src_object)
+/mob/living/carbon/human/default_can_use_topic(src_object)
+ . = shared_ui_interaction(src_object)
if(. > STATUS_CLOSE)
- . = min(., shared_living_tgui_distance(src_object)) // Check the distance...
+ . = min(., shared_living_ui_distance(src_object)) // Check the distance...
-/mob/living/silicon/robot/default_can_use_tgui_topic(src_object)
- . = shared_tgui_interaction(src_object)
+/mob/living/silicon/robot/default_can_use_topic(src_object)
+ . = shared_ui_interaction(src_object)
if(. <= STATUS_DISABLED)
return
@@ -35,8 +35,8 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new)
return STATUS_INTERACTIVE
return STATUS_DISABLED // Otherwise they can keep the UI open.
-/mob/living/silicon/ai/default_can_use_tgui_topic(src_object)
- . = shared_tgui_interaction(src_object)
+/mob/living/silicon/ai/default_can_use_topic(src_object)
+ . = shared_ui_interaction(src_object)
if(. < STATUS_INTERACTIVE)
return
@@ -45,22 +45,14 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new)
return STATUS_INTERACTIVE
return STATUS_CLOSE
-/mob/living/simple_animal/revenant/default_can_use_tgui_topic(src_object)
- return STATUS_UPDATE
-
-/mob/living/simple_animal/default_can_use_tgui_topic(src_object)
- . = shared_tgui_interaction(src_object)
+/mob/living/simple_animal/default_can_use_topic(src_object)
+ . = shared_ui_interaction(src_object)
if(. > STATUS_CLOSE)
- . = min(., shared_living_tgui_distance(src_object)) //simple animals can only use things they're near.
+ . = min(., shared_living_ui_distance(src_object)) //simple animals can only use things they're near.
-/mob/living/silicon/pai/default_can_use_tgui_topic(src_object)
+/mob/living/silicon/pai/default_can_use_topic(src_object)
// pAIs can only use themselves and the owner's radio.
if((src_object == src || src_object == radio) && !stat)
return STATUS_INTERACTIVE
else
return ..()
-
-/mob/dead/observer/default_can_use_tgui_topic()
- if(can_admin_interact())
- return STATUS_INTERACTIVE // Admins are more equal
- return STATUS_UPDATE // Ghosts can view updates
diff --git a/code/modules/tgui/states/hands.dm b/code/modules/tgui/states/hands.dm
index 9ad6340eea1..1a5d67c3a50 100644
--- a/code/modules/tgui/states/hands.dm
+++ b/code/modules/tgui/states/hands.dm
@@ -1,28 +1,25 @@
- /**
- * tgui state: hands_state
- *
- * Checks that the src_object is in the user's hands.
- **/
+/**
+ * tgui state: hands_state
+ *
+ * Checks that the src_object is in the user's hands.
+ */
-GLOBAL_DATUM_INIT(tgui_hands_state, /datum/tgui_state/hands_state, new)
+GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new)
-/datum/tgui_state/hands_state/can_use_topic(src_object, mob/user)
- . = user.shared_tgui_interaction(src_object)
+/datum/ui_state/hands_state/can_use_topic(src_object, mob/user)
+ . = user.shared_ui_interaction(src_object)
if(. > STATUS_CLOSE)
- return min(., user.hands_can_use_tgui_topic(src_object))
+ return min(., user.hands_can_use_topic(src_object))
-/mob/proc/hands_can_use_tgui_topic(src_object)
+/mob/proc/hands_can_use_topic(src_object)
return STATUS_CLOSE
-/mob/living/hands_can_use_tgui_topic(src_object)
+/mob/living/hands_can_use_topic(src_object)
if(is_in_active_hand(src_object) || is_in_inactive_hand(src_object))
return STATUS_INTERACTIVE
return STATUS_CLOSE
-/mob/living/simple_animal/revenant/hands_can_use_tgui_topic(src_object)
- return STATUS_UPDATE
-
-/mob/living/silicon/robot/hands_can_use_tgui_topic(src_object)
+/mob/living/silicon/robot/hands_can_use_topic(src_object)
if(activated(src_object))
return STATUS_INTERACTIVE
return STATUS_CLOSE
diff --git a/code/modules/tgui/states/human_adjacent.dm b/code/modules/tgui/states/human_adjacent.dm
index 8164d5f9cee..8b489ab1309 100644
--- a/code/modules/tgui/states/human_adjacent.dm
+++ b/code/modules/tgui/states/human_adjacent.dm
@@ -1,15 +1,14 @@
+/**
+ * tgui state: human_adjacent_state
+ *
+ * In addition to default checks, only allows interaction for a
+ * human adjacent user.
+ */
- /**
- * tgui state: human_adjacent_state
- *
- * In addition to default checks, only allows interaction for a
- * human adjacent user.
- **/
+GLOBAL_DATUM_INIT(human_adjacent_state, /datum/ui_state/human_adjacent_state, new)
-GLOBAL_DATUM_INIT(tgui_human_adjacent_state, /datum/tgui_state/human_adjacent_state, new)
-
-/datum/tgui_state/human_adjacent_state/can_use_topic(src_object, mob/user)
- . = user.default_can_use_tgui_topic(src_object)
+/datum/ui_state/human_adjacent_state/can_use_topic(src_object, mob/user)
+ . = user.default_can_use_topic(src_object)
var/dist = get_dist(src_object, user)
if((dist > 1) || (!ishuman(user)))
diff --git a/code/modules/tgui/states/inventory.dm b/code/modules/tgui/states/inventory.dm
index 92274cc1f2e..e8bf8117e8d 100644
--- a/code/modules/tgui/states/inventory.dm
+++ b/code/modules/tgui/states/inventory.dm
@@ -1,12 +1,12 @@
- /**
- * tgui state: inventory_state
- *
- * Checks that the src_object is in the user's top-level (hand, ear, pocket, belt, etc) inventory.
- **/
+/**
+ * tgui state: inventory_state
+ *
+ * Checks that the src_object is in the user's top-level (hand, ear, pocket, belt, etc) inventory.
+ */
-GLOBAL_DATUM_INIT(tgui_inventory_state, /datum/tgui_state/inventory_state, new)
+GLOBAL_DATUM_INIT(inventory_state, /datum/ui_state/inventory_state, new)
-/datum/tgui_state/inventory_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/inventory_state/can_use_topic(src_object, mob/user)
if(!(src_object in user))
return STATUS_CLOSE
- return user.shared_tgui_interaction(src_object)
+ return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm
index 1185b516478..d6bdc4bac93 100644
--- a/code/modules/tgui/states/not_incapacitated.dm
+++ b/code/modules/tgui/states/not_incapacitated.dm
@@ -1,27 +1,27 @@
- /**
- * tgui state: not_incapacitated_state
- *
- * Checks that the user isn't incapacitated
- **/
+/**
+ * tgui state: not_incapacitated_state
+ *
+ * Checks that the user isn't incapacitated
+ */
-GLOBAL_DATUM_INIT(tgui_not_incapacitated_state, /datum/tgui_state/not_incapacitated_state, new)
+GLOBAL_DATUM_INIT(not_incapacitated_state, /datum/ui_state/not_incapacitated_state, new)
- /**
- * tgui state: not_incapacitated_turf_state
- *
- * Checks that the user isn't incapacitated and that their loc is a turf
- **/
+/**
+ * tgui state: not_incapacitated_turf_state
+ *
+ * Checks that the user isn't incapacitated and that their loc is a turf
+ */
-GLOBAL_DATUM_INIT(tgui_not_incapacitated_turf_state, /datum/tgui_state/not_incapacitated_state, new(no_turfs = TRUE))
+GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitated_state, new(no_turfs = TRUE))
-/datum/tgui_state/not_incapacitated_state
+/datum/ui_state/not_incapacitated_state
var/turf_check = FALSE
-/datum/tgui_state/not_incapacitated_state/New(loc, no_turfs = FALSE)
+/datum/ui_state/not_incapacitated_state/New(loc, no_turfs = FALSE)
..()
turf_check = no_turfs
-/datum/tgui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
if(user.stat)
return STATUS_CLOSE
if(user.incapacitated() || (turf_check && !isturf(user.loc)))
diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm
index 01811d427f2..859e45d3649 100644
--- a/code/modules/tgui/states/notcontained.dm
+++ b/code/modules/tgui/states/notcontained.dm
@@ -1,26 +1,26 @@
- /**
- * tgui state: notcontained_state
- *
- * Checks that the user is not inside src_object, and then makes the default checks.
- **/
+/**
+ * tgui state: notcontained_state
+ *
+ * Checks that the user is not inside src_object, and then makes the default checks.
+ */
-GLOBAL_DATUM_INIT(tgui_notcontained_state, /datum/tgui_state/notcontained_state, new)
+GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new)
-/datum/tgui_state/notcontained_state/can_use_topic(atom/src_object, mob/user)
- . = user.shared_tgui_interaction(src_object)
+/datum/ui_state/notcontained_state/can_use_topic(atom/src_object, mob/user)
+ . = user.shared_ui_interaction(src_object)
if(. > STATUS_CLOSE)
- return min(., user.notcontained_can_use_tgui_topic(src_object))
+ return min(., user.notcontained_can_use_topic(src_object))
-/mob/proc/notcontained_can_use_tgui_topic(src_object)
+/mob/proc/notcontained_can_use_topic(src_object)
return STATUS_CLOSE
-/mob/living/notcontained_can_use_tgui_topic(atom/src_object)
+/mob/living/notcontained_can_use_topic(atom/src_object)
if(src_object.contains(src))
return STATUS_CLOSE // Close if we're inside it.
- return default_can_use_tgui_topic(src_object)
+ return default_can_use_topic(src_object)
-/mob/living/silicon/notcontained_can_use_tgui_topic(src_object)
- return default_can_use_tgui_topic(src_object) // Silicons use default bevhavior.
+/mob/living/silicon/notcontained_can_use_topic(src_object)
+ return default_can_use_topic(src_object) // Silicons use default bevhavior.
-/mob/living/simple_animal/drone/notcontained_can_use_tgui_topic(src_object)
- return default_can_use_tgui_topic(src_object) // Drones use default bevhavior.
+/mob/living/simple_animal/drone/notcontained_can_use_topic(src_object)
+ return default_can_use_topic(src_object) // Drones use default bevhavior.
diff --git a/code/modules/tgui/states/observer.dm b/code/modules/tgui/states/observer.dm
index bf98f444654..af772ab7d61 100644
--- a/code/modules/tgui/states/observer.dm
+++ b/code/modules/tgui/states/observer.dm
@@ -1,12 +1,12 @@
- /**
- * tgui state: observer_state
- *
- * Checks that the user is an observer/ghost.
- **/
+/**
+ * tgui state: observer_state
+ *
+ * Checks that the user is an observer/ghost.
+ */
-GLOBAL_DATUM_INIT(tgui_observer_state, /datum/tgui_state/observer_state, new)
+GLOBAL_DATUM_INIT(observer_state, /datum/ui_state/observer_state, new)
-/datum/tgui_state/observer_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/observer_state/can_use_topic(src_object, mob/user)
if(isobserver(user))
return STATUS_INTERACTIVE
if(check_rights(R_ADMIN, 0, src))
diff --git a/code/modules/tgui/states/physical.dm b/code/modules/tgui/states/physical.dm
index dc30cb0d487..49a3844d0be 100644
--- a/code/modules/tgui/states/physical.dm
+++ b/code/modules/tgui/states/physical.dm
@@ -1,27 +1,24 @@
- /**
- * tgui state: physical_state
- *
- * Short-circuits the default state to only check physical distance.
- **/
+/**
+ * tgui state: physical_state
+ *
+ * Short-circuits the default state to only check physical distance.
+ */
-GLOBAL_DATUM_INIT(tgui_physical_state, /datum/tgui_state/physical, new)
+GLOBAL_DATUM_INIT(physical_state, /datum/ui_state/physical, new)
-/datum/tgui_state/physical/can_use_topic(src_object, mob/user)
- . = user.shared_tgui_interaction(src_object)
+/datum/ui_state/physical/can_use_topic(src_object, mob/user)
+ . = user.shared_ui_interaction(src_object)
if(. > STATUS_CLOSE)
- return min(., user.physical_can_use_tgui_topic(src_object))
+ return min(., user.physical_can_use_topic(src_object))
-/mob/proc/physical_can_use_tgui_topic(src_object)
+/mob/proc/physical_can_use_topic(src_object)
return STATUS_CLOSE
-/mob/living/simple_animal/revenant/physical_can_use_tgui_topic(src_object)
- return STATUS_UPDATE
+/mob/living/physical_can_use_topic(src_object)
+ return shared_living_ui_distance(src_object)
-/mob/living/physical_can_use_tgui_topic(src_object)
- return shared_living_tgui_distance(src_object)
+/mob/living/silicon/physical_can_use_topic(src_object)
+ return max(STATUS_UPDATE, shared_living_ui_distance(src_object)) // Silicons can always see.
-/mob/living/silicon/physical_can_use_tgui_topic(src_object)
- return max(STATUS_UPDATE, shared_living_tgui_distance(src_object)) // Silicons can always see.
-
-/mob/living/silicon/ai/physical_can_use_tgui_topic(src_object)
+/mob/living/silicon/ai/physical_can_use_topic(src_object)
return STATUS_UPDATE // AIs are not physical.
diff --git a/code/modules/tgui/states/self.dm b/code/modules/tgui/states/self.dm
index 109fd6ae440..d8b119f31ff 100644
--- a/code/modules/tgui/states/self.dm
+++ b/code/modules/tgui/states/self.dm
@@ -1,12 +1,12 @@
- /**
- * tgui state: self_state
- *
- * Only checks that the user and src_object are the same.
- **/
+/**
+ * tgui state: self_state
+ *
+ * Only checks that the user and src_object are the same.
+ */
-GLOBAL_DATUM_INIT(tgui_self_state, /datum/tgui_state/self_state, new)
+GLOBAL_DATUM_INIT(self_state, /datum/ui_state/self_state, new)
-/datum/tgui_state/self_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/self_state/can_use_topic(src_object, mob/user)
if(src_object != user)
return STATUS_CLOSE
- return user.shared_tgui_interaction(src_object)
+ return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui/states/zlevel.dm b/code/modules/tgui/states/zlevel.dm
index a589a4b64d7..892e5a0510e 100644
--- a/code/modules/tgui/states/zlevel.dm
+++ b/code/modules/tgui/states/zlevel.dm
@@ -1,12 +1,12 @@
- /**
- * tgui state: z_state
- *
- * Only checks that the Z-level of the user and src_object are the same.
- **/
+/**
+ * tgui state: z_state
+ *
+ * Only checks that the Z-level of the user and src_object are the same.
+ */
-GLOBAL_DATUM_INIT(tgui_z_state, /datum/tgui_state/z_state, new)
+GLOBAL_DATUM_INIT(z_state, /datum/ui_state/z_state, new)
-/datum/tgui_state/z_state/can_use_topic(src_object, mob/user)
+/datum/ui_state/z_state/can_use_topic(src_object, mob/user)
var/turf/turf_obj = get_turf(src_object)
var/turf/turf_usr = get_turf(user)
if(turf_obj && turf_usr && turf_obj.z == turf_usr.z)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index d9bf56b555c..605fd56e15f 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -37,7 +37,7 @@
/// The status/visibility of the UI.
var/status = STATUS_INTERACTIVE
/// Topic state used to determine status/interactability.
- var/datum/tgui_state/state = null
+ var/datum/ui_state/state = null
/// The parent UI.
var/datum/tgui/master_ui
/// Children of this UI.
@@ -60,7 +60,7 @@
*
* return datum/tgui The requested UI.
*/
-/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/datum/tgui/New(mob/user, datum/src_object, ui_key, interface, title, width = 0, height = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
src.user = user
src.src_object = src_object
src.ui_key = ui_key
@@ -115,7 +115,7 @@
var/html
html = SStgui.basehtml
// Allow the src object to override the html if needed
- html = src_object.tgui_base_html(html)
+ html = src_object.ui_base_html(html)
// Replace template tokens with important UI data
html = replacetextEx(html, "\[tgui:ref]", "[src.UID()]")
@@ -125,14 +125,14 @@
// Instruct the client to signal UI when the window is closed.
// NOTE: Intentional \ref usage; tgui datums can't/shouldn't
// be tagged, so this is an effective unwrap
- winset(user, window_id, "on-close=\"uiclose [UID()]\"")
+ winset(user, window_id, "on-close=\"uiclose \ref[src]\"")
// Pre-fetch initial state while browser is still loading in
// another thread
if(!initial_data)
- initial_data = src_object.tgui_data(user)
+ initial_data = src_object.ui_data(user)
if(!initial_static_data)
- initial_static_data = src_object.tgui_static_data(user)
+ initial_static_data = src_object.ui_static_data(user)
_initial_update = url_encode(get_json(initial_data, initial_static_data))
SStgui.on_open(src)
@@ -162,7 +162,7 @@
*/
/datum/tgui/proc/close()
user << browse(null, "window=[window_id]") // Close the window.
- src_object.tgui_close(user)
+ src_object.ui_close(user)
SStgui.on_close(src)
for(var/datum/tgui/child in children) // Loop through and close all children.
child.close()
@@ -200,7 +200,6 @@
"observer" = isobserver(user),
"window" = window_id,
"map" = (GLOB.using_map && GLOB.using_map.name) ? GLOB.using_map.name : "Unknown",
-
"ref" = "[src.UID()]"
)
@@ -260,12 +259,11 @@
log_message(params["log"])
if("tgui:link")
user << link(params["url"])
-
else
// Update the window state.
update_status(push = FALSE)
- // Call tgui_act() on the src_object.
- if(src_object.tgui_act(action, params, src, state))
+ // Call ui_act() on the src_object.
+ if(src_object.ui_act(action, params, src, state))
// Update if the object requested it.
SStgui.update_uis(src_object)
@@ -278,7 +276,7 @@
* optional force bool If the UI should be forced to update.
*/
/datum/tgui/process(force = FALSE)
- var/datum/host = src_object.tgui_host(user)
+ var/datum/host = src_object.ui_host(user)
if(!src_object || !host || !user) // If the object or user died (or something else), abort.
close()
return
@@ -319,7 +317,7 @@
* optional force_open bool If force_open should be passed to ui_interact.
*/
/datum/tgui/proc/update(force_open = FALSE)
- src_object.tgui_interact(user, ui_key, src, force_open, master_ui, state)
+ src_object.ui_interact(user, ui_key, src, force_open, master_ui, state)
/**
* private
@@ -329,10 +327,9 @@
* optional push bool Push an update to the UI (an update is always sent for UI_DISABLED).
*/
/datum/tgui/proc/update_status(push = FALSE)
- var/status = src_object.tgui_status(user, state)
+ var/status = src_object.ui_status(user, state)
if(master_ui)
status = min(status, master_ui.status)
-
set_status(status, push)
if(status == STATUS_CLOSE)
close()