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

Converts all tgui_ to ui_

Browse Source
This commit is contained in:
AffectedArc07
2020-11-21 12:10:58 +00:00
parent 984ac231e0
commit 54dd2765b4
153 changed files with 1185 additions and 1214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/shuttle.dm
+5 -5
View File
@@ -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")
code/modules/shuttle/shuttle_manipulator.dm
+4 -4
View File
@@ -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
code/modules/shuttle/supply.dm
+6 -6
View File
@@ -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