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

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

Browse Source 
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
parent ed9c94210d 84813f3fc5
commit b6acce8f89
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/martial_arts/martial.dm
+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"