cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +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/game/objects/structures/mirror.dm
+5 -5
View File
@@ -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)
code/game/objects/structures/safe.dm
+5 -5
View File
@@ -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, "<span class='warning'>You can't put [I] into the safe while it is closed!</span>")
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
code/game/objects/structures/tank_dispenser.dm
+5 -5
View File
@@ -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