diff --git a/code/game/objects/items/devices/guitar.dm b/code/game/objects/items/devices/guitar.dm new file mode 100644 index 00000000000..a0d0422ca74 --- /dev/null +++ b/code/game/objects/items/devices/guitar.dm @@ -0,0 +1,33 @@ +//copy pasta of the space piano, don't hurt me -Pete + +/obj/item/device/guitar + name = "guitar" + desc = "It's made of wood and has bronze strings." + icon = 'icons/obj/musician.dmi' + icon_state = "guitar" + item_state = "guitar" + icon_override = 'icons/mob/in-hand/tools.dmi' + force = 10 + var/datum/song/handheld/song + +/obj/item/device/guitar/New() + song = new("guitar", src) + song.instrumentExt = "ogg" + +/obj/item/device/guitar/Destroy() + del(song) + song = null + ..() + +/obj/item/device/guitar/attack_self(mob/user as mob) + interact(user) + +/obj/item/device/guitar/interact(mob/user as mob) + if(!user) + return + + if(!isliving(user) || user.stat || user.restrained() || user.lying) + return + + user.set_machine(src) + song.interact(user) diff --git a/icons/mob/in-hand/tools.dmi b/icons/mob/in-hand/tools.dmi index 781d6304e56..d2d0661bd1e 100644 Binary files a/icons/mob/in-hand/tools.dmi and b/icons/mob/in-hand/tools.dmi differ diff --git a/paradise.dme b/paradise.dme index a41357ac689..aa3a8fa3ff2 100644 --- a/paradise.dme +++ b/paradise.dme @@ -580,6 +580,7 @@ #include "code\game\objects\items\devices\debugger.dm" #include "code\game\objects\items\devices\flash.dm" #include "code\game\objects\items\devices\flashlight.dm" +#include "code\game\objects\items\devices\guitar.dm" #include "code\game\objects\items\devices\laserpointer.dm" #include "code\game\objects\items\devices\lightreplacer.dm" #include "code\game\objects\items\devices\megaphone.dm" diff --git a/sound/guitar/Ab3.ogg b/sound/guitar/Ab3.ogg new file mode 100644 index 00000000000..6e242786c40 Binary files /dev/null and b/sound/guitar/Ab3.ogg differ diff --git a/sound/guitar/Ab4.ogg b/sound/guitar/Ab4.ogg new file mode 100644 index 00000000000..6f854ea5d3f Binary files /dev/null and b/sound/guitar/Ab4.ogg differ diff --git a/sound/guitar/Ab5.ogg b/sound/guitar/Ab5.ogg new file mode 100644 index 00000000000..53ba1c01520 Binary files /dev/null and b/sound/guitar/Ab5.ogg differ diff --git a/sound/guitar/Ab6.ogg b/sound/guitar/Ab6.ogg new file mode 100644 index 00000000000..d0a238ba607 Binary files /dev/null and b/sound/guitar/Ab6.ogg differ diff --git a/sound/guitar/An3.ogg b/sound/guitar/An3.ogg new file mode 100644 index 00000000000..1f06e6d4f28 Binary files /dev/null and b/sound/guitar/An3.ogg differ diff --git a/sound/guitar/An4.ogg b/sound/guitar/An4.ogg new file mode 100644 index 00000000000..f3354df46b9 Binary files /dev/null and b/sound/guitar/An4.ogg differ diff --git a/sound/guitar/An5.ogg b/sound/guitar/An5.ogg new file mode 100644 index 00000000000..fc3b1b345c9 Binary files /dev/null and b/sound/guitar/An5.ogg differ diff --git a/sound/guitar/An6.ogg b/sound/guitar/An6.ogg new file mode 100644 index 00000000000..f58a50d2a65 Binary files /dev/null and b/sound/guitar/An6.ogg differ diff --git a/sound/guitar/Bb3.ogg b/sound/guitar/Bb3.ogg new file mode 100644 index 00000000000..e88343d88fb Binary files /dev/null and b/sound/guitar/Bb3.ogg differ diff --git a/sound/guitar/Bb4.ogg b/sound/guitar/Bb4.ogg new file mode 100644 index 00000000000..11b883285da Binary files /dev/null and b/sound/guitar/Bb4.ogg differ diff --git a/sound/guitar/Bb5.ogg b/sound/guitar/Bb5.ogg new file mode 100644 index 00000000000..5d9b10f87a6 Binary files /dev/null and b/sound/guitar/Bb5.ogg differ diff --git a/sound/guitar/Bb6.ogg b/sound/guitar/Bb6.ogg new file mode 100644 index 00000000000..c7f11ef59a6 Binary files /dev/null and b/sound/guitar/Bb6.ogg differ diff --git a/sound/guitar/Bn3.ogg b/sound/guitar/Bn3.ogg new file mode 100644 index 00000000000..0d6022369fa Binary files /dev/null and b/sound/guitar/Bn3.ogg differ diff --git a/sound/guitar/Bn4.ogg b/sound/guitar/Bn4.ogg new file mode 100644 index 00000000000..7e8682d5ff0 Binary files /dev/null and b/sound/guitar/Bn4.ogg differ diff --git a/sound/guitar/Bn5.ogg b/sound/guitar/Bn5.ogg new file mode 100644 index 00000000000..1912da7f66c Binary files /dev/null and b/sound/guitar/Bn5.ogg differ diff --git a/sound/guitar/Bn6.ogg b/sound/guitar/Bn6.ogg new file mode 100644 index 00000000000..985ec744dfb Binary files /dev/null and b/sound/guitar/Bn6.ogg differ diff --git a/sound/guitar/Cb4.ogg b/sound/guitar/Cb4.ogg new file mode 100644 index 00000000000..0d6022369fa Binary files /dev/null and b/sound/guitar/Cb4.ogg differ diff --git a/sound/guitar/Cb5.ogg b/sound/guitar/Cb5.ogg new file mode 100644 index 00000000000..7e8682d5ff0 Binary files /dev/null and b/sound/guitar/Cb5.ogg differ diff --git a/sound/guitar/Cb6.ogg b/sound/guitar/Cb6.ogg new file mode 100644 index 00000000000..1912da7f66c Binary files /dev/null and b/sound/guitar/Cb6.ogg differ diff --git a/sound/guitar/Cb7.ogg b/sound/guitar/Cb7.ogg new file mode 100644 index 00000000000..985ec744dfb Binary files /dev/null and b/sound/guitar/Cb7.ogg differ diff --git a/sound/guitar/Cn4.ogg b/sound/guitar/Cn4.ogg new file mode 100644 index 00000000000..0279b73f8bd Binary files /dev/null and b/sound/guitar/Cn4.ogg differ diff --git a/sound/guitar/Cn5.ogg b/sound/guitar/Cn5.ogg new file mode 100644 index 00000000000..ece600a6c1a Binary files /dev/null and b/sound/guitar/Cn5.ogg differ diff --git a/sound/guitar/Cn6.ogg b/sound/guitar/Cn6.ogg new file mode 100644 index 00000000000..8c2fecc62aa Binary files /dev/null and b/sound/guitar/Cn6.ogg differ diff --git a/sound/guitar/Db4.ogg b/sound/guitar/Db4.ogg new file mode 100644 index 00000000000..8a14f1f8365 Binary files /dev/null and b/sound/guitar/Db4.ogg differ diff --git a/sound/guitar/Db5.ogg b/sound/guitar/Db5.ogg new file mode 100644 index 00000000000..46a67f20ce0 Binary files /dev/null and b/sound/guitar/Db5.ogg differ diff --git a/sound/guitar/Db6.ogg b/sound/guitar/Db6.ogg new file mode 100644 index 00000000000..a07095c6033 Binary files /dev/null and b/sound/guitar/Db6.ogg differ diff --git a/sound/guitar/Dn4.ogg b/sound/guitar/Dn4.ogg new file mode 100644 index 00000000000..587099a0ddc Binary files /dev/null and b/sound/guitar/Dn4.ogg differ diff --git a/sound/guitar/Dn5.ogg b/sound/guitar/Dn5.ogg new file mode 100644 index 00000000000..d6a9c38415a Binary files /dev/null and b/sound/guitar/Dn5.ogg differ diff --git a/sound/guitar/Dn6.ogg b/sound/guitar/Dn6.ogg new file mode 100644 index 00000000000..4e44d5e72fe Binary files /dev/null and b/sound/guitar/Dn6.ogg differ diff --git a/sound/guitar/Eb4.ogg b/sound/guitar/Eb4.ogg new file mode 100644 index 00000000000..1f93c8273d1 Binary files /dev/null and b/sound/guitar/Eb4.ogg differ diff --git a/sound/guitar/Eb5.ogg b/sound/guitar/Eb5.ogg new file mode 100644 index 00000000000..5b795377f38 Binary files /dev/null and b/sound/guitar/Eb5.ogg differ diff --git a/sound/guitar/Eb6.ogg b/sound/guitar/Eb6.ogg new file mode 100644 index 00000000000..5febf7a37b3 Binary files /dev/null and b/sound/guitar/Eb6.ogg differ diff --git a/sound/guitar/En3.ogg b/sound/guitar/En3.ogg new file mode 100644 index 00000000000..d9679bd78ea Binary files /dev/null and b/sound/guitar/En3.ogg differ diff --git a/sound/guitar/En4.ogg b/sound/guitar/En4.ogg new file mode 100644 index 00000000000..50dad80f506 Binary files /dev/null and b/sound/guitar/En4.ogg differ diff --git a/sound/guitar/En5.ogg b/sound/guitar/En5.ogg new file mode 100644 index 00000000000..8617c069201 Binary files /dev/null and b/sound/guitar/En5.ogg differ diff --git a/sound/guitar/En6.ogg b/sound/guitar/En6.ogg new file mode 100644 index 00000000000..a487ce33e4b Binary files /dev/null and b/sound/guitar/En6.ogg differ diff --git a/sound/guitar/Fb3.ogg b/sound/guitar/Fb3.ogg new file mode 100644 index 00000000000..d9679bd78ea Binary files /dev/null and b/sound/guitar/Fb3.ogg differ diff --git a/sound/guitar/Fb4.ogg b/sound/guitar/Fb4.ogg new file mode 100644 index 00000000000..50dad80f506 Binary files /dev/null and b/sound/guitar/Fb4.ogg differ diff --git a/sound/guitar/Fb5.ogg b/sound/guitar/Fb5.ogg new file mode 100644 index 00000000000..8617c069201 Binary files /dev/null and b/sound/guitar/Fb5.ogg differ diff --git a/sound/guitar/Fb6.ogg b/sound/guitar/Fb6.ogg new file mode 100644 index 00000000000..a487ce33e4b Binary files /dev/null and b/sound/guitar/Fb6.ogg differ diff --git a/sound/guitar/Fn3.ogg b/sound/guitar/Fn3.ogg new file mode 100644 index 00000000000..4e37dc58126 Binary files /dev/null and b/sound/guitar/Fn3.ogg differ diff --git a/sound/guitar/Fn4.ogg b/sound/guitar/Fn4.ogg new file mode 100644 index 00000000000..3bf9957d48a Binary files /dev/null and b/sound/guitar/Fn4.ogg differ diff --git a/sound/guitar/Fn5.ogg b/sound/guitar/Fn5.ogg new file mode 100644 index 00000000000..ad0a0ecec79 Binary files /dev/null and b/sound/guitar/Fn5.ogg differ diff --git a/sound/guitar/Fn6.ogg b/sound/guitar/Fn6.ogg new file mode 100644 index 00000000000..50457e7bf4c Binary files /dev/null and b/sound/guitar/Fn6.ogg differ diff --git a/sound/guitar/Gb3.ogg b/sound/guitar/Gb3.ogg new file mode 100644 index 00000000000..1b2e6c503de Binary files /dev/null and b/sound/guitar/Gb3.ogg differ diff --git a/sound/guitar/Gb4.ogg b/sound/guitar/Gb4.ogg new file mode 100644 index 00000000000..122a0c5c17d Binary files /dev/null and b/sound/guitar/Gb4.ogg differ diff --git a/sound/guitar/Gb5.ogg b/sound/guitar/Gb5.ogg new file mode 100644 index 00000000000..b0346e2f365 Binary files /dev/null and b/sound/guitar/Gb5.ogg differ diff --git a/sound/guitar/Gb6.ogg b/sound/guitar/Gb6.ogg new file mode 100644 index 00000000000..4f873de27cf Binary files /dev/null and b/sound/guitar/Gb6.ogg differ diff --git a/sound/guitar/Gn3.ogg b/sound/guitar/Gn3.ogg new file mode 100644 index 00000000000..783cded9fe5 Binary files /dev/null and b/sound/guitar/Gn3.ogg differ diff --git a/sound/guitar/Gn4.ogg b/sound/guitar/Gn4.ogg new file mode 100644 index 00000000000..92f9cd2fd9d Binary files /dev/null and b/sound/guitar/Gn4.ogg differ diff --git a/sound/guitar/Gn5.ogg b/sound/guitar/Gn5.ogg new file mode 100644 index 00000000000..42fdebc209b Binary files /dev/null and b/sound/guitar/Gn5.ogg differ diff --git a/sound/guitar/Gn6.ogg b/sound/guitar/Gn6.ogg new file mode 100644 index 00000000000..a36bf38f001 Binary files /dev/null and b/sound/guitar/Gn6.ogg differ