shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HOPEFULLY fixes jukebox destruction not taking jukeboxes out of active jukebox list (#7604)

Browse Source
This commit is contained in:
deathride58
2018-10-03 20:37:45 -07:00
committed by kevinz000
parent 0419301ab0
commit c95dcbe6ac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/dance_machine.dm
+2 -2
View File
@@ -406,6 +406,8 @@
lying_prev = 0 lying_prev = 0
/obj/machinery/jukebox/proc/dance_over() /obj/machinery/jukebox/proc/dance_over()
SSjukeboxes.removejukebox(SSjukeboxes.findjukeboxindex(src))
STOP_PROCESSING(SSobj, src)
for(var/mob/living/L in rangers) for(var/mob/living/L in rangers)
if(!L || !L.client) if(!L || !L.client)
continue continue
@@ -420,8 +422,6 @@
/obj/machinery/jukebox/process() /obj/machinery/jukebox/process()
if(active && world.time >= stop) if(active && world.time >= stop)
active = FALSE active = FALSE
SSjukeboxes.removejukebox(SSjukeboxes.findjukeboxindex(src))
STOP_PROCESSING(SSobj, src)
dance_over() dance_over()
playsound(src,'sound/machines/terminal_off.ogg',50,1) playsound(src,'sound/machines/terminal_off.ogg',50,1)
update_icon() update_icon()