Merge pull request #14500 from farie82/martial-arts-fix2

Fixes some issue with being cloned while having martial arts
This commit is contained in:
AffectedArc07
2020-10-02 10:47:56 +01:00
committed by GitHub
2 changed files with 9 additions and 3 deletions
+5
View File
@@ -113,6 +113,11 @@
A.on_body_transfer(old_current, current)
transfer_antag_huds(hud_to_transfer) //inherit the antag HUD
transfer_actions(new_character)
if(martial_art)
if(martial_art.temporary)
martial_art.remove(current)
else
martial_art.teach(current)
if(active)
new_character.key = key //now transfer the key to link the client to our new body
+4 -3
View File
@@ -140,9 +140,10 @@
return
if(H.mind.martial_art != src)
return
H.mind.martial_art = base
if(has_explaination_verb && !(base && base.has_explaination_verb))
H.verbs -= /mob/living/carbon/human/proc/martial_arts_help
H.mind.martial_art = null // Remove reference
H.verbs -= /mob/living/carbon/human/proc/martial_arts_help
if(base)
base.teach(H)
/mob/living/carbon/human/proc/martial_arts_help()
set name = "Show Info"