Adds a "synthesizer" that's basically a handheld piano

This commit is contained in:
CitadelStationBot
2017-07-13 17:46:46 -05:00
parent da324257fe
commit b3f8b2a2d7
5 changed files with 10 additions and 4 deletions
@@ -3,6 +3,7 @@
name = "generic instrument"
resistance_flags = FLAMMABLE
max_integrity = 100
icon = 'icons/obj/musician.dmi'
var/datum/song/handheld/song
var/instrumentId = "generic"
var/instrumentExt = "ogg"
@@ -45,7 +46,6 @@
/obj/item/device/instrument/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.\""
icon = 'icons/obj/musician.dmi'
icon_state = "violin"
item_state = "violin"
force = 10
@@ -59,10 +59,16 @@
item_state = "golden_violin"
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/device/instrument/piano_synth
name = "synthesizer"
desc = "An electronic synthesizer that can play piano music."
icon_state = "synth"
item_state = "synth"
instrumentId = "piano"
/obj/item/device/instrument/guitar
name = "guitar"
desc = "It's made of wood and has bronze strings."
icon = 'icons/obj/musician.dmi'
icon_state = "guitar"
item_state = "guitar"
force = 10
@@ -73,7 +79,6 @@
/obj/item/device/instrument/eguitar
name = "electric guitar"
desc = "Makes all your shredding needs possible."
icon = 'icons/obj/musician.dmi'
icon_state = "eguitar"
item_state = "eguitar"
force = 12
@@ -28,6 +28,7 @@
/obj/structure/closet/secure_closet/personal/cabinet/PopulateContents()
new /obj/item/weapon/storage/backpack/satchel/leather/withwallet( src )
new /obj/item/device/instrument/piano_synth(src)
new /obj/item/device/radio/headset( src )
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
@@ -49,4 +50,4 @@
else
to_chat(user, "<span class='danger'>Access Denied.</span>")
else
return ..()
return ..()
Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 129 KiB

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB