Merge pull request #34800 from ShizCalev/everybody-was-kungfoo-fighting

martial art sanity check
2018-01-24 18:07:01 -02:00
parent 9652fc4127
commit c3ba7008d1
1 changed files with 3 additions and 1 deletions
@@ -76,6 +76,8 @@
 	return 1

 /datum/martial_art/proc/teach(mob/living/carbon/human/H,make_temporary=0)
+	if(!istype(H) || !H.mind)
+		return FALSE
 	if(H.mind.martial_art)
 		if(make_temporary)
 			if(!H.mind.martial_art.allow_temp_override)
@@ -98,7 +100,7 @@
 		base = M

 /datum/martial_art/proc/remove(mob/living/carbon/human/H)
-	if(H.mind.martial_art != src)
+	if(!istype(H) || !H.mind || H.mind.martial_art != src)
 		return
 	on_remove(H)
 	if(base)