Spellcasting element

code/modules/spells/spell.dm

@@ -109,10 +109,9 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 	var/holder_var_type = "bruteloss" //only used if charge_type equals to "holder_var"
 	var/holder_var_amount = 20 //same. The amount adjusted with the mob's var when the spell is used
 
-	var/clothes_req = 1 //see if it requires clothes
-	var/cult_req = 0 //SPECIAL SNOWFLAKE clothes required for cult only spells
-	var/human_req = 0 //spell can only be cast by humans
-	var/nonabstract_req = 0 //spell can only be cast by mobs that are physical entities
+	var/clothes_req = SPELL_WIZARD_GARB //see if it requires clothes
+	var/list/mobs_whitelist //spell can only be casted by mobs in this typecache.
+	var/list/mobs_blacklist //The opposite of the above.
 	var/stat_allowed = 0 //see if it requires being conscious/alive, need to set to 1 for ghostpells
 	var/phase_allowed = 0 // If true, the spell can be cast while phased, eg. blood crawling, ethereal jaunting
 	var/antimagic_allowed = TRUE // If false, the spell cannot be cast while under the effect of antimagic
@@ -144,79 +143,17 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 	action_background_icon_state = "bg_spell"
 	base_action = /datum/action/spell_action/spell
 
-/obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0,mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
-	if(player_lock)
-		if(!user.mind || !(src in user.mind.spell_list) && !(src in user.mob_spell_list))
-			to_chat(user, "<span class='warning'>You shouldn't have this spell! Something's wrong.</span>")
-			return FALSE
-	else
-		if(!(src in user.mob_spell_list))
-			return FALSE
+/obj/effect/proc_holder/spell/Initialize()
+	. = ..()
+	if(mobs_whitelist)
+		mobs_whitelist = typecacheof(mobs_whitelist)
+	if(mobs_blacklist)
+		mobs_blacklist = typecacheof(mobs_blacklist)
 
-	var/turf/T = get_turf(user)
-	if(is_centcom_level(T.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
-		to_chat(user, "<span class='notice'>You can't cast this spell here.</span>")
+/obj/effect/proc_holder/spell/proc/cast_check(skipcharge = FALSE, mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
+	if(!can_cast(user, skipcharge))
 		return FALSE
 
-	if(!skipcharge)
-		if(!charge_check(user))
-			return FALSE
-
-	if(user.stat && !stat_allowed)
-		to_chat(user, "<span class='notice'>Not when you're incapacitated.</span>")
-		return FALSE
-
-	if(!antimagic_allowed)
-		var/antimagic = user.anti_magic_check(TRUE, FALSE, chargecost = 0, self = TRUE)
-		if(antimagic)
-			if(isitem(antimagic))
-				to_chat(user, "<span class='notice'>[antimagic] is interfering with your magic.</span>")
-			else
-				to_chat(user, "<span class='notice'>Magic seems to flee from you, you can't gather enough power to cast this spell.</span>")
-			return FALSE
-
-	if(!phase_allowed && istype(user.loc, /obj/effect/dummy))
-		to_chat(user, "<span class='notice'>[name] cannot be cast unless you are completely manifested in the material plane.</span>")
-		return FALSE
-
-	if(ishuman(user))
-
-		var/mob/living/carbon/human/H = user
-
-		if((invocation_type == "whisper" || invocation_type == "shout") && !H.can_speak_vocal())
-			to_chat(user, "<span class='notice'>You can't get the words out!</span>")
-			return FALSE
-
-		var/list/casting_clothes = typecacheof(list(/obj/item/clothing/suit/wizrobe,
-		/obj/item/clothing/suit/space/hardsuit/wizard,
-		/obj/item/clothing/head/wizard,
-		/obj/item/clothing/head/helmet/space/hardsuit/wizard,
-		/obj/item/clothing/suit/space/hardsuit/shielded/wizard,
-		/obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard))
-
-		if(clothes_req) //clothes check
-			if(!is_type_in_typecache(H.wear_suit, casting_clothes))
-				to_chat(H, "<span class='notice'>I don't feel strong enough without my robe.</span>")
-				return FALSE
-			if(!is_type_in_typecache(H.head, casting_clothes))
-				to_chat(H, "<span class='notice'>I don't feel strong enough without my hat.</span>")
-				return FALSE
-		if(cult_req) //CULT_REQ CLOTHES CHECK
-			if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult))
-				to_chat(H, "<span class='notice'>I don't feel strong enough without my armor.</span>")
-				return FALSE
-			if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult))
-				to_chat(H, "<span class='notice'>I don't feel strong enough without my helmet.</span>")
-				return FALSE
-	else
-		if(clothes_req || human_req)
-			to_chat(user, "<span class='notice'>This spell can only be cast by humans!</span>")
-			return FALSE
-		if(nonabstract_req && (isbrain(user) || ispAI(user)))
-			to_chat(user, "<span class='notice'>This spell can only be cast by physical beings!</span>")
-			return FALSE
-
-
 	if(!skipcharge)
 		switch(charge_type)
 			if("recharge")
@@ -227,7 +164,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 				adjust_var(user, holder_var_type, holder_var_amount)
 	if(action)
 		action.UpdateButtonIcon()
-	return 1
+	return TRUE
 
 /obj/effect/proc_holder/spell/proc/charge_check(mob/user, silent = FALSE)
 	switch(charge_type)
@@ -482,11 +419,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 /obj/effect/proc_holder/spell/proc/updateButtonIcon(status_only, force)
 	action.UpdateButtonIcon(status_only, force)
 
-/obj/effect/proc_holder/spell/proc/can_be_cast_by(mob/caster)
-	if((human_req || clothes_req) && !ishuman(caster))
-		return 0
-	return 1
-
 /obj/effect/proc_holder/spell/targeted/proc/los_check(mob/A,mob/B)
 	//Checks for obstacles from A to B
 	var/obj/dummy = new(A.loc)
@@ -499,24 +431,65 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 	qdel(dummy)
 	return 1
 
-/obj/effect/proc_holder/spell/proc/can_cast(mob/user = usr)
-	if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.mob_spell_list))
+/obj/effect/proc_holder/spell/proc/can_cast(mob/user = usr, skipcharge = FALSE, silent = FALSE)
+	var/magic_flags = SEND_SIGNAL(user, COMSIG_MOB_SPELL_CAST_CHECK, src)
+	if(magic_flags & SPELL_SKIP_ALL_REQS)
+		return TRUE
+
+	if(player_lock && (!user.mind || !(src in user.mind.spell_list)))
+		if(!silent)
+			to_chat(user, "<span class='warning'>You shouldn't have this spell! Something's wrong.</span>")
 		return FALSE
 
-	if(!charge_check(user,TRUE))
+	if(!(src in user.mob_spell_list))
 		return FALSE
 
-	if(user.stat && !stat_allowed)
-		return FALSE
-
-	if(!antimagic_allowed && user.anti_magic_check(TRUE, FALSE, chargecost = 0, self = TRUE))
-		return FALSE
-
-	if(!ishuman(user))
-		if(clothes_req || human_req)
+	if(!centcom_cancast && !(magic_flags & SPELL_SKIP_CENTCOM)) //Certain spells are not allowed on the centcom zlevel
+		var/turf/T = get_turf(user)
+		if(is_centcom_level(T.z))
+			if(!silent)
+				to_chat(user, "<span class='notice'>You can't cast this spell here.</span>")
 			return FALSE
-		if(nonabstract_req && (isbrain(user) || ispAI(user)))
+
+	if(!skipcharge)
+		if(!charge_check(user))
 			return FALSE
+
+	if(user.stat && !stat_allowed && !(magic_flags & SPELL_SKIP_STAT))
+		if(!silent)
+			to_chat(user, "<span class='notice'>Not when you're incapacitated.</span>")
+		return FALSE
+
+	if(!phase_allowed && istype(user.loc, /obj/effect/dummy))
+		if(!silent)
+			to_chat(user, "<span class='notice'>[name] cannot be cast unless you are completely manifested in the material plane.</span>")
+		return FALSE
+
+	if(clothes_req && !(magic_flags & SPELL_SKIP_CLOTHES))
+		var/met_requirements = magic_flags & (clothes_req)
+		if(met_requirements != clothes_req)
+			if(!silent)
+				var/the_many_hats = met_requirements & (clothes_req & (SPELL_WIZARD_HAT|SPELL_CULT_HELMET))
+				var/the_many_suits = met_requirements & (clothes_req & (SPELL_WIZARD_ROBE|SPELL_CULT_ARMOR))
+				var/without_hat_robe = the_many_suits ? "a proper headwear" : the_many_hats ? "a proper suit" : "proper garments"
+				to_chat(user, "<span class='notice'>I don't feel strong enough to cast this spell without [without_hat_robe].</span>")
+			return FALSE
+
+	if(!antimagic_allowed && !(magic_flags & SPELL_SKIP_ANTIMAGIC) && user.anti_magic_check(TRUE, FALSE, chargecost = 0, self = TRUE))
+		return FALSE
+
+
+	if(!(magic_flags & SPELL_SKIP_VOCAL) && (invocation_type in list("whisper", "shout")) && isliving(user))
+		var/mob/living/L = user
+		if(!L.can_speak_vocal())
+			if(!silent)
+				to_chat(L, "<span class='notice'>You can't get the words out!</span>")
+			return FALSE
+
+	if(!(magic_flags & SPELL_SKIP_MOBTYPE) && ((mobs_whitelist && !mobs_whitelist[user]) || (mobs_blacklist && mobs_blacklist[user])))
+		if(!silent)
+			to_chat(user, "<span class='notice'>This spell can't be casted in this current form!</span>")
+		return FALSE
 	return TRUE
 
 /obj/effect/proc_holder/spell/self //Targets only the caster. Good for buffs and heals, but probably not wise for fireballs (although they usually fireball themselves anyway, honke)
@@ -531,8 +504,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 /obj/effect/proc_holder/spell/self/basic_heal //This spell exists mainly for debugging purposes, and also to show how casting works
 	name = "Lesser Heal"
 	desc = "Heals a small amount of brute and burn damage."
-	human_req = 1
-	clothes_req = 0
+	mobs_whitelist = list(/mob/living/carbon/human)
+	clothes_req = NONE
 	charge_max = 100
 	cooldown_min = 50
 	invocation = "Victus sano!"

code/modules/spells/spell_types/aimed.dm

@@ -16,7 +16,7 @@
 	if(!istype(user))
 		return
 	var/msg
-	if(!can_cast(user))
+	if(!can_cast(user, FALSE, TRUE))
 		msg = "<span class='warning'>You can no longer cast [name]!</span>"
 		remove_ranged_ability(msg)
 		return
@@ -95,7 +95,6 @@
 	desc = "Fire a high powered lightning bolt at your foes!"
 	school = "evocation"
 	charge_max = 150
-	clothes_req = 1
 	invocation = "ZAP MUTHA'FUCKA"
 	invocation_type = "shout"
 	cooldown_min = 30
@@ -113,7 +112,7 @@
 	desc = "This spell fires a fireball at a target and does not require wizard garb."
 	school = "evocation"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "ONI SOMA"
 	invocation_type = "shout"
 	range = 20
@@ -131,7 +130,7 @@
 	desc = "Blazing hot rapid-fire homing cards. Banish your foes with its mystical power!"
 	school = "evocation"
 	charge_max = 50
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "Sigi'lu M'Fan 'Tasia"
 	invocation_type = "shout"
 	range = 40

code/modules/spells/spell_types/area_teleport.dm

@@ -1,7 +1,7 @@
 /obj/effect/proc_holder/spell/targeted/area_teleport
 	name = "Area teleport"
 	desc = "This spell teleports you to a type of area of your selection."
-	nonabstract_req = 1
+	mobs_blacklist = list(/mob/living/brain, /mob/living/silicon/pai)
 
 	var/randomise_selection = 0 //if it lets the usr choose the teleport loc or picks it from the list
 	var/invocation_area = 1 //if the invocation appends the selected area

code/modules/spells/spell_types/barnyard.dm

@@ -5,7 +5,7 @@
 	charge_type = "recharge"
 	charge_max	= 150
 	charge_counter = 0
-	clothes_req = 0
+	clothes_req = NONE
 	stat_allowed = 0
 	invocation = "KN'A FTAGHU, PUCK 'BTHNK!"
 	invocation_type = "shout"

code/modules/spells/spell_types/bloodcrawl.dm

@@ -2,7 +2,7 @@
 	name = "Blood Crawl"
 	desc = "Use pools of blood to phase out of existence."
 	charge_max = 0
-	clothes_req = 0
+	clothes_req = NONE
 	//If you couldn't cast this while phased, you'd have a problem
 	phase_allowed = 1
 	selection_type = "range"

code/modules/spells/spell_types/charge.dm

@@ -4,7 +4,7 @@
 
 	school = "transmutation"
 	charge_max = 600
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "DIRI CEL"
 	invocation_type = "whisper"
 	range = -1

code/modules/spells/spell_types/conjure.dm

@@ -60,7 +60,7 @@
 	name = "Link Worlds"
 	desc = "A whole new dimension for you to play with! They won't be happy about it, though."
 	invocation = "WTF"
-	clothes_req = FALSE
+	clothes_req = NONE
 	charge_max = 600
 	cooldown_min = 200
 	summon_type = list(/obj/structure/spawner/nether)
@@ -74,7 +74,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	var/obj/item/item
 	var/item_type = /obj/item/banhammer
 	school = "conjuration"

code/modules/spells/spell_types/construct_spells.dm

@@ -7,7 +7,7 @@
 	action_background_icon_state = "bg_demon"
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser/cult
-	cult_req = 1
+	clothes_req = SPELL_CULT_GARB
 	charge_max = 2500
 
 
@@ -17,7 +17,7 @@
 
 	school = "transmutation"
 	charge_max = 50
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 2
@@ -37,7 +37,7 @@
 
 	school = "conjuration"
 	charge_max = 20
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -53,7 +53,7 @@
 
 	school = "conjuration"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -70,7 +70,7 @@
 
 	school = "conjuration"
 	charge_max = 300
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -83,7 +83,7 @@
 
 	school = "conjuration"
 	charge_max = 2400
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -94,7 +94,7 @@
 	summon_type = list(/obj/item/soulstone)
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/cult
-	cult_req = 1
+	clothes_req = SPELL_CULT_GARB
 	charge_max = 3600
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult
@@ -105,7 +105,7 @@
 	desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire."
 	school = "transmutation"
 	charge_max = 400
-	clothes_req = FALSE
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	wall_type = /obj/effect/forcefield/cult
@@ -121,7 +121,7 @@
 
 	school = "transmutation"
 	charge_max = 250
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
@@ -143,7 +143,7 @@
 
 	school = "evocation"
 	charge_max = 400
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	proj_type = "/obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile/lesser"
@@ -161,7 +161,7 @@
 
 	school = "conjuration"
 	charge_max = 200
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
@@ -185,7 +185,7 @@
 	stat_allowed = FALSE
 
 	school = "evocation"
-	clothes_req = FALSE
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	action_icon = 'icons/mob/actions/actions_cult.dmi'
@@ -232,7 +232,7 @@
 	stat_allowed = FALSE
 
 	school = "evocation"
-	clothes_req = FALSE
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	action_icon = 'icons/mob/actions/actions_cult.dmi'
@@ -294,7 +294,7 @@
 	proj_lifespan = 15
 	proj_step_delay = 7
 	charge_max = 350
-	clothes_req = FALSE
+	clothes_req = NONE
 	action_icon = 'icons/mob/actions/actions_cult.dmi'
 	action_icon_state = "cultfist"
 	action_background_icon_state = "bg_demon"

code/modules/spells/spell_types/devil.dm

@@ -4,7 +4,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	item_type = /obj/item/twohanded/pitchfork/demonic
 
 	school = "conjuration"
@@ -37,7 +37,7 @@
 	invocation = "Just sign on the dotted line."
 	include_user = 0
 	range = 5
-	clothes_req = 0
+	clothes_req = NONE
 
 	school = "conjuration"
 	charge_max = 150
@@ -79,7 +79,7 @@
 
 	school = "evocation"
 	charge_max = 80
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "Your very soul will catch fire!"
 	invocation_type = "shout"
 	range = 2
@@ -92,7 +92,7 @@
 	name = "Infernal Jaunt"
 	desc = "Use hellfire to phase out of existence."
 	charge_max = 200
-	clothes_req = 0
+	clothes_req = NONE
 	selection_type = "range"
 	range = -1
 	cooldown_min = 0
@@ -167,7 +167,7 @@
 	name = "Sin Touch"
 	desc = "Subtly encourage someone to sin."
 	charge_max = 1800
-	clothes_req = 0
+	clothes_req = NONE
 	selection_type = "range"
 	range = 2
 	cooldown_min = 0
@@ -206,7 +206,7 @@
 	desc = "When what a Devil really needs is funk."
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 
 	school = "conjuration"
 	charge_max = 10

code/modules/spells/spell_types/devil_boons.dm

@@ -4,7 +4,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	school = "conjuration"
 	charge_max = 100
 	cooldown_min = 10
@@ -32,7 +32,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	charge_max = 50
 	cooldown_min = 10
 	action_icon = 'icons/mob/actions/actions_silicon.dmi'
@@ -51,7 +51,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	charge_max = 50
 	cooldown_min = 10
 	action_icon = 'icons/mob/actions/actions_spells.dmi'
@@ -73,4 +73,4 @@
 		friendShell = new /obj/effect/mob_spawn/human/demonic_friend(L.loc, L.mind, src)
 
 /obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket/robeless
-	clothes_req = FALSE
+	clothes_req = NONE

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -4,13 +4,12 @@
 
 	school = "transmutation"
 	charge_max = 300
-	clothes_req = 1
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
 	cooldown_min = 100 //50 deciseconds reduction per rank
 	include_user = 1
-	nonabstract_req = 1
+	mobs_blacklist = list(/mob/living/brain, /mob/living/silicon/pai)
 	var/jaunt_duration = 50 //in deciseconds
 	var/jaunt_in_time = 5
 	var/jaunt_in_type = /obj/effect/temp_visual/wizard

code/modules/spells/spell_types/forcewall.dm

@@ -3,7 +3,7 @@
 	desc = "Create a magical barrier that only you can pass through. Does not require wizard garb."
 	school = "transmutation"
 	charge_max = 80
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "TARCOL MINTI ZHERI"
 	invocation_type = "shout"
 	sound = 'sound/magic/forcewall.ogg'

code/modules/spells/spell_types/infinite_guns.dm

@@ -7,7 +7,6 @@
 
 	school = "conjuration"
 	charge_max = 750
-	clothes_req = 1
 	cooldown_min = 10 //Gun wizard
 	action_icon_state = "bolt_action"
 	var/summon_path = /obj/item/gun/ballistic/shotgun/boltaction/enchanted

code/modules/spells/spell_types/knock.dm

@@ -4,7 +4,7 @@
 
 	school = "transmutation"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "AULIE OXIN FIERA"
 	invocation_type = "whisper"
 	range = 3

code/modules/spells/spell_types/lichdom.dm

@@ -8,7 +8,7 @@
 	becoming a lich destroys all internal organs except the brain."
 	school = "necromancy"
 	charge_max = 10
-	clothes_req = 0
+	clothes_req = NONE
 	centcom_cancast = 0
 	invocation = "NECREM IMORTIUM!"
 	invocation_type = "shout"

code/modules/spells/spell_types/lightning.dm

@@ -3,7 +3,6 @@
 	desc = "Blast lightning at your foes!"
 	charge_type = "recharge"
 	charge_max	= 270
-	clothes_req = 1
 	invocation = "UN'LTD P'WAH!"
 	invocation_type = "shout"
 	range = 7

code/modules/spells/spell_types/mime.dm

@@ -8,10 +8,10 @@
 	invocation_emote_self = "<span class='notice'>You form a wall in front of yourself.</span>"
 	summon_lifespan = 300
 	charge_max = 300
-	clothes_req = 0
+	clothes_req = NONE
 	range = 0
 	cast_sound = null
-	human_req = 1
+	mobs_whitelist = list(/mob/living/carbon/human)
 
 	action_icon_state = "mime"
 	action_background_icon_state = "bg_mime"
@@ -32,8 +32,8 @@
 	desc = "Make or break a vow of silence."
 	school = "mime"
 	panel = "Mime"
-	clothes_req = 0
-	human_req = 1
+	clothes_req = NONE
+	mobs_whitelist = list(/mob/living/carbon/human)
 	charge_max = 3000
 	range = -1
 	include_user = 1
@@ -75,7 +75,7 @@
 	invocation_emote_self = "<span class='notice'>You form a blockade in front of yourself.</span>"
 	charge_max = 600
 	sound =  null
-	clothes_req = 0
+	clothes_req = NONE
 	range = -1
 	include_user = 1
 
@@ -98,7 +98,7 @@
 	school = "mime"
 	panel = "Mime"
 	charge_max = 300
-	clothes_req = 0
+	clothes_req = NONE
 	invocation_type = "emote"
 	invocation_emote_self = "<span class='dangers'>You fire your finger gun!</span>"
 	range = 20

code/modules/spells/spell_types/mind_transfer.dm

@@ -4,7 +4,7 @@
 
 	school = "transmutation"
 	charge_max = 600
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "GIN'YU CAPAN"
 	invocation_type = "whisper"
 	range = 1

code/modules/spells/spell_types/rod_form.dm

@@ -1,8 +1,6 @@
 /obj/effect/proc_holder/spell/targeted/rod_form
 	name = "Rod Form"
 	desc = "Take on the form of an immovable rod, destroying all in your path."
-	clothes_req = 1
-	human_req = 0
 	charge_max = 250
 	cooldown_min = 100
 	range = -1

code/modules/spells/spell_types/santa.dm

@@ -4,7 +4,7 @@
 	desc = "This spell lets you reach into S-space and retrieve presents! Yay!"
 	school = "santa"
 	charge_max = 600
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "HO HO HO"
 	invocation_type = "shout"
 	range = 3

code/modules/spells/spell_types/shadow_walk.dm

@@ -2,7 +2,7 @@
 	name = "Shadow Walk"
 	desc = "Grants unlimited movement in darkness."
 	charge_max = 0
-	clothes_req = 0
+	clothes_req = NONE
 	phase_allowed = 1
 	selection_type = "range"
 	range = -1

code/modules/spells/spell_types/shapeshift.dm

@@ -1,8 +1,7 @@
 /obj/effect/proc_holder/spell/targeted/shapeshift
 	name = "Shapechange"
 	desc = "Take on the shape of another for a time to use their natural abilities. Once you've made your choice it cannot be changed."
-	clothes_req = 0
-	human_req = 0
+	clothes_req = NONE
 	charge_max = 200
 	cooldown_min = 50
 	range = -1
@@ -59,8 +58,9 @@
 	var/mob/living/shape = new shapeshift_type(caster.loc)
 	H = new(shape,src,caster)
 
-	clothes_req = 0
-	human_req = 0
+	clothes_req = NONE
+	mobs_whitelist = null
+	mobs_blacklist = null
 
 /obj/effect/proc_holder/spell/targeted/shapeshift/proc/Restore(mob/living/shape)
 	var/obj/shapeshift_holder/H = locate() in shape
@@ -70,7 +70,8 @@
 	H.restore()
 
 	clothes_req = initial(clothes_req)
-	human_req = initial(human_req)
+	mobs_whitelist = typecacheof(initial(mobs_whitelist))
+	mobs_blacklist = typecacheof(initial(mobs_blacklist))
 
 /obj/effect/proc_holder/spell/targeted/shapeshift/dragon
 	name = "Dragon Form"

code/modules/spells/spell_types/spacetime_distortion.dm

@@ -11,7 +11,7 @@
 	cooldown_min = 300
 	level_max = 0
 
-/obj/effect/proc_holder/spell/spacetime_dist/can_cast(mob/user = usr)
+/obj/effect/proc_holder/spell/spacetime_dist/can_cast(mob/user = usr, skipcharge = FALSE, silent = FALSE)
 	if(ready)
 		return ..()
 	return FALSE

code/modules/spells/spell_types/summonitem.dm

@@ -3,7 +3,7 @@
 	desc = "This spell can be used to recall a previously marked item to your hand from anywhere in the universe."
 	school = "transmutation"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "GAR YOK"
 	invocation_type = "whisper"
 	range = -1

code/modules/spells/spell_types/taeclowndo.dm

@@ -4,7 +4,6 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
 	item_type = /obj/item/reagent_containers/food/snacks/pie/cream
 
 	charge_max = 30
@@ -20,7 +19,7 @@
 	charge_type = "recharge"
 	charge_max	= 100
 	cooldown_min = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation_type = "none"
 	range = 7
 	selection_type = "view"
@@ -61,7 +60,7 @@
 	hand_path = /obj/item/melee/touch_attack/megahonk
 
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	cooldown_min = 100
 
 	action_icon = 'icons/mecha/mecha_equipment.dmi'
@@ -75,7 +74,7 @@
 	hand_path = /obj/item/melee/touch_attack/bspie
 
 	charge_max = 450
-	clothes_req = 0
+	clothes_req = NONE
 	cooldown_min = 450
 
 	action_icon = 'icons/obj/food/piecake.dmi'

code/modules/spells/spell_types/telepathy.dm

@@ -2,7 +2,7 @@
 	name = "Telepathy"
 	desc = "Telepathically transmits a message to the target."
 	charge_max = 0
-	clothes_req = 0
+	clothes_req = NONE
 	range = 7
 	include_user = 0
 	action_icon = 'icons/mob/actions/actions_revenant.dmi'

code/modules/spells/spell_types/the_traps.dm

@@ -5,7 +5,6 @@
 	charge_max = 250
 	cooldown_min = 50
 
-	clothes_req = 1
 	invocation = "CAVERE INSIDIAS"
 	invocation_type = "shout"
 	range = 3

code/modules/spells/spell_types/touch_attacks.dm

@@ -54,7 +54,6 @@
 
 	school = "evocation"
 	charge_max = 600
-	clothes_req = 1
 	cooldown_min = 200 //100 deciseconds reduction per rank
 
 	action_icon_state = "gib"
@@ -66,7 +65,6 @@
 
 	school = "transmutation"
 	charge_max = 600
-	clothes_req = 1
 	cooldown_min = 200 //100 deciseconds reduction per rank
 
 	action_icon_state = "statue"
@@ -79,7 +77,7 @@
 
 	school = "evocation"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	cooldown_min = 20
 
 	action_icon_state = "nuclearfist"

code/modules/spells/spell_types/turf_teleport.dm

@@ -1,7 +1,7 @@
 /obj/effect/proc_holder/spell/targeted/turf_teleport
 	name = "Turf Teleport"
 	desc = "This spell teleports the target to the turf in range."
-	nonabstract_req = 1
+	mobs_blacklist = list(/mob/living/brain, /mob/living/silicon/pai)
 
 	var/inner_tele_radius = 1
 	var/outer_tele_radius = 2

code/modules/spells/spell_types/voice_of_god.dm

@@ -4,7 +4,7 @@
 	charge_max = 1200 //variable
 	cooldown_min = 0
 	level_max = 1
-	clothes_req = 0
+	clothes_req = NONE
 	action_icon = 'icons/mob/actions/actions_items.dmi'
 	action_icon_state = "voice_of_god"
 	var/command
@@ -13,9 +13,10 @@
 	var/list/spans = list("colossus","yell")
 	var/speech_sound = 'sound/magic/clockwork/invoke_general.ogg'
 
-/obj/effect/proc_holder/spell/voice_of_god/can_cast(mob/user = usr)
+/obj/effect/proc_holder/spell/voice_of_god/can_cast(mob/user = usr, skipcharge = FALSE, silent = TRUE)
 	if(!user.can_speak())
-		to_chat(user, "<span class='warning'>You are unable to speak!</span>")
+		if(!silent)
+			to_chat(user, "<span class='warning'>You are unable to speak!</span>")
 		return FALSE
 	return TRUE
 

code/modules/spells/spell_types/wizard.dm

@@ -4,7 +4,6 @@
 
 	school = "evocation"
 	charge_max = 200
-	clothes_req = 1
 	invocation = "FORTI GY AMA"
 	invocation_type = "shout"
 	range = 7
@@ -38,7 +37,6 @@
 
 	school = "transmutation"
 	charge_max = 400
-	clothes_req = 1
 	invocation = "BIRUZ BENNAR"
 	invocation_type = "shout"
 	range = -1
@@ -58,7 +56,7 @@
 
 	school = "conjuration"
 	charge_max = 120
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
@@ -77,7 +75,7 @@
 
 	school = "conjuration"
 	charge_max = 360
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
@@ -92,7 +90,6 @@
 	name = "Disable Tech"
 	desc = "This spell disables all weapons, cameras and most other technology in range."
 	charge_max = 400
-	clothes_req = 1
 	invocation = "NEC CANTIO"
 	invocation_type = "shout"
 	range = -1
@@ -109,7 +106,6 @@
 
 	school = "abjuration"
 	charge_max = 20
-	clothes_req = 1
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
@@ -131,8 +127,7 @@
 	name = "quickstep"
 
 	charge_max = 100
-	clothes_req = 0
-	cult_req = 1
+	clothes_req = SPELL_CULT_GARB
 
 /obj/effect/proc_holder/spell/targeted/area_teleport/teleport
 	name = "Teleport"
@@ -140,7 +135,6 @@
 
 	school = "abjuration"
 	charge_max = 600
-	clothes_req = 1
 	invocation = "SCYAR NILA"
 	invocation_type = "shout"
 	range = -1
@@ -156,7 +150,6 @@
 	name = "Stop Time"
 	desc = "This spell stops time for everyone except for you, allowing you to move freely while your enemies and even projectiles are frozen."
 	charge_max = 500
-	clothes_req = 1
 	invocation = "TOKI YO TOMARE"
 	invocation_type = "shout"
 	range = 0
@@ -174,7 +167,6 @@
 
 	school = "conjuration"
 	charge_max = 1200
-	clothes_req = 1
 	invocation = "NOUK FHUNMM SACP RISSKA"
 	invocation_type = "shout"
 	range = 1
@@ -189,7 +181,7 @@
 
 	school = "conjuration"
 	charge_max = 600
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -206,7 +198,7 @@
 
 	school = "conjuration"
 	charge_max = 1200
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "IA IA"
 	invocation_type = "shout"
 	summon_amt = 10
@@ -221,7 +213,7 @@
 
 	school = "transmutation"
 	charge_max = 300
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "STI KALY"
 	invocation_type = "whisper"
 	message = "<span class='notice'>Your eyes cry out in pain!</span>"
@@ -233,7 +225,7 @@
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/creature/cult
 	name = "Summon Creatures (DANGEROUS)"
-	cult_req = 1
+	clothes_req = SPELL_CULT_GARB
 	charge_max = 5000
 	summon_amt = 2
 
@@ -253,7 +245,6 @@
 	name = "Repulse"
 	desc = "This spell throws everything around the user away."
 	charge_max = 400
-	clothes_req = 1
 	invocation = "GITTAH WEIGH"
 	invocation_type = "shout"
 	range = 5
@@ -314,7 +305,7 @@
 	desc = "Throw back attackers with a sweep of your tail."
 	sound = 'sound/magic/tail_swing.ogg'
 	charge_max = 150
-	clothes_req = 0
+	clothes_req = NONE
 	range = 2
 	cooldown_min = 150
 	invocation_type = "none"
@@ -335,7 +326,7 @@
 	name = "Sacred Flame"
 	desc = "Makes everyone around you more flammable, and lights yourself on fire."
 	charge_max = 60
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "FI'RAN DADISKO"
 	invocation_type = "shout"
 	max_targets = 0
@@ -358,7 +349,7 @@
 /obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket
 	name = "Thrown Lightning"
 	desc = "Forged from eldrich energies, a packet of pure power, known as a spell packet will appear in your hand, that when thrown will stun the target."
-	clothes_req = 1
+	clothes_req = SPELL_WIZARD_GARB
 	item_type = /obj/item/spellpacket/lightningbolt
 	charge_max = 10