Fix prefs issue, make banjo available, build tgui

This commit is contained in:
mochi
2020-07-21 23:54:35 +02:00
parent a8371f301a
commit 7a4b732e76
6 changed files with 21 additions and 5 deletions
@@ -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
@@ -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
@@ -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