Skip to content

Commit

Permalink
Second try
Browse files Browse the repository at this point in the history
  • Loading branch information
AyIong committed Sep 11, 2023
1 parent 3ce2a93 commit 84f21d3
Show file tree
Hide file tree
Showing 12 changed files with 717 additions and 5 deletions.
2 changes: 1 addition & 1 deletion _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3550,7 +3550,7 @@
},
/area/solar/auxstarboard)
"aps" = (
/obj/item/kirbyplants,
/obj/machinery/jukebox/bar/anchored,
/turf/simulated/floor/wood/fancy/cherry,
/area/crew_quarters/bar/atrium)
"apy" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/generic/centcomm.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -16866,7 +16866,7 @@
},
/area/shuttle/escape)
"YZ" = (
/obj/machinery/disco/immobile,
/obj/machinery/jukebox/disco/anchored/indestructible,
/obj/effect/turf_decal/box/white,
/turf/simulated/floor/mineral/abductor,
/area/centcom220/bar)
Expand Down
34 changes: 34 additions & 0 deletions config/jukebox_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/jukebox_music 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---
15 changes: 15 additions & 0 deletions config/jukebox_music/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
The enclosed /sounds folder holds the sound files used for player selectable songs for an ingame jukebox. OGG and WAV are supported.

Using unnecessarily huge sounds can cause client side lag and should be avoided.

You may add as many sounds as you would like.

---

Naming Conventions:

Every sound you add must have a unique name. Avoid using the plus sign "+" and the period "." in names, as these are used internally to classify sounds.

Sound names must be in the format of [song name]+[length in deciseconds]+[beat in deciseconds].ogg

A three minute song title "SS13" that lasted 3 minutes would have a file name SS13+1800+5.ogg
Binary file not shown.
4 changes: 4 additions & 0 deletions modular_ss220/jukebox/_jukebox.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/modpack/jukebox
name = "Музыкальный автомат"
desc = "ДИСКАЧ!"
author = "Aylong220"
3 changes: 3 additions & 0 deletions modular_ss220/jukebox/_jukebox.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "_jukebox.dm"

#include "code/jukebox.dm"
Loading

0 comments on commit 84f21d3

Please sign in to comment.