Merge pull request #7920 from Fox-McCloud/musics

Adds a Bunch of Instruments
This commit is contained in:
tigercat2000
2017-08-28 14:21:39 -07:00
committed by GitHub
712 changed files with 164 additions and 21 deletions
@@ -255,9 +255,7 @@
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/instrument/violin(src)
modules += new /obj/item/device/instrument/guitar(src)
modules += new /obj/item/device/instrument/eguitar(src)
modules += new /obj/item/device/instrument/piano_synth(src)
var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
M.matter = 30
+6
View File
@@ -93,6 +93,12 @@
typepath = /obj/item/toy/katana
cost = 500
/datum/storeitem/piano_synth
name = "piano synthesizer"
desc = "An advanced electronic synthesizer that can be used as various instruments."
typepath = /obj/item/device/instrument/piano_synth
cost = 1000
/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.\""