Skip to content

Commit

Permalink
Lobby Music DLC (#1321)
Browse files Browse the repository at this point in the history
## Что этот PR делает
Музыка теперь грузится из конфига, в репозитории присутствует лишь 1
файл, который лежал до этого в другой папке
Finally some good fucking music...

## Почему это хорошо для игры
Заебало слушать одну и ту же пищащюю хуету в лобби

## Тестирование
Несколько рестартов и наслаждение музыкой

## Changelog

:cl:
soundadd: Лобби обзавелось новой музыкой, кайфуем
/:cl:
  • Loading branch information
AyIong authored Jun 13, 2024
1 parent e0a2da7 commit a53122b
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,5 @@ $RECYCLE.BIN

# SS220 EDIT
sound/tts_cache/*
config/lobby_music/sounds/*
config/jukebox_music/sounds/*
2 changes: 1 addition & 1 deletion code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ falloff_distance - Distance at which falloff begins. Sound is at peak volume (in
if(!SSticker || !SSticker.login_music || GLOB.configuration.general.disable_lobby_music)
return
if(prefs.sound & SOUND_LOBBY)
SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = 85 * prefs.get_channel_volume(CHANNEL_LOBBYMUSIC), channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS
SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = 50 * prefs.get_channel_volume(CHANNEL_LOBBYMUSIC), channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS // SS220 EDIT - Reduce volume 85 -> 50

/proc/get_rand_frequency()
return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs.
Expand Down
34 changes: 34 additions & 0 deletions config/lobby_music/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---LICENSE NOTICE---

The server operator(s) is responsible for the copyright status of all sounds placed within the /config/lobby_music/sounds folder unless otherwise noted.

If a sound requires attribution and/or a specific license it is up to the operator(s) to make this information publicly available on either
a website associated with their server or on the server itself.

If operators(s) allow these configuration files to be public this file can serve that purpose by keeping it properly updated.

If in the future new sounds are published to these folders (i.e. in an online code repository) they must explicitly state their
license if said license is not the same as the default licensing found in README.md in the root directory of the project.

Do not remove this notice.

---END NOTICE---




---EXAMPLES (NOT PART OF ANY LICENSE)---

These are examples of properly attrubuted and licensed sounds.
They are not an actual part of any license under any circumstance.

title5.ogg was created by Mya Quinn on Feburary 28, 2557. It is licensed under a Combative Clowning 3.0 HO-NK license (http://example.com/license/url/).

Unless otherwise noted all sounds were created by Cuban Pete on July 26, 2555. They are licensed under the RUMBABEAT Public License.(http://example.com/license/url/).

---END EXAMPLES (NOT PART OF ANY LICENSE)---




---ADD LICENSING INFORMATION BELOW---
File renamed without changes.
2 changes: 1 addition & 1 deletion modular_ss220/aesthetics_sounds/_aesthetics_sounds.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/aesthetics_sounds
name = "Эстетика звуков"
desc = "Обновление звуков на новые, более красочные"
author = "dj-34"
author = "dj-34, Aylong"
1 change: 1 addition & 0 deletions modular_ss220/aesthetics_sounds/_aesthetics_sounds.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
#include "code/wilhelm.dm"
#include "code/shuttle.dm"
#include "code/mindslave.dm"
#include "code/lobby_music.dm"
6 changes: 6 additions & 0 deletions modular_ss220/aesthetics_sounds/code/lobby_music.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/datum/controller/subsystem/ticker/Initialize()
var/static/list/possible_music = flist("config/lobby_music/sounds/")
login_music = "config/lobby_music/sounds/[pick(possible_music)]"

for(var/client/client as anything in GLOB.clients)
client.playtitlemusic()
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
icon_state = "away"
report_alerts = FALSE
requires_power = FALSE
ambientsounds = list('sound/music/space.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambigen11.ogg', 'sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg', 'modular_ss220/aesthetics_sounds/sound/music/Traitor.ogg')
ambientsounds = list('sound/music/space.ogg', 'sound/ambience/ambiatmos.ogg', 'sound/ambience/ambigen11.ogg', 'sound/ambience/ambispace.ogg', 'sound/ambience/ambispace2.ogg')

/area/awaymission/BMPship/Engines
name = "BMP Engine Block"
Expand Down

0 comments on commit a53122b

Please sign in to comment.