cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +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/mining/equipment/marker_beacons.dm
+4 -4
View File
@@ -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
code/modules/mining/laborcamp/laborstacker.dm
+4 -4
View File
@@ -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
code/modules/mining/machine_vending.dm
+10 -10
View File
@@ -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 ..()