Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions code/game/objects/items/devices/instruments.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
item_state = "synth"
instrumentId = "piano"
instrumentExt = "ogg"
var/static/list/insTypes = list("accordion" = "mid", "bikehorn" = "ogg", "glockenspiel" = "mid", "guitar" = "ogg", "harmonica" = "mid", "piano" = "ogg", "recorder" = "mid", "saxophone" = "mid", "trombone" = "mid", "violin" = "mid", "xylophone" = "mid") //No eguitar you ear-rapey fuckers.
var/static/list/insTypes = list("accordion" = "mid", "bikehorn" = "ogg", "glockenspiel" = "mid", "banjo" = "ogg", "guitar" = "ogg", "harmonica" = "mid", "piano" = "ogg", "recorder" = "mid", "saxophone" = "mid", "trombone" = "mid", "violin" = "mid", "xylophone" = "mid") //No eguitar you ear-rapey fuckers.
actions_types = list(/datum/action/item_action/synthswitch)

/obj/item/instrument/piano_synth/proc/changeInstrument(name = "piano")
Expand All @@ -79,6 +79,16 @@
return
return changeInstrument(chosen)

/obj/item/instrument/banjo
name = "banjo"
desc = "A 'Mura' brand banjo. It's pretty much just a drum with a neck and strings."
icon_state = "banjo"
item_state = "banjo"
instrumentExt = "ogg"
attack_verb = list("scruggs-styled", "hum-diggitied", "shin-digged", "clawhammered")
hitsound = 'sound/weapons/banjoslap.ogg'
instrumentId = "banjo"

/obj/item/instrument/guitar
name = "guitar"
desc = "It's made of wood and has bronze strings."
Expand Down Expand Up @@ -255,7 +265,8 @@
/obj/item/instrument/saxophone,
/obj/item/instrument/trombone,
/obj/item/instrument/recorder,
/obj/item/instrument/harmonica
/obj/item/instrument/harmonica,
/obj/item/instrument/banjo
)
for(var/V in templist)
var/atom/A = V
Expand Down
5 changes: 3 additions & 2 deletions code/modules/cargo/packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2365,7 +2365,7 @@

/datum/supply_pack/misc/bigband
name = "Big Band Instrument Collection"
desc = "Get your sad station movin' and groovin' with this fine collection! Contains nine different instruments!"
desc = "Get your sad station movin' and groovin' with this fine collection! Contains ten different instruments!"
cost = 5000
crate_name = "Big band musical instruments collection"
contains = list(/obj/item/instrument/violin,
Expand All @@ -2376,7 +2376,8 @@
/obj/item/instrument/trombone,
/obj/item/instrument/recorder,
/obj/item/instrument/harmonica,
/obj/structure/piano/unanchored)
/obj/structure/piano/unanchored,
/obj/item/instrument/banjo)
crate_type = /obj/structure/closet/crate/wooden

/datum/supply_pack/misc/book_crate
Expand Down
1 change: 1 addition & 0 deletions code/modules/vending/gift.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
/obj/item/instrument/trombone = 1,
/obj/item/instrument/trumpet = 1,
/obj/item/instrument/piano_synth = 1,
/obj/item/instrument/banjo = 1,
/obj/item/storage/backpack = 4,
/obj/item/reagent_containers/syringe = 3,
/obj/item/reagent_containers/pill/patch/styptic = 2,
Expand Down
Binary file modified icons/mob/inhands/equipment/instruments_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/equipment/instruments_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/musician.dmi
Binary file not shown.
Binary file added sound/instruments/banjo/Ab3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Ab4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Ab5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/An3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/An4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/An5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Bb3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Bb4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Bb5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Bn2.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Bn3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Bn4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Bn5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Cn3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Cn4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Cn5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Cn6.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Db3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Db4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Db5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Db6.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Dn3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Dn4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Dn5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Dn6.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Eb3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Eb4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Eb5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/En3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/En4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/En5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Fn3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Fn4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Fn5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Gb3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Gb4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Gb5.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Gn3.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Gn4.ogg
Binary file not shown.
Binary file added sound/instruments/banjo/Gn5.ogg
Binary file not shown.
Binary file added sound/weapons/banjoslap.ogg
Binary file not shown.