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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

Browse Source
This commit is contained in:
Crazylemon64
2017-01-06 05:01:43 -08:00
parent ac612d4924 b402225c7a
commit ec0f13d41e
158 changed files with 4150 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/musician.dm
+3 -3
View File
@@ -122,7 +122,7 @@
ui.open()
ui.set_auto_update(1)
/datum/song/ui_data(mob/user, datum/topic_state/state = default_state)
/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
var/data[0]
data["lines"] = lines
@@ -296,8 +296,8 @@
song.ui_interact(user, ui_key, ui, force_open)
/obj/structure/piano/ui_data(mob/user, datum/topic_state/state = default_state)
return song.ui_data(user, state)
/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
return song.ui_data(user, ui_key, state)
/obj/structure/piano/Topic(href, href_list)
song.Topic(href, href_list)