cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes a highlander runtime and the highland MA not being assigned (#20409)

Browse Source
This commit is contained in:
GDN
2023-02-27 10:34:13 -06:00
committed by GitHub
parent 5492f97e02
commit 8eccdfcb19
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/highlander_swords.dm
+3 -2
View File
@@ -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, "<span class='notice'>THERE CAN ONLY BE ONE!</span>")
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.