From 404881dabac35aae07060c693b51fa8a593be56c Mon Sep 17 00:00:00 2001 From: SplinterGP Date: Sun, 9 Feb 2020 19:06:03 -0300 Subject: [PATCH] Fixes instruments in hand so all of them shows properly it also changes the accordion sprite that changed colors when switching hand for some reason --- .../game/objects/items/devices/instruments.dm | 2 +- code/game/objects/items/devices/violin.dm | 8 ++++---- icons/mob/items/righthand_instruments.dmi | Bin 5172 -> 5631 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index 77ca6018ad..42bef09ae7 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -25,7 +25,7 @@ desc = "A metallic musical instrument with strings, made for all your shredding needs." icon = 'icons/obj/musician_yw.dmi' icon_state = "eguitar" - item_state = "violin" + item_state = "eguitar" attack_verb = list("smashed") instrumentId = "eguitar" instrumentExt = "ogg" diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 4212e147f5..ce6b929f94 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -6,6 +6,10 @@ var/instrumentExt = "mid" icon = 'icons/obj/musician.dmi' force = 10 + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_instruments.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_instruments.dmi', + ) /obj/item/device/instrument/New() ..() @@ -40,10 +44,6 @@ attack_verb = list("smashed") instrumentId = "violin" item_state = "violin" - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_instruments.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_instruments.dmi', - ) /obj/item/device/instrument/violin/gold name = "golden violin" diff --git a/icons/mob/items/righthand_instruments.dmi b/icons/mob/items/righthand_instruments.dmi index b1e6b1a3af40b3aea09290937f322aa683619be0..66831d5f8645a6e259ff1bae3d1f516ef2182849 100644 GIT binary patch delta 5203 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 A)&Kwi