mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 02:24:11 +01:00
Merge pull request #14500 from farie82/martial-arts-fix2
Fixes some issue with being cloned while having martial arts
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user