shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes martial arts not be deleted (#1931)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-07 12:35:40 -05:00
committed by kevinz000
parent 29d2c7b980
commit 998a75bc89
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial.dm
+4 -6
View File
@@ -83,8 +83,6 @@
store(H.mind.martial_art,H)
else
H.mind.martial_art.on_remove(H)
if(H.mind.martial_art != H.mind.default_martial_art && !H.mind.martial_art.base)
QDEL_NULL(H.mind.martial_art)
else if(make_temporary)
base = H.mind.default_martial_art
if(help_verb)
@@ -93,11 +91,11 @@
return TRUE
/datum/martial_art/proc/store(datum/martial_art/M,mob/living/carbon/human/H)
if(H.mind && base)
if(H.mind.default_martial_art != base && !base.base)
QDEL_NULL(base)
M.on_remove(H)
base = M
if(M.base) //Checks if M is temporary, if so it will not be stored.
base = M.base
else //Otherwise, M is stored.
base = M
/datum/martial_art/proc/remove(mob/living/carbon/human/H)
if(H.mind.martial_art != src)