From c95dcbe6acbd8990428ce31a24bd7757ca4e70e5 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 3 Oct 2018 23:37:45 -0400 Subject: [PATCH] HOPEFULLY fixes jukebox destruction not taking jukeboxes out of active jukebox list (#7604) --- code/game/machinery/dance_machine.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index cc50492818..3a6cf2b922 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -406,6 +406,8 @@ lying_prev = 0 /obj/machinery/jukebox/proc/dance_over() + SSjukeboxes.removejukebox(SSjukeboxes.findjukeboxindex(src)) + STOP_PROCESSING(SSobj, src) for(var/mob/living/L in rangers) if(!L || !L.client) continue @@ -420,8 +422,6 @@ /obj/machinery/jukebox/process() if(active && world.time >= stop) active = FALSE - SSjukeboxes.removejukebox(SSjukeboxes.findjukeboxindex(src)) - STOP_PROCESSING(SSobj, src) dance_over() playsound(src,'sound/machines/terminal_off.ogg',50,1) update_icon()