From 8eccdfcb19fe6673fa43e561746b612cae9f9d30 Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Mon, 27 Feb 2023 10:34:13 -0600 Subject: [PATCH] fixes a highlander runtime and the highland MA not being assigned (#20409) --- code/game/objects/items/weapons/highlander_swords.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/highlander_swords.dm b/code/game/objects/items/weapons/highlander_swords.dm index 1c9bba7d654..fa4019a38ca 100644 --- a/code/game/objects/items/weapons/highlander_swords.dm +++ b/code/game/objects/items/weapons/highlander_swords.dm @@ -29,7 +29,7 @@ return var/mob/living/carbon/human/H = user if(slot == slot_r_hand || slot == slot_l_hand) - if(H.mind.martial_art && H.mind.martial_art != style) + if(H.mind.martial_art != style) style.teach(H, TRUE) to_chat(H, "THERE CAN ONLY BE ONE!") else if(H.mind.martial_art && H.mind.martial_art == style) @@ -44,7 +44,8 @@ if(!ishuman(user)) return var/mob/living/carbon/human/H = user - style.remove(H) + if(H.mind.martial_art == style) + style.remove(H) var/obj/item/claymore/highlander/sword = H.is_in_hands(/obj/item/claymore/highlander) if(sword) //if we have a highlander sword in the other hand, relearn the style from that sword.