cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +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/instruments/objs/items/_instrument.dm
+7 -7
View File
@@ -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
code/modules/instruments/objs/items/headphones.dm
+7 -7
View File
@@ -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
code/modules/instruments/objs/structures/_musician.dm
+8 -8
View File
@@ -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)
code/modules/instruments/songs/_song_ui.dm
+4 -4
View File
@@ -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")