diff --git a/code/modules/instruments/guitar.dm b/code/modules/instruments/guitar.dm index 25a3073e7a9..a03153e2906 100644 --- a/code/modules/instruments/guitar.dm +++ b/code/modules/instruments/guitar.dm @@ -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') + diff --git a/code/modules/instruments/objs/items/instrument_items.dm b/code/modules/instruments/objs/items/instrument_items.dm index a524685b7d9..6ed3fe637c0 100644 --- a/code/modules/instruments/objs/items/instrument_items.dm +++ b/code/modules/instruments/objs/items/instrument_items.dm @@ -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 diff --git a/sound/instruments/guitar/Ab2.ogg b/sound/instruments/guitar/Ab2.ogg new file mode 100644 index 00000000000..a473a2c7e21 Binary files /dev/null and b/sound/instruments/guitar/Ab2.ogg differ diff --git a/sound/instruments/guitar/An2.ogg b/sound/instruments/guitar/An2.ogg new file mode 100644 index 00000000000..87b13c655e1 Binary files /dev/null and b/sound/instruments/guitar/An2.ogg differ diff --git a/sound/instruments/guitar/Bb2.ogg b/sound/instruments/guitar/Bb2.ogg new file mode 100644 index 00000000000..5020c315255 Binary files /dev/null and b/sound/instruments/guitar/Bb2.ogg differ diff --git a/sound/instruments/guitar/Bn2.ogg b/sound/instruments/guitar/Bn2.ogg new file mode 100644 index 00000000000..d5d72c573be Binary files /dev/null and b/sound/instruments/guitar/Bn2.ogg differ diff --git a/sound/instruments/guitar/Cb3.ogg b/sound/instruments/guitar/Cb3.ogg new file mode 100644 index 00000000000..87466e99099 Binary files /dev/null and b/sound/instruments/guitar/Cb3.ogg differ diff --git a/sound/instruments/guitar/Cn3.ogg b/sound/instruments/guitar/Cn3.ogg new file mode 100644 index 00000000000..610011e7632 Binary files /dev/null and b/sound/instruments/guitar/Cn3.ogg differ diff --git a/sound/instruments/guitar/Db3.ogg b/sound/instruments/guitar/Db3.ogg new file mode 100644 index 00000000000..3c1375b7afd Binary files /dev/null and b/sound/instruments/guitar/Db3.ogg differ diff --git a/sound/instruments/guitar/Dn3.ogg b/sound/instruments/guitar/Dn3.ogg new file mode 100644 index 00000000000..4fc8cd10169 Binary files /dev/null and b/sound/instruments/guitar/Dn3.ogg differ diff --git a/sound/instruments/guitar/Eb3.ogg b/sound/instruments/guitar/Eb3.ogg new file mode 100644 index 00000000000..6ad99d2189b Binary files /dev/null and b/sound/instruments/guitar/Eb3.ogg differ diff --git a/sound/instruments/guitar/En2.ogg b/sound/instruments/guitar/En2.ogg new file mode 100644 index 00000000000..34fc445f86b Binary files /dev/null and b/sound/instruments/guitar/En2.ogg differ diff --git a/sound/instruments/guitar/Fb2.ogg b/sound/instruments/guitar/Fb2.ogg new file mode 100644 index 00000000000..61cbcd96673 Binary files /dev/null and b/sound/instruments/guitar/Fb2.ogg differ diff --git a/sound/instruments/guitar/Fn2.ogg b/sound/instruments/guitar/Fn2.ogg new file mode 100644 index 00000000000..c25552bb2d7 Binary files /dev/null and b/sound/instruments/guitar/Fn2.ogg differ diff --git a/sound/instruments/guitar/Gb2.ogg b/sound/instruments/guitar/Gb2.ogg new file mode 100644 index 00000000000..ebd3de36a2a Binary files /dev/null and b/sound/instruments/guitar/Gb2.ogg differ diff --git a/sound/instruments/guitar/Gn2.ogg b/sound/instruments/guitar/Gn2.ogg new file mode 100644 index 00000000000..d2d731c9bdd Binary files /dev/null and b/sound/instruments/guitar/Gn2.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c3.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c3.ogg new file mode 100644 index 00000000000..d146459c1d9 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c3.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c4.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c4.ogg new file mode 100644 index 00000000000..c248375eb07 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c4.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c5.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c5.ogg new file mode 100644 index 00000000000..de3f5c7bf00 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c5.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c6.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c6.ogg new file mode 100644 index 00000000000..2262fc40c06 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c6.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/pgm_clean/c7.ogg b/sound/instruments/synthesis_samples/guitar/pgm_clean/c7.ogg new file mode 100644 index 00000000000..8f6a7c3c170 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/pgm_clean/c7.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn3.ogg b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn3.ogg new file mode 100644 index 00000000000..f8976a2857d Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn3.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn4.ogg b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn4.ogg new file mode 100644 index 00000000000..bb80c989bea Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn4.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn5.ogg b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn5.ogg new file mode 100644 index 00000000000..0dfd2b7c873 Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn5.ogg differ diff --git a/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn6.ogg b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn6.ogg new file mode 100644 index 00000000000..baed4e2ad3f Binary files /dev/null and b/sound/instruments/synthesis_samples/guitar/synth_legacy/Cn6.ogg differ