From 81030c717cde1a6ad6fa70ac567a0ccaeb565764 Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Wed, 7 Jun 2017 15:11:37 -0400 Subject: [PATCH] Destroy() --- code/game/objects/items/weapons/highlander_swords.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/highlander_swords.dm b/code/game/objects/items/weapons/highlander_swords.dm index 4b575dcd065..284a909a227 100644 --- a/code/game/objects/items/weapons/highlander_swords.dm +++ b/code/game/objects/items/weapons/highlander_swords.dm @@ -17,6 +17,13 @@ desc = "Imbues the wielder with legendary martial prowress and a nigh-unquenchable thirst for glorious battle!" var/datum/martial_art/highlander/style = new +/obj/item/weapon/claymore/highlander/Destroy() + if(ishuman(loc)) //just in case it gets destroyed while in someone's possession, such as due to acid or something? + var/mob/living/carbon/human/H = loc + style.remove(H) + QDEL_NULL(style) + return ..() + /obj/item/weapon/claymore/highlander/equipped(mob/user, slot) if(!ishuman(user)) return @@ -32,8 +39,6 @@ //if we have a highlander sword in the other hand, relearn the style from that sword. sword.style.teach(H, 1) - return - /obj/item/weapon/claymore/highlander/dropped(mob/user) if(!ishuman(user)) return @@ -43,4 +48,3 @@ if(sword) //if we have a highlander sword in the other hand, relearn the style from that sword. sword.style.teach(H, 1) - return