From 906a3d3ba24ff3236b13229f69b770c313c5a5b7 Mon Sep 17 00:00:00 2001 From: Krausus Date: Tue, 9 Aug 2016 03:44:09 -0400 Subject: [PATCH] Fixes noclothes check on mindless mobs' spells --- code/datums/spell.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 63b9405f73e..99910f039a7 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -388,9 +388,9 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin if((invocation_type == "whisper" || invocation_type == "shout") && H.is_muzzled()) return 0 - var/obj/effect/proc_holder/spell/noclothes/clothcheck = locate() in user.mob_spell_list - var/obj/effect/proc_holder/spell/noclothes/clothcheck2 = locate() in user.mind.spell_list - if(clothes_req && !(clothcheck && istype(clothcheck)) && !(clothcheck2 && istype(clothcheck2)))//clothes check + var/clothcheck = locate(/obj/effect/proc_holder/spell/noclothes) in user.mob_spell_list + var/clothcheck2 = user.mind && (locate(/obj/effect/proc_holder/spell/noclothes) in user.mind.spell_list) + if(clothes_req && !clothcheck && !clothcheck2) //clothes check if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/rig/wizard)) return 0 if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))