Skip to content

Commit

Permalink
Bar jukebox (#5115)
Browse files Browse the repository at this point in the history
* Bar jukebox

* Refactor jukebox

* Update jukebox.dm

* Update dance_machine.dm

* Update modules_maint.dm

* Added to service order

* New voice actor

* Revert "New voice actor"

This reverts commit cda7f0e.

* Adding music without config

Task from Iajret
  • Loading branch information
FeenieRU authored Dec 7, 2024
1 parent 47115b5 commit ebd2e10
Show file tree
Hide file tree
Showing 16 changed files with 764 additions and 3 deletions.
2 changes: 2 additions & 0 deletions code/datums/components/jukebox.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* FLUFFY FRONTIER REFACTOR: BAR JUKEBOX (#5115)
/// Checks if the mob has jukebox muted in their preferences
#define IS_PREF_MUTED(mob) (!isnull(mob.client) && !mob.client.prefs.read_preference(/datum/preference/toggle/sound_jukebox))
Expand Down Expand Up @@ -404,3 +405,4 @@
song_name = "Tintin on the Moon"
song_length = 3 MINUTES + 52 SECONDS
song_beat = 1 SECONDS
*/ // FLUFFY FRONTIER REFACTOR END
6 changes: 4 additions & 2 deletions code/game/machinery/dance_machine.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* FLUFFY FRONTIER REFACTOR: BAR JUKEBOX (#5115)
/obj/machinery/jukebox
name = "jukebox"
desc = "A classic music player."
Expand Down Expand Up @@ -152,9 +153,9 @@
anchored = FALSE
/// Spotlight effects being played
VAR_PRIVATE/list/obj/item/flashlight/spotlight/spotlights = list()
//VAR_PRIVATE/list/obj/item/flashlight/spotlight/spotlights = list()
/// Sparkle effects being played
VAR_PRIVATE/list/obj/effect/overlay/sparkles/sparkles = list()
//VAR_PRIVATE/list/obj/effect/overlay/sparkles/sparkles = list()
/obj/machinery/jukebox/disco/indestructible
name = "radiant dance machine mark V"
Expand Down Expand Up @@ -383,3 +384,4 @@
/obj/machinery/jukebox/disco/proc/dance4_revert(mob/living/dancer, matrix/starting_matrix)
animate(dancer, transform = starting_matrix, time = 5, loop = 0)
REMOVE_TRAIT(dancer, TRAIT_DISCO_DANCER, REF(src))
*/ // FLUFFY FRONTIER REFACTOR END
2 changes: 2 additions & 0 deletions code/modules/mod/modules/modules_maint.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
flash_color(mod.wearer, flash_color = "#FF0000", flash_time = 10 SECONDS)
set_off = FALSE

/* FLUFFY FRONTIER REFACTOR: BAR JUKEBOX (#5115)
///Rave Visor - Gives you a rainbow visor and plays jukebox music to you.
/obj/item/mod/module/visor/rave
name = "MOD rave visor module"
Expand Down Expand Up @@ -159,6 +160,7 @@
return
music_player.selection = new_song
*/ // FLUFFY FRONTIER REFACTOR END

///Tanner - Tans you with spraytan.
/obj/item/mod/module/tanner
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit ebd2e10

Please sign in to comment.