From ec97bbceee34231acdc337c0c7d28071cd7155b4 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sat, 22 Jun 2019 07:43:01 +0200 Subject: [PATCH] Fixes musician quirk runtime without backpack. (#44703) * Fixes musician quirk runtime without backpack. * copypasta mistakes. --- code/datums/traits/good.dm | 8 +++++--- code/modules/mob/living/carbon/inventory.dm | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 0d82c615a51..cc98e206a87 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -98,9 +98,11 @@ /datum/quirk/musician/on_spawn() var/mob/living/carbon/human/H = quirk_holder var/obj/item/choice_beacon/music/B = new(get_turf(H)) - H.put_in_hands(B) - H.equip_to_slot(B, SLOT_IN_BACKPACK) - H.regenerate_icons() + var/list/slots = list ( + "backpack" = SLOT_IN_BACKPACK, + "hands" = SLOT_HANDS, + ) + H.equip_in_one_of_slots(B, slots , qdel_on_fail = TRUE) /datum/quirk/night_vision name = "Night Vision" diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm index 30e16f6f034..105d039b17f 100644 --- a/code/modules/mob/living/carbon/inventory.dm +++ b/code/modules/mob/living/carbon/inventory.dm @@ -72,7 +72,7 @@ put_in_hands(I) update_inv_hands() if(SLOT_IN_BACKPACK) - if(!SEND_SIGNAL(back, COMSIG_TRY_STORAGE_INSERT, I, src, TRUE)) + if(!back || !SEND_SIGNAL(back, COMSIG_TRY_STORAGE_INSERT, I, src, TRUE)) not_handled = TRUE else not_handled = TRUE