diff --git a/code/controllers/subsystem/processing/instruments.dm b/code/controllers/subsystem/processing/instruments.dm index 73f0e821378..3d571d2a13d 100644 --- a/code/controllers/subsystem/processing/instruments.dm +++ b/code/controllers/subsystem/processing/instruments.dm @@ -1,8 +1,8 @@ PROCESSING_SUBSYSTEM_DEF(instruments) name = "Instruments" init_order = INIT_ORDER_INSTRUMENTS - wait = 0.5 - flags = SS_KEEP_TIMING + wait = 1 + flags = SS_TICKER|SS_BACKGROUND|SS_KEEP_TIMING offline_implications = "Instruments will no longer play. No immediate action is needed." /// List of all instrument data, associative id = datum diff --git a/code/datums/action.dm b/code/datums/action.dm index 9d1fa00901f..ba0e801fb9e 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -234,6 +234,14 @@ desc = "Recall yourself, and anyone nearby, to an attuned hierophant beacon at any time.
If the beacon is still attached, will detach it." button_icon_state = "vortex_recall" +/datum/action/item_action/vortex_recall/IsAvailable() + if(istype(target, /obj/item/hierophant_club)) + name = "Change Headphones Song" + var/obj/item/hierophant_club/H = target + if(H.teleporting) + return 0 + return ..() + /datum/action/item_action/change_headphones_song name = "Change Headphones Song" diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi index a0857935693..2fc6aa9c4c1 100644 Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ