mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-22 01:16:50 +01:00
nanoui ui_interact -> nanoui_ui_interact
This commit is contained in:
@@ -75,14 +75,14 @@
|
||||
*/
|
||||
|
||||
/obj/item/instrument/interact(mob/user)
|
||||
ui_interact(user)
|
||||
nano_ui_interact(user)
|
||||
|
||||
/obj/item/instrument/ui_interact(mob/living/user)
|
||||
/obj/item/instrument/nano_ui_interact(mob/living/user)
|
||||
if(!isliving(user) || user.stat || user.restrained())
|
||||
return
|
||||
|
||||
user.set_machine(src)
|
||||
song.ui_interact(user)
|
||||
song.nano_ui_interact(user)
|
||||
|
||||
/obj/item/instrument/violin
|
||||
name = "space violin"
|
||||
|
||||
@@ -29,11 +29,11 @@
|
||||
return
|
||||
if(!anchored)
|
||||
return
|
||||
ui_interact(user)
|
||||
nano_ui_interact(user)
|
||||
|
||||
/obj/structure/musician/ui_interact(mob/user)
|
||||
/obj/structure/musician/nano_ui_interact(mob/user)
|
||||
. = ..()
|
||||
song.ui_interact(user)
|
||||
song.nano_ui_interact(user)
|
||||
|
||||
/obj/structure/musician/attackby(obj/item/I, mob/living/user)
|
||||
if(I.is_wrench())
|
||||
|
||||
@@ -221,7 +221,7 @@
|
||||
|
||||
/// Updates the window for our user. Override in subtypes.
|
||||
/datum/song/proc/updateDialog(mob/user)
|
||||
ui_interact(user)
|
||||
nano_ui_interact(user)
|
||||
|
||||
/datum/song/process(wait)
|
||||
if(!playing)
|
||||
@@ -276,7 +276,7 @@
|
||||
/datum/song/handheld
|
||||
|
||||
/datum/song/handheld/updateDialog(mob/user)
|
||||
parent.ui_interact(user || usr)
|
||||
parent.nano_ui_interact(user || usr)
|
||||
|
||||
/datum/song/handheld/should_stop_playing(mob/user)
|
||||
. = ..()
|
||||
@@ -289,7 +289,7 @@
|
||||
/datum/song/stationary
|
||||
|
||||
/datum/song/stationary/updateDialog(mob/user)
|
||||
parent.ui_interact(user || usr)
|
||||
parent.nano_ui_interact(user || usr)
|
||||
|
||||
/datum/song/stationary/should_stop_playing(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
. += "<a href='?src=[REF(src)];togglesustainhold=1'>Sustain indefinitely last held note</a>: [full_sustain_held_note? "Enabled" : "Disabled"].<br>"
|
||||
. += "</div>"
|
||||
|
||||
/datum/song/ui_interact(mob/user)
|
||||
/datum/song/nano_ui_interact(mob/user)
|
||||
var/list/dat = list()
|
||||
|
||||
dat += instrument_status_ui()
|
||||
|
||||
Reference in New Issue
Block a user