Skip to content

Commit

Permalink
Adding and wiring some new guitar sounds. (ParadiseSS13#27184)
Browse files Browse the repository at this point in the history
  • Loading branch information
azulez authored Nov 22, 2024
1 parent 467740f commit c3cca9d
Show file tree
Hide file tree
Showing 25 changed files with 19 additions and 1 deletion.
18 changes: 18 additions & 0 deletions code/modules/instruments/guitar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,21 @@
"48"='sound/instruments/synthesis_samples/guitar/crisis_muted/c3.ogg',
"60"='sound/instruments/synthesis_samples/guitar/crisis_muted/c4.ogg',
"72"='sound/instruments/synthesis_samples/guitar/crisis_muted/c5.ogg')

/datum/instrument/guitar/synth_legacy // A synth version of legacy for efficiency. Better for crowded scores.
name = "Synth Legacy Guitar"
id = "sleggt"
real_samples = list("36"='sound/instruments/synthesis_samples/guitar/synth_legacy/cn3.ogg',
"48"='sound/instruments/synthesis_samples/guitar/synth_legacy/cn4.ogg',
"60"='sound/instruments/synthesis_samples/guitar/synth_legacy/cn5.ogg',
"72"='sound/instruments/synthesis_samples/guitar/synth_legacy/cn6.ogg')

/datum/instrument/guitar/pgm_clean
name = "Pigments Clean Guitar"
id = "piclgt"
real_samples = list("36"='sound/instruments/synthesis_samples/guitar/pgm_clean/c3.ogg',
"48"='sound/instruments/synthesis_samples/guitar/pgm_clean/c4.ogg',
"60"='sound/instruments/synthesis_samples/guitar/pgm_clean/c5.ogg',
"72"='sound/instruments/synthesis_samples/guitar/pgm_clean/c6.ogg',
"84"='sound/instruments/synthesis_samples/guitar/pgm_clean/c7.ogg')

2 changes: 1 addition & 1 deletion code/modules/instruments/objs/items/instrument_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
item_state = "guitar"
attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
hitsound = 'sound/weapons/guitarslam.ogg'
allowed_instrument_ids = list("guitar", "csteelgt", "cnylongt", "ccleangt", "cmutedgt")
allowed_instrument_ids = list("guitar", "csteelgt", "cnylongt", "ccleangt", "cmutedgt", "sleggt", "piclgt")

/// This is a special guitar for the emagged service borg that hits pretty hard and can still play music. Clonk.
/obj/item/instrument/guitar/cyborg
Expand Down
Binary file added sound/instruments/guitar/Ab2.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/An2.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Bb2.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Bn2.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Cb3.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Cn3.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Db3.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Dn3.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Eb3.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/En2.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Fb2.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Fn2.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Gb2.ogg
Binary file not shown.
Binary file added sound/instruments/guitar/Gn2.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit c3cca9d

Please sign in to comment.