diff --git a/code/datums/components/martial_art_giver.dm b/code/datums/components/martial_art_giver.dm index a2a3bfd97da..67c01ecc5b0 100644 --- a/code/datums/components/martial_art_giver.dm +++ b/code/datums/components/martial_art_giver.dm @@ -10,6 +10,10 @@ style = new style_type(src) /datum/component/martial_art_giver/Destroy() + var/obj/item/item = parent + var/mob/living/wearer = item.loc + if(isliving(wearer)) + style.unlearn(wearer) QDEL_NULL(style) return ..() @@ -25,11 +29,6 @@ /datum/component/martial_art_giver/UnregisterFromParent(datum/source) UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) - var/obj/item/item = parent - var/mob/living/wearer = item.loc - if(istype(wearer)) - dropped(item, wearer) - /datum/component/martial_art_giver/proc/equipped(obj/item/source, mob/user, slot) SIGNAL_HANDLER if(!(source.slot_flags & slot))