diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 018b3d0538f..a85f48971e8 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1552,3 +1552,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/device/kit/paint/gygax/recitence ) name = "Random Gygax exosuit modkit" + +/datum/supply_packs/jukebox + name = "Jukebox" + contains = list(/obj/machinery/media/jukebox/) + cost = 200 + containertype = /obj/structure/largecrate + containername = "jukebox Crate" + group = "Hospitality" diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 90305a7a786..363edf64f53 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -13,7 +13,7 @@ datum/track/New(var/title_name, var/audio) icon = 'icons/obj/jukebox.dmi' icon_state = "jukebox2-nopower" var/state_base = "jukebox2" - anchored = 1 + anchored = 0 density = 1 power_channel = EQUIP use_power = 1 @@ -33,6 +33,9 @@ datum/track/New(var/title_name, var/audio) new/datum/track("Part A", 'sound/misc/TestLoop1.ogg'), new/datum/track("Scratch", 'sound/music/title1.ogg'), new/datum/track("Trai`Tor", 'sound/music/traitor.ogg'), + new/datum/track("Thunderdome", 'sound/music/THUNDERDOME.ogg'), + new/datum/track("Space Oddity", 'sound/music/space_oddity.ogg'), + new/datum/track("Space Asshole", 'sound/music/space_asshole.ogg'), ) diff --git a/html/changelogs/alberyk-PR-515.yml b/html/changelogs/alberyk-PR-515.yml new file mode 100644 index 00000000000..ccf5d6ae2dc --- /dev/null +++ b/html/changelogs/alberyk-PR-515.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Alberyk + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a jukebox crate to the supply console."