Instruments Refactor and Electric Guitars

code/modules/customitems/item_defines.dm

@@ -246,7 +246,7 @@
 	new /obj/item/weapon/reagent_containers/food/drinks/cans/cola(src)
 
 
-/obj/item/device/guitar/jello_guitar //Antcolon3: Dan Jello
+/obj/item/device/instrument/guitar/jello_guitar //Antcolon3: Dan Jello
 	name = "Dan Jello's Pink Guitar"
 	desc = "Dan Jello's special pink guitar."
 	icon = 'icons/obj/custom_items.dmi'

code/modules/mining/mine_items.dm

@@ -482,7 +482,7 @@
 		var/obj/item/weapon/storage/pill_bottle/dice/D = new(src)
 		load(D)
 	else
-		var/obj/item/device/guitar/G = new(src)
+		var/obj/item/device/instrument/guitar/G = new(src)
 		load(G)
 
 //Fans

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -255,8 +255,9 @@
 	modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
 	modules += new /obj/item/weapon/pen(src)
 	modules += new /obj/item/weapon/razor(src)
-	modules += new /obj/item/device/violin(src)
-	modules += new /obj/item/device/guitar(src)
+	modules += new /obj/item/device/instrument/violin(src)
+	modules += new /obj/item/device/instrument/guitar(src)
+	modules += new /obj/item/device/instrument/eguitar(src)
 
 	var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
 	M.matter = 30

code/modules/store/items.dm

@@ -96,14 +96,20 @@
 /datum/storeitem/violin
 	name = "space violin"
 	desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
-	typepath = /obj/item/device/violin
+	typepath = /obj/item/device/instrument/violin
 	cost = 500
 
 /datum/storeitem/guitar
 	name = "guitar"
 	desc = "It's made of wood and has bronze strings."
-	typepath = /obj/item/device/guitar
-	cost = 700
+	typepath = /obj/item/device/instrument/guitar
+	cost = 500
+
+/datum/storeitem/eguitar
+	name = "electric guitar"
+	desc = "Makes all your shredding needs possible."
+	typepath = /obj/item/device/instrument/eguitar
+	cost = 500
 
 /datum/storeitem/baby
 	name = "Toddler"