From faa2b39ca231553d25b99171f249f9814111bcc9 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 15 Aug 2018 02:07:22 -0400 Subject: [PATCH] buffs jukeboxes - makes jukebox sounds have double the falloff (#7458) --- code/controllers/subsystem/jukeboxes.dm | 6 ++++-- code/game/machinery/dance_machine.dm | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/jukeboxes.dm b/code/controllers/subsystem/jukeboxes.dm index ab510e1efd..d0001603a1 100644 --- a/code/controllers/subsystem/jukeboxes.dm +++ b/code/controllers/subsystem/jukeboxes.dm @@ -18,14 +18,14 @@ SUBSYSTEM_DEF(jukeboxes) song_beat = beat song_associated_id = assocID -/datum/controller/subsystem/jukeboxes/proc/addjukebox(obj/jukebox, datum/track/T) +/datum/controller/subsystem/jukeboxes/proc/addjukebox(obj/jukebox, datum/track/T, jukefalloff = 1) if(!istype(T)) CRASH("[src] tried to play a song with a nonexistant track") var/channeltoreserve = CHANNEL_JUKEBOX_START + activejukeboxes.len - 1 if(channeltoreserve > CHANNEL_JUKEBOX) return FALSE activejukeboxes.len++ - activejukeboxes[activejukeboxes.len] = list(T, channeltoreserve, jukebox) + activejukeboxes[activejukeboxes.len] = list(T, channeltoreserve, jukebox, jukefalloff) return activejukeboxes.len /datum/controller/subsystem/jukeboxes/proc/removejukebox(IDtoremove) @@ -78,6 +78,8 @@ SUBSYSTEM_DEF(jukeboxes) var/turf/currentturf = get_turf(jukebox) var/list/hearerscache = hearers(7, jukebox) + song_played.falloff = jukeinfo[4] + for(var/mob/M in GLOB.player_list) if(!M.client) continue diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index f67600252e..cc50492818 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -121,7 +121,7 @@ updateUsrDialog() /obj/machinery/jukebox/proc/activate_music() - var/jukeboxslottotake = SSjukeboxes.addjukebox(src, selection) + var/jukeboxslottotake = SSjukeboxes.addjukebox(src, selection, 2) if(jukeboxslottotake) active = TRUE update_icon()