From 77c358b628cd9d3c0503959bc3172d54bb6ffa26 Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Tue, 20 Jan 2026 16:39:04 -0600
Subject: [PATCH] Small instruments fix (#94916)

---
 code/modules/instruments/songs/_song.dm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm
index f3f630cc7ec..f0df050b5c4 100644
--- a/code/modules/instruments/songs/_song.dm
+++ b/code/modules/instruments/songs/_song.dm
@@ -216,19 +216,19 @@
 	music_player = user
 	START_PROCESSING(SSinstruments, src)
 	if(id)
-		sync_play()
+		sync_play(user)
 
 /**
  * Attempts to find other instruments with the same ID and syncs them to our song.
  */
-/datum/song/proc/sync_play()
+/datum/song/proc/sync_play(atom/user)
 	for(var/datum/song/other_instrument as anything in SSinstruments.songs)
 		if(other_instrument == src || other_instrument.id != id)
 			continue
 		if(other_instrument.playing)
 			continue
 		var/atom/other_player = other_instrument.find_sync_player()
-		if(isnull(other_player) || !(other_player in view(parent)))
+		if(isnull(other_player) || !(other_player in view(user || parent)))
 			continue
 		// copies the main song info to target songs
 		other_instrument.lines = lines.Copy()
@@ -432,7 +432,7 @@
 /datum/song/stationary/should_stop_playing(atom/player)
 	. = ..()
 	if(. == STOP_PLAYING || . == IGNORE_INSTRUMENT_CHECKS)
-		return TRUE
+		return
 	var/obj/structure/musician/M = parent
 	return M.can_play(player) ? NONE : STOP_PLAYING