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

Updates/fixes instrument ui to be a nanoui

Browse Source
This commit is contained in:
Tastyfish
2016-01-05 02:20:03 -05:00
parent d9520c4327
commit 65e2a7fdff
4 changed files with 147 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/guitar.dm
+6 -4
View File
@@ -20,17 +20,19 @@
return ..()
/obj/item/device/guitar/attack_self(mob/user as mob)
interact(user)
ui_interact(user)
/obj/item/device/guitar/interact(mob/user as mob)
/obj/item/device/guitar/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(!user)
return
if(!isliving(user) || user.stat || user.restrained() || user.lying)
return
user.set_machine(src)
song.interact(user)
song.ui_interact(user, ui_key, ui, force_open)
/obj/item/device/guitar/Topic(href, href_list)
song.Topic(href, href_list)
/datum/table_recipe/guitar
name = "Guitar"
code/game/objects/items/devices/violin.dm
+6 -4
View File
@@ -24,14 +24,16 @@
..()
/obj/item/device/violin/attack_self(mob/user as mob)
interact(user)
ui_interact(user)
/obj/item/device/violin/interact(mob/user as mob)
/obj/item/device/violin/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(!user)
return
if(!isliving(user) || user.stat || user.restrained() || user.lying)
return
user.set_machine(src)
song.interact(user)
song.ui_interact(user, ui_key, ui, force_open)
/obj/item/device/violin/Topic(href, href_list)
song.Topic(href, href_list)