diff --git a/code/modules/instruments/objs/items/instruments.dm b/code/modules/instruments/objs/items/instruments.dm index 816c34aef8f..b411bc6c032 100644 --- a/code/modules/instruments/objs/items/instruments.dm +++ b/code/modules/instruments/objs/items/instruments.dm @@ -204,3 +204,13 @@ tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) time = 8 SECONDS category = CAT_MISC + +/datum/crafting_recipe/banjo + name = "Banjo" + result = /obj/item/instrument/banjo + reqs = list(/obj/item/stack/sheet/wood = 5, + /obj/item/stack/cable_coil = 6, + /obj/item/stack/tape_roll = 5) + tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER) + time = 8 SECONDS + category = CAT_MISC diff --git a/code/modules/instruments/songs/play_legacy.dm b/code/modules/instruments/songs/play_legacy.dm index 9db473454d7..df1a27f073a 100644 --- a/code/modules/instruments/songs/play_legacy.dm +++ b/code/modules/instruments/songs/play_legacy.dm @@ -89,7 +89,7 @@ var/sound/music_played = sound(soundfile) for(var/i in hearing_mobs) var/mob/M = i - if(!(M?.client?.prefs?.toggles & SOUND_INSTRUMENTS)) + if(!(M.client.prefs.sound & SOUND_INSTRUMENTS)) continue M.playsound_local(source, null, volume * using_instrument.volume_multiplier, falloff = 5, S = music_played) // Could do environment and echo later but not for now diff --git a/code/modules/instruments/songs/play_synthesized.dm b/code/modules/instruments/songs/play_synthesized.dm index 2c751f0480b..daeef4d78f3 100644 --- a/code/modules/instruments/songs/play_synthesized.dm +++ b/code/modules/instruments/songs/play_synthesized.dm @@ -62,7 +62,7 @@ last_channel_played = channel_text for(var/i in hearing_mobs) var/mob/M = i - if(!(M?.client?.prefs?.toggles & SOUND_INSTRUMENTS)) + if(!(M.client.prefs.sound & SOUND_INSTRUMENTS)) continue M.playsound_local(get_turf(parent), null, volume, FALSE, K.frequency, INSTRUMENT_DISTANCE_NO_FALLOFF, channel, null, copy, distance_multiplier = INSTRUMENT_DISTANCE_FALLOFF_BUFF) // Could do environment and echo later but not for now diff --git a/code/modules/store/items.dm b/code/modules/store/items.dm index 4c1610474ba..0a0f19fb0f7 100644 --- a/code/modules/store/items.dm +++ b/code/modules/store/items.dm @@ -111,6 +111,12 @@ typepath = /obj/item/instrument/eguitar cost = 500 +/datum/storeitem/banjo + name = "Banjo" + desc = "It's pretty much just a drum with a neck and strings." + typepath = /obj/item/instrument/banjo + cost = 500 + /datum/storeitem/piano_synth name = "Piano Synthesizer" desc = "An advanced electronic synthesizer that can emulate various instruments." diff --git a/tgui/packages/tgui/interfaces/Instrument.js b/tgui/packages/tgui/interfaces/Instrument.js index 6f26f1575c5..e30ddae705f 100644 --- a/tgui/packages/tgui/interfaces/Instrument.js +++ b/tgui/packages/tgui/interfaces/Instrument.js @@ -81,8 +81,8 @@ const InstrumentHelp = (properties, context) => {

Combined, an example line is: E-E4/4,F#/2,G#/8,B/8,E3-E4/4.