Merge pull request #6361 from Citadel-Station-13/upstream-merge-37107

[MIRROR] Fixes jukebox ghost message spam
This commit is contained in:
deathride58
2018-04-11 21:29:28 +00:00
committed by GitHub
+2 -2
View File
@@ -83,6 +83,8 @@
/obj/machinery/jukebox/ui_interact(mob/user)
. = ..()
if(!user.canUseTopic(src, !issilicon(user)))
return
if (!anchored)
to_chat(user,"<span class='warning'>This device must be anchored by a wrench!</span>")
return
@@ -90,8 +92,6 @@
to_chat(user,"<span class='warning'>Error: Access Denied.</span>")
user.playsound_local(src,'sound/misc/compiler-failure.ogg', 25, 1)
return
if(!Adjacent(user) && !isAI(user))
return
if(!songs.len)
to_chat(user,"<span class='warning'>Error: No music tracks have been authorized for your station. Petition Central Command to resolve this issue.</span>")
playsound(src,'sound/misc/compiler-failure.ogg', 25, 1)