From c3ba7008d16646e78d8167d46a4057625d223252 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 24 Jan 2018 18:07:01 -0200 Subject: [PATCH] Merge pull request #34800 from ShizCalev/everybody-was-kungfoo-fighting martial art sanity check --- code/datums/martial.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 146959d5ab..f594f95429 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -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)