cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1289 from Krausus/NoClothes

Browse Source 
Fixes Naked Wizards
This commit is contained in:
Fox-McCloud
2015-06-11 00:42:04 -04:00
parent 4e0535444c 5fdc311f50
commit 1fbaae6deb
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spell.dm
+1 -4
View File
@@ -88,7 +88,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
if(user.is_muzzled())
user << "Mmmf mrrfff!"
return 0
var/obj/effect/proc_holder/spell/wizard/noclothes/spell = locate() in user.spell_list
var/obj/effect/proc_holder/spell/wizard/noclothes/spell = locate() in (user.spell_list | (user.mind ? user.mind.spell_list : list()))
if(clothes_req && !(spell && istype(spell)))//clothes check
if(!istype(user, /mob/living/carbon/human))
user << "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans."
@@ -370,13 +370,10 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
var/obj/effect/proc_holder/spell/wizard/noclothes/clothcheck2 = locate() in user.mind.spell_list
if(clothes_req && !(clothcheck && istype(clothcheck)) && !(clothcheck2 && istype(clothcheck2)))//clothes check
if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/rig/wizard))
user << "I don't feel strong enough without my robe."
return 0
if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))
user << "I don't feel strong enough without my sandals."
return 0
if(!istype(H.head, /obj/item/clothing/head/wizard) && !istype(H.head, /obj/item/clothing/head/helmet/space/rig/wizard))
user << "<span class='notice'>I don't feel strong enough without my hat.</span>"
return 0
else
if(clothes_req)