This commit is contained in:
kevinz000
2020-04-11 20:15:38 -07:00
parent 775db657c2
commit 443bb0ba08
10 changed files with 50 additions and 9 deletions
+5 -3
View File
@@ -5,8 +5,10 @@
// max_integrity = 100
// resistance_flags = FLAMMABLE
icon = 'icons/obj/musician.dmi'
lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
item_icons = list(
slot_l_hand_str = 'icons/mob/inhands/equipment/instruments_lefthand.dmi',
slot_r_hand_str = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
)
var/datum/song/handheld/song
var/list/allowed_instrument_ids
// var/tune_time_left = 0
@@ -229,7 +231,7 @@
icon_state = "harmonica"
item_state = "harmonica"
allowed_instrument_ids = "harmonica"
slot_flags = ITEM_SLOT_MASK
// slot_flags = ITEM_SLOT_MASK
force = 5
w_class = WEIGHT_CLASS_SMALL
// actions_types = list(/datum/action/item_action/instrument)
@@ -35,11 +35,21 @@
. = ..()
song.ui_interact(user)
/obj/structure/musician/attackby(obj/item/I, mob/living/user)
if(I.is_wrench())
playsound(src, O.usesound, 50, 1)
to_chat(user, "<span class='notice'>You begin to [anchored? "loosen" : "tighten"] [src]'s casters...</span>")
if(do_after(user, 40 * O.toolspeed))
user.visible_message("<span class='notice'>[user] [anchored? "loosens" : "tightens"] [src]'s casters.</span>")
anchored = !anchored
else
return ..()
/*
/obj/structure/musician/wrench_act(mob/living/user, obj/item/I)
anchored = !anchored
user.visible_message("<span class='notice'>[user] [anchored? "anchors" : "unanchors"] [src].</span>")
//default_unfasten_wrench(user, I, 40)
default_unfasten_wrench(user, I, 40)
return TRUE
*/
/obj/structure/musician/piano
name = "space minimoog"
@@ -80,7 +80,7 @@
last_channel_played = channel_text
for(var/i in hearing_mobs)
var/mob/M = i
M.playsound_local(get_turf(parent), null, volume, FALSE, K.frequency, INSTRUMENT_DISTANCE_NO_FALLOFF, FALSE, channel, null, copy, /datum/client_preference/intrument_toggle, distance_multiplier = INSTRUMENT_DISTANCE_FALLOFF_BUFF)
M.playsound_local(get_turf(parent), null, volume, FALSE, K.frequency, INSTRUMENT_DISTANCE_NO_FALLOFF, FALSE, channel, null, copy, /datum/client_preference/instrument_toggle, distance_multiplier = INSTRUMENT_DISTANCE_FALLOFF_BUFF)
// Could do environment and echo later but not for now
/datum/song/proc/terminate_all_sounds(clear_channels = TRUE)