diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index 924b318a40..04fb2de2db 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -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 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 7e28dc3b15..29cf44ce62 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -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, "Access Denied.") else - return ..() \ No newline at end of file + return ..() diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 90d2efa998..d2b49b0511 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index aa0bd962d1..9d8663cdd2 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/musician.dmi b/icons/obj/musician.dmi index adffb390ad..1f0df7e728 100644 Binary files a/icons/obj/musician.dmi and b/icons/obj/musician.dmi differ