From b7db69b6f8aee5f36af940b6a6babb1a765aa6f9 Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sun, 17 Apr 2011 18:49:46 +0000
Subject: [PATCH]  Object spell system v1.1 Completely revamped the classes,
 it's even more streamlined now. Got a few bugs and tweaks (namely, blind
 doesn't work, fireball got buffed up as compensation for not dealing
 additional damage to the target), but it's okay, since nobody uses those
 anyway.  Fixed the bug with emagged borg laws.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1465 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/datums/spell.dm                          | 216 ++++++++++++++++--
 code/datums/spells/area_teleport.dm           |  63 +++++
 code/datums/spells/blink.dm                   |  53 -----
 code/datums/spells/conjure.dm                 |  39 ++--
 code/datums/spells/disable_tech.dm            |  20 --
 code/datums/spells/disintegrate.dm            |  72 ------
 code/datums/spells/emplosion.dm               |  13 ++
 code/datums/spells/ethereal_jaunt.dm          |  88 +++----
 code/datums/spells/explosion.dm               |  15 ++
 code/datums/spells/fireball.dm                |  48 ----
 code/datums/spells/forcewall.dm               |  32 ---
 code/datums/spells/genetic.dm                 |  34 +++
 code/datums/spells/inflict_handler.dm         |  44 ++++
 code/datums/spells/knock.dm                   |  21 +-
 code/datums/spells/magic_missile.dm           |  57 -----
 code/datums/spells/mind_transfer.dm           |  23 +-
 code/datums/spells/mutate.dm                  |  50 ----
 code/datums/spells/projectile.dm              |  75 ++++++
 code/datums/spells/smoke.dm                   |  23 --
 code/datums/spells/teleport.dm                |  64 ------
 code/datums/spells/turf_teleport.dm           |  34 +++
 code/datums/spells/wizard.dm                  | 183 +++++++++++++++
 code/game/gamemodes/wizard/wizard.dm          |  28 +--
 .../modules/mob/living/silicon/robot/robot.dm |   2 +-
 icons/obj/projectiles.dmi                     | Bin 3155 -> 6618 bytes
 tgstation.dme                                 |  17 +-
 26 files changed, 761 insertions(+), 553 deletions(-)
 create mode 100644 code/datums/spells/area_teleport.dm
 delete mode 100644 code/datums/spells/blink.dm
 delete mode 100644 code/datums/spells/disable_tech.dm
 delete mode 100644 code/datums/spells/disintegrate.dm
 create mode 100644 code/datums/spells/emplosion.dm
 create mode 100644 code/datums/spells/explosion.dm
 delete mode 100644 code/datums/spells/fireball.dm
 delete mode 100644 code/datums/spells/forcewall.dm
 create mode 100644 code/datums/spells/genetic.dm
 create mode 100644 code/datums/spells/inflict_handler.dm
 delete mode 100644 code/datums/spells/magic_missile.dm
 delete mode 100644 code/datums/spells/mutate.dm
 create mode 100644 code/datums/spells/projectile.dm
 delete mode 100644 code/datums/spells/smoke.dm
 delete mode 100644 code/datums/spells/teleport.dm
 create mode 100644 code/datums/spells/turf_teleport.dm
 create mode 100644 code/datums/spells/wizard.dm

diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 23f1001de6..f89d81b499 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -1,19 +1,32 @@
-var/list/spells = list(/obj/spell/blind,/obj/spell/blink,/obj/spell/conjure,/obj/spell/disable_tech,/obj/spell/disintegrate,/obj/spell/ethereal_jaunt,/obj/spell/fireball,/obj/spell/forcewall,/obj/spell/knock,/obj/spell/magic_missile,/obj/spell/mind_transfer,/obj/spell/mutate,/obj/spell/smoke,/obj/spell/teleport) //needed for the badmin verb for now
+var/list/spells = typesof(/obj/spell) //needed for the badmin verb for now
 
 /obj/spell
 	name = "Spell"
 	desc = "A wizard spell"
+	density = 0
+	opacity = 0
 
 	var/school = "evocation" //not relevant at now, but may be important later if there are changes to how spells work. the ones I used for now will probably be changed... maybe spell presets? lacking flexibility but with some other benefit?
 	var/charge_type = "recharge" //can be recharge or charges, see charge_max and charge_counter descriptions
 	var/charge_max = 100 //recharge time in deciseconds if charge_type = "recharge" or starting charges if charge_type = "charges"
 	var/charge_counter = 0 //can only cast spells if it equals recharge, ++ each decisecond if charge_type = "recharge" or -- each cast if charge_type = "charges"
 	var/clothes_req = 1 //see if it requires clothes
-	var/stat_allowed = 0 //see if it requires being conscious
+	var/stat_allowed = 0 //see if it requires being conscious/alive, need to set to 1 for ghostpells
 	var/invocation = "HURP DURP" //what is uttered when the wizard casts the spell
 	var/invocation_type = "none" //can be none, whisper and shout
-	var/range = 7 //the range of the spell
-	var/message = "derp herp" //whatever it says to the guy affected by it. not always needed
+	var/range = 7 //the range of the spell; outer radius for aoe spells
+	var/message = "" //whatever it says to the guy affected by it
+	var/selection_type = "view" //can be "range" or "view"
+
+	var/overlay = 0
+	var/overlay_icon = 'wizard.dmi'
+	var/overlay_icon_state = "spell"
+	var/overlay_lifespan = 0
+
+	var/sparks_spread = 0
+	var/sparks_amt = 0 //cropped at 10
+	var/smoke_spread = 0 //1 - harmless, 2 - harmful
+	var/smoke_amt = 0 //cropped at 10
 
 /obj/spell/proc/cast_check() //checks if the spell can be cast based on its settings
 
@@ -23,7 +36,7 @@ var/list/spells = list(/obj/spell/blind,/obj/spell/blink,/obj/spell/conjure,/obj
 
 	switch(charge_type)
 		if("recharge")
-			if(charge_counter != charge_max)
+			if(charge_counter < charge_max)
 				usr << "[name] is still recharging."
 				return 0
 		if("charges")
@@ -46,6 +59,12 @@ var/list/spells = list(/obj/spell/blind,/obj/spell/blink,/obj/spell/conjure,/obj
 			usr << "I don't feel strong enough without my hat."
 			return 0
 
+	switch(charge_type)
+		if("recharge")
+			charge_counter = 0 //doesn't start recharging until the targets selecting ends
+		if("charges")
+			charge_counter-- //returns the charge if the targets selecting fails
+
 	return 1
 
 /obj/spell/proc/invocation() //spelling the spell out and setting it on recharge/reducing charges amount
@@ -60,18 +79,181 @@ var/list/spells = list(/obj/spell/blind,/obj/spell/blink,/obj/spell/conjure,/obj
 		if("whisper")
 			usr.whisper(invocation)
 
-	switch(charge_type)
-		if("recharge")
-			charge_counter = 0
-
-			spawn(0)
-				while(charge_counter < charge_max)
-					sleep(1)
-					charge_counter++
-		if("charges")
-			charge_counter--
-
 /obj/spell/New()
 	..()
 
-	charge_counter = charge_max
\ No newline at end of file
+	charge_counter = charge_max
+
+/obj/spell/Click()
+	..()
+
+	if(!cast_check())
+		return
+
+	choose_targets()
+
+/obj/spell/proc/choose_targets() //depends on subtype - /targeted or /aoe_turf
+	return
+
+/obj/spell/proc/start_recharge()
+	while(charge_counter < charge_max)
+		sleep(1)
+		charge_counter++
+
+/obj/spell/proc/perform(list/targets)
+	before_cast(targets)
+	invocation()
+	spawn(0)
+		if(charge_type == "recharge")
+			start_recharge()
+	cast(targets)
+	after_cast(targets)
+
+/obj/spell/proc/before_cast(list/targets)
+	if(overlay)
+		for(var/atom/target in targets)
+			var/location
+			if(istype(target,/mob))
+				location = target.loc
+			else if(istype(target,/turf))
+				location = target
+			var/obj/overlay/spell = new /obj/overlay(location)
+			spell.icon = overlay_icon
+			spell.icon_state = overlay_icon_state
+			spell.anchored = 1
+			spell.density = 0
+			spawn(overlay_lifespan)
+				del(spell)
+
+/obj/spell/proc/after_cast(list/targets)
+	for(var/atom/target in targets)
+		var/location
+		if(istype(target,/mob))
+			location = target.loc
+		else if(istype(target,/turf))
+			location = target
+		if(istype(target,/mob) && message)
+			target << text("[message]")
+		if(sparks_spread)
+			var/datum/effects/system/spark_spread/sparks = new /datum/effects/system/spark_spread()
+			sparks.set_up(sparks_amt, 0, location) //no idea what the 0 is
+			sparks.start()
+		if(smoke_spread)
+			if(smoke_spread == 1)
+				var/datum/effects/system/harmless_smoke_spread/smoke = new /datum/effects/system/harmless_smoke_spread()
+				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
+				smoke.start()
+			else if(smoke_spread == 2)
+				var/datum/effects/system/bad_smoke_spread/smoke = new /datum/effects/system/bad_smoke_spread()
+				smoke.set_up(smoke_amt, 0, location) //no idea what the 0 is
+				smoke.start()
+
+/obj/spell/proc/cast(list/targets)
+	return
+
+/obj/spell/proc/revert_cast() //resets recharge or readds a charge
+	switch(charge_type)
+		if("recharge")
+			charge_counter = charge_max
+		if("charges")
+			charge_counter++
+
+	return
+
+
+/obj/spell/targeted //can mean aoe for mobs (limited/unlimited number) or one target mob
+	var/max_targets = 1 //leave 0 for unlimited targets in range, 1 for one selectable target in range, more for limited number of casts (can all target one guy, depends on target_ignore_prev) in range
+	var/target_ignore_prev = 1 //only important if max_targets > 1, affects if the spell can be cast multiple times at one person from one cast
+	var/include_usr = 0 //if it includes usr in the target list
+
+/obj/spell/aoe_turf //affects all turfs in view or range (depends)
+	var/inner_radius = -1 //for all your ring spell needs
+
+/obj/spell/targeted/choose_targets()
+	var/list/targets = list()
+
+	switch(selection_type)
+		if("range")
+			switch(max_targets)
+				if(0)
+					for(var/mob/target in range(usr,range))
+						targets += target
+				if(1)
+					if(range < 0)
+						targets += usr
+					else
+						var/possible_targets = range(usr,range)
+						if(!include_usr && usr in possible_targets)
+							possible_targets -= usr
+						targets += input("Choose the target for the spell.", "Targeting") as mob in possible_targets
+				else
+					var/list/possible_targets = list()
+					for(var/mob/target in range(usr,range))
+						possible_targets += target
+					for(var/i=1,i<=max_targets,i++)
+						if(!possible_targets.len)
+							break
+						if(target_ignore_prev)
+							var/target = pick(possible_targets)
+							possible_targets -= target
+							targets += target
+						else
+							targets += pick(possible_targets)
+		if("view")
+			switch(max_targets)
+				if(0)
+					for(var/mob/target in view(usr,range))
+						targets += target
+				if(1)
+					if(range < 0)
+						targets += usr
+					else
+						var/possible_targets = view(usr,range)
+						if(!include_usr && usr in possible_targets)
+							possible_targets -= usr
+						targets += input("Choose the target for the spell.", "Targeting") as mob in possible_targets
+				else
+					var/list/possible_targets = list()
+					for(var/mob/target in view(usr,range))
+						possible_targets += target
+					for(var/i=1,i<=max_targets,i++)
+						if(!possible_targets.len)
+							break
+						if(target_ignore_prev)
+							var/target = pick(possible_targets)
+							possible_targets -= target
+							targets += target
+						else
+							targets += pick(possible_targets)
+
+	if(!include_usr && (usr in targets))
+		targets -= usr
+
+	if(!targets.len) //doesn't waste the spell
+		revert_cast()
+		return
+
+	perform(targets)
+
+	return
+
+/obj/spell/aoe_turf/choose_targets()
+	var/list/targets = list()
+
+	switch(selection_type)
+		if("range")
+			for(var/turf/target in range(usr,range))
+				if(!(target in range(usr,inner_radius)))
+					targets += target
+		if("view")
+			for(var/turf/target in view(usr,range))
+				if(!(target in view(usr,inner_radius)))
+					targets += target
+
+	if(!targets.len) //doesn't waste the spell
+		revert_cast()
+		return
+
+	perform(targets)
+
+	return
\ No newline at end of file
diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm
new file mode 100644
index 0000000000..eb87980df0
--- /dev/null
+++ b/code/datums/spells/area_teleport.dm
@@ -0,0 +1,63 @@
+/obj/spell/targeted/area_teleport
+	name = "Area teleport"
+	desc = "This spell teleports you to a type of area of your selection."
+
+	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
+
+/obj/spell/targeted/area_teleport/perform(list/targets)
+	var/thearea = before_cast(targets)
+	if(!thearea)
+		revert_cast()
+		return
+	invocation(thearea)
+	spawn(0)
+		if(charge_type == "recharge")
+			start_recharge()
+	cast(targets,thearea)
+	after_cast(targets)
+
+/obj/spell/targeted/area_teleport/before_cast(list/targets)
+	var/A = null
+
+	if(!randomise_selection)
+		A = input("Area to teleport to", "Teleport", A) in teleportlocs
+	else
+		A = pick(teleportlocs)
+
+	var/area/thearea = teleportlocs[A]
+
+	return thearea
+
+/obj/spell/targeted/area_teleport/cast(list/targets,area/thearea)
+	for(var/mob/target in targets)
+		var/list/L = list()
+		for(var/turf/T in get_area_turfs(thearea.type))
+			if(!T.density)
+				var/clear = 1
+				for(var/obj/O in T)
+					if(O.density)
+						clear = 0
+						break
+				if(clear)
+					L+=T
+
+		target.loc = pick(L)
+
+	return
+
+/obj/spell/targeted/area_teleport/invocation(area/chosenarea = null)
+	if(!invocation_area || !chosenarea)
+		..()
+	else
+		switch(invocation_type)
+			if("shout")
+				usr.say("[invocation] [uppertext(chosenarea.name)]")
+				if(usr.gender=="male")
+					playsound(usr.loc, pick('vs_chant_conj_hm.wav','vs_chant_conj_lm.wav','vs_chant_ench_hm.wav','vs_chant_ench_lm.wav','vs_chant_evoc_hm.wav','vs_chant_evoc_lm.wav','vs_chant_illu_hm.wav','vs_chant_illu_lm.wav','vs_chant_necr_hm.wav','vs_chant_necr_lm.wav'), 100, 1)
+				else
+					playsound(usr.loc, pick('vs_chant_conj_hf.wav','vs_chant_conj_lf.wav','vs_chant_ench_hf.wav','vs_chant_ench_lf.wav','vs_chant_evoc_hf.wav','vs_chant_evoc_lf.wav','vs_chant_illu_hf.wav','vs_chant_illu_lf.wav','vs_chant_necr_hf.wav','vs_chant_necr_lf.wav'), 100, 1)
+			if("whisper")
+				usr.whisper("[invocation] [uppertext(chosenarea.name)]")
+
+	return
\ No newline at end of file
diff --git a/code/datums/spells/blink.dm b/code/datums/spells/blink.dm
deleted file mode 100644
index b588422acf..0000000000
--- a/code/datums/spells/blink.dm
+++ /dev/null
@@ -1,53 +0,0 @@
-/obj/spell/blink
-	name = "Blink"
-	desc = "This spell randomly teleports you a short distance."
-
-	school = "abjuration"
-	charge_max = 20
-	clothes_req = 1
-	invocation = "none"
-	invocation_type = "none"
-	range = -1 //can affect only the user by default, but with var editing can be a teleport other spell
-	var/outer_teleport_radius = 6 //the radius of the area in which it picks turfs to teleport to
-	var/inner_teleport_radius = 0 //so with var fuckery you can have it teleport in a ring, not in a circle
-	var/smoke_spread = 1 //if set to 0, no smoke spreads when teleporting
-
-/obj/spell/blink/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	var/mob/M
-
-	if(range>=0)
-		M = input("Choose whom to blink", "ABRAKADABRA") as mob in view(usr,range)
-	else
-		M = usr
-
-	if(!M)
-		return
-
-	invocation()
-
-	var/list/turfs = new/list()
-	for(var/turf/T in orange(M,outer_teleport_radius))
-		if(T in orange(M,inner_teleport_radius)) continue
-		if(istype(T,/turf/space)) continue
-		if(T.density) continue
-		if(T.x>world.maxx-outer_teleport_radius || T.x<outer_teleport_radius)	continue	//putting them at the edge is dumb
-		if(T.y>world.maxy-outer_teleport_radius || T.y<outer_teleport_radius)	continue
-		turfs += T
-	if(!turfs.len)
-		var/list/turfs_to_pick_from = list()
-		for(var/turf/T in orange(M,outer_teleport_radius))
-			if(!(T in orange(M,inner_teleport_radius)))
-				turfs_to_pick_from += T
-		turfs += pick(/turf in turfs_to_pick_from)
-	if(smoke_spread)
-		var/datum/effects/system/harmless_smoke_spread/smoke = new /datum/effects/system/harmless_smoke_spread()
-		smoke.set_up(10, 0, M.loc)
-		smoke.start()
-	var/turf/picked = pick(turfs)
-	if(!isturf(picked)) return
-	M.loc = picked
\ No newline at end of file
diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm
index bd8d365e76..731521e4c6 100644
--- a/code/datums/spells/conjure.dm
+++ b/code/datums/spells/conjure.dm
@@ -1,3 +1,14 @@
+/obj/spell/aoe_turf/conjure
+	name = "Conjure"
+	desc = "This spell conjures objs of the specified types in range."
+
+	var/list/summon_type = list() //determines what exactly will be summoned
+	var/summon_lifespan = 0 // 0=permanent, any other time in deciseconds
+	var/summon_amt = 1 //amount of objects summoned
+	var/summon_ignore_density = 0 //if set to 1, adds dense tiles to possible spawn places
+	var/summon_ignore_prev_spawn_points = 0 //if set to 1, each new object is summoned on a new spawn point
+
+/*
 /obj/spell/conjure
 	name = "Summon Bigger Carp"
 	desc = "This spell conjures an elite carp."
@@ -13,31 +24,23 @@
 	var/summon_amt = 1 //amount of objects summoned
 	var/summon_ignore_density = 0 //if set to 1, adds dense tiles to possible spawn places
 	var/summon_ignore_prev_spawn_points = 0 //if set to 1, each new object is summoned on a new spawn point
+*/
+/obj/spell/aoe_turf/conjure/cast(list/targets)
 
-/obj/spell/conjure/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	invocation()
-
-	var/list/possible_spawn_points = list()
-
-	for(var/turf/T in oview(usr,range))
-		if(!T.density || summon_ignore_density)
-			possible_spawn_points += T
+	for(var/turf/T in targets)
+		if(T.density && !summon_ignore_density)
+			targets -= T
 
 	for(var/i=0,i<summon_amt,i++)
-		if(!possible_spawn_points.len)
+		if(!targets.len)
 			break
 		var/summoned_object_type = text2path(pick(summon_type))
-		var/spawn_place = pick(possible_spawn_points)
+		var/spawn_place = pick(targets)
 		if(summon_ignore_prev_spawn_points)
-			possible_spawn_points -= spawn_place
+			targets -= spawn_place
 		var/summoned_object = new summoned_object_type(spawn_place)
-		if(summon_duration)
-			spawn(summon_duration)
+		if(summon_lifespan)
+			spawn(summon_lifespan)
 				if(summoned_object)
 					del(summoned_object)
 
diff --git a/code/datums/spells/disable_tech.dm b/code/datums/spells/disable_tech.dm
deleted file mode 100644
index dcab573eca..0000000000
--- a/code/datums/spells/disable_tech.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-/obj/spell/disable_tech
-	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"
-	var/emp_heavy_radius = 5
-	var/emp_light_radius = 7
-
-/obj/spell/disable_tech/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	invocation()
-
-	empulse(usr.loc, src.emp_heavy_radius, src.emp_light_radius)
-	return
\ No newline at end of file
diff --git a/code/datums/spells/disintegrate.dm b/code/datums/spells/disintegrate.dm
deleted file mode 100644
index 80eb4237f7..0000000000
--- a/code/datums/spells/disintegrate.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-/obj/spell/disintegrate
-	name = "Disintegrate"
-	desc = "This spell instantly kills somebody adjacent to you with the vilest of magick."
-
-	school = "evocation"
-	charge_max = 600
-	clothes_req = 1
-	invocation = "EI NATH"
-	invocation_type = "shout"
-	range = 1
-	var/sparks_spread = 1 //if set to 0, no sparks spread when disintegrating
-	var/kill_type = "disintegrate" //"disintegrate" leaves a pile of ash and bones (remains), "gib" gibs, "kill" adds damage_amount of damage_type
-	var/damage_amount = 2000 //only used if kill_type = "damage"
-	var/damage_type = "brute" //can be "brute", "fire", "toxin" or "oxygen"
-
-/obj/spell/disintegrate/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	var/mob/living/M = input("Choose whom to [kill_type]", "ABRAKADABRA") as mob in oview(usr,range)
-
-	if(!istype(M))
-		return
-
-	invocation()
-
-	if(sparks_spread)
-		var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
-		s.set_up(4, 1, M)
-		s.start()
-
-	switch(kill_type)
-		if("disintegrate")
-			M.dust()
-		if("gib")
-			M.gib()
-		if("kill")
-			if (damage_amount>0)
-				M.take_overall_damage(abs(damage_amount),abs(damage_amount))
-				M.toxloss+=abs(damage_amount)
-				M.oxyloss+=abs(damage_amount)
-			else
-				M.heal_overall_damage(abs(damage_amount),abs(damage_amount))
-				M.toxloss+=abs(damage_amount)
-				M.oxyloss+=abs(damage_amount)
-/*
-			for(var/i=0,i<abs(damage_amount),i++)
-				sleep(0) //to avoid troubles with instantly applying lots of damage, it seems to be buggy
-				switch(damage_type)
-					if("brute")
-						if(damage_amount>0)
-							M.bruteloss++
-						else
-							M.bruteloss--
-					if("toxin")
-						if(damage_amount>0)
-							M.toxloss++
-						else
-							M.toxloss--
-					if("oxygen")
-						if(damage_amount>0)
-							M.oxyloss++
-						else
-							M.oxyloss--
-					if("fire")
-						if(damage_amount>0)
-							M.fireloss++
-						else
-							M.fireloss--
-*/
\ No newline at end of file
diff --git a/code/datums/spells/emplosion.dm b/code/datums/spells/emplosion.dm
new file mode 100644
index 0000000000..1d358865ca
--- /dev/null
+++ b/code/datums/spells/emplosion.dm
@@ -0,0 +1,13 @@
+/obj/spell/targeted/emplosion
+	name = "Emplosion"
+	desc = "This spell emplodes an area."
+
+	var/emp_heavy = 2
+	var/emp_light = 3
+
+/obj/spell/targeted/emplosion/cast(list/targets)
+
+	for(var/mob/target in targets)
+		empulse(target.loc, emp_heavy, emp_light)
+
+	return
\ No newline at end of file
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index b442bf17e5..25c8c92159 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -1,4 +1,4 @@
-/obj/spell/ethereal_jaunt
+/obj/spell/targeted/ethereal_jaunt
 	name = "Ethereal Jaunt"
 	desc = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
 
@@ -7,58 +7,44 @@
 	clothes_req = 1
 	invocation = "none"
 	invocation_type = "none"
-	range = -1 //can affect only the user by default, but with var editing can be an invis other spell
+	range = -1
+	include_usr = 1
+
 	var/jaunt_duration = 50 //in deciseconds
 
-/obj/spell/ethereal_jaunt/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	var/mob/M
-
-	if(range>=0)
-		M = input("Choose whom to jaunt", "ABRAKADABRA") as mob in view(usr,range)
-	else
-		M = usr
-
-	if(!M)
-		return
-
-	invocation()
-
-	spawn(0)
-		var/mobloc = get_turf(M.loc)
-		var/obj/dummy/spell_jaunt/holder = new /obj/dummy/spell_jaunt( mobloc )
-		var/atom/movable/overlay/animation = new /atom/movable/overlay( mobloc )
-		animation.name = "water"
-		animation.density = 0
-		animation.anchored = 1
-		animation.icon = 'mob.dmi'
-		animation.icon_state = "liquify"
-		animation.layer = 5
-		animation.master = holder
-		flick("liquify",animation)
-		M.loc = holder
-		M.client.eye = holder
-		var/datum/effects/system/steam_spread/steam = new /datum/effects/system/steam_spread()
-		steam.set_up(10, 0, mobloc)
-		steam.start()
-		sleep(jaunt_duration)
-		mobloc = get_turf(M.loc)
-		animation.loc = mobloc
-		steam.location = mobloc
-		steam.start()
-		M.canmove = 0
-		sleep(20)
-		flick("reappear",animation)
-		sleep(5)
-		M.loc = mobloc
-		M.canmove = 1
-		M.client.eye = M
-		del(animation)
-		del(holder)
+/obj/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
+	for(var/mob/target in targets)
+		spawn(0)
+			var/mobloc = get_turf(target.loc)
+			var/obj/dummy/spell_jaunt/holder = new /obj/dummy/spell_jaunt( mobloc )
+			var/atom/movable/overlay/animation = new /atom/movable/overlay( mobloc )
+			animation.name = "water"
+			animation.density = 0
+			animation.anchored = 1
+			animation.icon = 'mob.dmi'
+			animation.icon_state = "liquify"
+			animation.layer = 5
+			animation.master = holder
+			flick("liquify",animation)
+			target.loc = holder
+			target.client.eye = holder
+			var/datum/effects/system/steam_spread/steam = new /datum/effects/system/steam_spread()
+			steam.set_up(10, 0, mobloc)
+			steam.start()
+			sleep(jaunt_duration)
+			mobloc = get_turf(target.loc)
+			animation.loc = mobloc
+			steam.location = mobloc
+			steam.start()
+			target.canmove = 0
+			sleep(20)
+			flick("reappear",animation)
+			sleep(5)
+			target.loc = mobloc
+			target.canmove = 1
+			target.client.eye = target
+			del(animation)
+			del(holder)
 
 /obj/dummy/spell_jaunt
 	name = "water"
diff --git a/code/datums/spells/explosion.dm b/code/datums/spells/explosion.dm
new file mode 100644
index 0000000000..96e02e6899
--- /dev/null
+++ b/code/datums/spells/explosion.dm
@@ -0,0 +1,15 @@
+/obj/spell/targeted/explosion
+	name = "Explosion"
+	desc = "This spell explodes an area."
+
+	var/ex_severe = 1
+	var/ex_heavy = 2
+	var/ex_light = 3
+	var/ex_flash = 4
+
+/obj/spell/targeted/explosion/cast(list/targets)
+
+	for(var/mob/target in targets)
+		explosion(target.loc,ex_severe,ex_heavy,ex_light,ex_flash)
+
+	return
\ No newline at end of file
diff --git a/code/datums/spells/fireball.dm b/code/datums/spells/fireball.dm
deleted file mode 100644
index 832c7ea99c..0000000000
--- a/code/datums/spells/fireball.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/obj/spell/fireball
-	name = "Fireball"
-	desc = "This spell fires a fireball at a target and does not require wizard garb."
-
-	school = "evocation"
-	charge_max = 200
-	clothes_req = 0
-	invocation = "ONI SOMA"
-	invocation_type = "shout"
-	var/radius_devastation = -1
-	var/radius_heavy = -1
-	var/radius_light = 2
-	var/radius_flash = 2
-	var/bruteloss = 20 // apparently fireball deals damage in addition to the explosion
-	var/fireloss = 25  // huh
-	var/lifetime = 200 // in deciseconds
-
-/obj/spell/fireball/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	var/mob/M = input("Choose whom to fireball", "ABRAKADABRA") as mob in oview(usr,range)
-
-	if(!M)
-		return
-
-	invocation()
-
-	var/obj/overlay/A = new /obj/overlay( usr.loc )
-	A.icon_state = "fireball"
-	A.icon = 'wizard.dmi'
-	A.name = "a fireball"
-	A.anchored = 0
-	A.density = 0
-	var/i
-	for(i=0, i<lifetime, i++)
-		step_to(A,M,0)
-		if(get_dist(A,M) <= 1)
-			if(istype(M,/mob/living))
-				M:take_organ_damage(bruteloss,fireloss)
-			explosion(M.loc, radius_devastation, radius_heavy, radius_light, radius_flash)
-			del(A)
-			return
-		sleep(1)
-	del(A)
-	return
\ No newline at end of file
diff --git a/code/datums/spells/forcewall.dm b/code/datums/spells/forcewall.dm
deleted file mode 100644
index 0da4c36e75..0000000000
--- a/code/datums/spells/forcewall.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/obj/spell/forcewall
-	name = "Forcewall"
-	desc = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb."
-
-	school = "transmutation"
-	charge_max = 100
-	clothes_req = 0
-	invocation = "TARCOL MINTI ZHERI"
-	invocation_type = "whisper"
-	range = 0 //default creates only a 1x1 forcewall in the user's tile
-	var/wall_lifespan = 300 //in deciseconds
-	var/wall_visibility = 1 //if 0, the created wall(s) is(are) invisible
-
-/obj/spell/forcewall/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	invocation()
-
-	var/list/forcefields = list()
-
-	for(var/turf/T in range(usr,range))
-		forcefields += new /obj/forcefield(T)
-
-	spawn (wall_lifespan)
-		for(var/obj/forcefield/F in forcefields)
-			del(F)
-		del(forcefields)
-
-	return
\ No newline at end of file
diff --git a/code/datums/spells/genetic.dm b/code/datums/spells/genetic.dm
new file mode 100644
index 0000000000..394c4797c0
--- /dev/null
+++ b/code/datums/spells/genetic.dm
@@ -0,0 +1,34 @@
+/obj/spell/targeted/genetic
+	name = "Genetic"
+	desc = "This spell inflicts a set of mutations and disabilities upon the target."
+
+	var/disabilities = 0 //bits
+	var/mutations = 0 //bits
+	var/duration = 100 //deciseconds
+	/*
+		Disabilities
+			1st bit - ?
+			2nd bit - ?
+			3rd bit - ?
+			4th bit - ?
+			5th bit - ?
+			6th bit - ?
+		Mutations
+			1st bit - portals
+			2nd bit - cold resist
+			3rd bit - xray
+			4th bit - hulk
+			5th bit - clown
+			6th bit - fat
+	*/
+
+/obj/spell/targeted/genetic/cast(list/targets)
+
+	for(var/mob/target in targets)
+		target.mutations |= mutations
+		target.disabilities |= disabilities
+		spawn(duration)
+			target.mutations &= ~mutations
+			target.disabilities &= ~disabilities
+
+	return
\ No newline at end of file
diff --git a/code/datums/spells/inflict_handler.dm b/code/datums/spells/inflict_handler.dm
new file mode 100644
index 0000000000..63cd6dc04e
--- /dev/null
+++ b/code/datums/spells/inflict_handler.dm
@@ -0,0 +1,44 @@
+/obj/spell/targeted/inflict_handler
+	name = "Inflict Handler"
+	desc = "This spell destroys/damages/heals and/or weakens/stuns the target."
+
+	var/amt_weaken = 0
+	var/amt_paralysis = 0 //stun
+
+	//set to negatives for healing
+	var/amt_dam_fire = 0
+	var/amt_dam_brute = 0
+	var/amt_dam_oxy = 0
+	var/amt_dam_tox = 0
+
+	var/destroys = "none" //can be "none", "gib" or "disintegrate"
+
+/obj/spell/targeted/inflict_handler/cast(list/targets)
+
+	for(var/mob/living/target in targets)
+		switch(destroys)
+			if("gib")
+				target.gib()
+			if("disintegrate")
+				target.dust()
+
+		if(!target)
+			continue
+		//damage
+		if(amt_dam_brute > 0)
+			if(amt_dam_fire > 0)
+				target.take_overall_damage(amt_dam_brute,amt_dam_fire)
+			else if (amt_dam_fire < 0)
+				target.take_overall_damage(amt_dam_brute,0)
+				target.heal_overall_damage(0,amt_dam_fire)
+		else if(amt_dam_brute < 0)
+			if(amt_dam_fire > 0)
+				target.take_overall_damage(0,amt_dam_fire)
+				target.heal_overall_damage(amt_dam_brute,0)
+			else if (amt_dam_fire < 0)
+				target.heal_overall_damage(amt_dam_brute,amt_dam_fire)
+		target.toxloss += amt_dam_tox
+		target.oxyloss += amt_dam_oxy
+		//disabling
+		target.weakened += amt_weaken
+		target.paralysis += amt_paralysis
\ No newline at end of file
diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm
index 499ad94892..dafa286f91 100644
--- a/code/datums/spells/knock.dm
+++ b/code/datums/spells/knock.dm
@@ -1,4 +1,4 @@
-/obj/spell/knock
+/obj/spell/aoe_turf/knock
 	name = "Knock"
 	desc = "This spell opens nearby doors and does not require wizard garb."
 
@@ -9,16 +9,11 @@
 	invocation_type = "whisper"
 	range = 3
 
-/obj/spell/knock/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	invocation()
-
-	for(var/obj/machinery/door/G in oview(usr,range))
-		spawn(1)
-			G:locked = 0
-			G.open()
+/obj/spell/aoe_turf/knock/cast(list/targets)
+	for(var/turf/T in targets)
+		for(var/obj/machinery/door/door in T.contents)
+			spawn(1)
+				if(istype(door,/obj/machinery/door/airlock))
+					door:locked = 0
+				door.open()
 	return
\ No newline at end of file
diff --git a/code/datums/spells/magic_missile.dm b/code/datums/spells/magic_missile.dm
deleted file mode 100644
index 28d455efe8..0000000000
--- a/code/datums/spells/magic_missile.dm
+++ /dev/null
@@ -1,57 +0,0 @@
-/obj/spell/magic_missile
-	name = "Magic Missile"
-	desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
-
-	school = "evocation"
-	charge_max = 100
-	clothes_req = 1
-	invocation = "FORTI GY AMA"
-	invocation_type = "shout"
-	range = 7
-	var/max_targets = 0 //max targets for the spell. set to 0 for no limit
-	var/missile_lifespan = 20 //in deciseconds * missile_step_delay
-	var/missile_step_delay = 5 //lower = faster missile
-	var/missile_weaken_amt = 5 //the amount by which the missile weakens the target it hits
-	var/missile_damage = 10 //the amount of fireloss each missile deals
-
-/obj/spell/magic_missile/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	invocation()
-
-	var/targets = 0
-	for (var/mob/living/M as mob in oview(usr,range))
-		if(max_targets)
-			if(targets >= max_targets)
-				break
-		spawn(0)
-			var/obj/overlay/A = new /obj/overlay( usr.loc )
-			A.icon_state = "magicm"
-			A.icon = 'wizard.dmi'
-			A.name = "a magic missile"
-			A.anchored = 0
-			A.density = 0
-			A.layer = 4
-			var/i
-			for(i=0, i<missile_lifespan, i++)
-				var/obj/overlay/B = new /obj/overlay( A.loc )
-				B.icon_state = "magicmd"
-				B.icon = 'wizard.dmi'
-				B.name = "trail"
-				B.anchored = 1
-				B.density = 0
-				B.layer = 3
-				spawn(5)
-					del(B)
-				step_to(A,M,0)
-				if (get_dist(A,M) == 0)
-					M.weakened += missile_weaken_amt
-					M.take_organ_damage(0, missile_damage)
-					del(A)
-					return
-				sleep(missile_step_delay)
-			del(A)
-		targets++
\ No newline at end of file
diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm
index e1db858bce..339e24fee9 100644
--- a/code/datums/spells/mind_transfer.dm
+++ b/code/datums/spells/mind_transfer.dm
@@ -1,4 +1,4 @@
-/obj/spell/mind_transfer
+/obj/spell/targeted/mind_transfer
 	name = "Mind Transfer"
 	desc = "This spell allows the user to switch bodies with a target."
 
@@ -17,13 +17,16 @@
 	var/paralysis_amount_caster = 20 //how much the caster is paralysed for after the spell
 	var/paralysis_amount_victim = 20 //how much the victim is paralysed for after the spell
 
-/obj/spell/mind_transfer/Click()
-	..()
-
-	if(!cast_check())
+/obj/spell/targeted/mind_transfer/cast(list/targets) //magnets, so mostly hardcoded
+	if(!targets.len)
+		usr << "No mind found"
 		return
 
-	var/mob/target = input("Choose whom to transfer your mind to", "ABRAKADABRA") as mob in oview(usr,range)
+	if(targets.len > 1)
+		usr << "Too many minds! You're not a hive damnit!"
+		return
+
+	var/mob/target = targets[1]
 
 	if(!target.client || !target.mind)
 		usr << "They appear to be brain-dead."
@@ -41,8 +44,6 @@
 		usr << "You didn't study necromancy back at the Space Wizard Federation academy."
 		return
 
-	invocation()
-
 	var/mob/victim = target //mostly copypastaed, I have little idea how this works
 	var/mob/caster = usr
 	//losing spells
@@ -51,14 +52,14 @@
 		for(var/i=1,i<=spell_loss_amount,i++)
 			var/spell_loss_chance = base_spell_loss_chance
 			var/list/checked_spells = usr.spell_list
-			checked_spells -= src //MT can't be lost
+			checked_spells -= src //MT can't be lost //doesn't work
 
 			for(var/j=1,j<=checked_spells.len,j++)
 				if(prob(spell_loss_chance))
 					if(checked_spells.len)
 						usr.spell_list -= pick(checked_spells)
 						spawn(msg_wait)
-							caster << "The mind transfer has robbed you of a spell."
+							victim << "The mind transfer has robbed you of a spell."
 					break
 				else
 					spell_loss_chance += spell_loss_chance_modifier
@@ -96,6 +97,6 @@
 	victim.paralysis += paralysis_amount_victim
 
 	spawn(msg_wait)
-		victim << "Your body doesn't feel like itself."
+		caster << "Your body doesn't feel like itself."
 
 	del(temp_ghost)
\ No newline at end of file
diff --git a/code/datums/spells/mutate.dm b/code/datums/spells/mutate.dm
deleted file mode 100644
index 42c7ad7886..0000000000
--- a/code/datums/spells/mutate.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-/obj/spell/mutate
-	name = "Mutate"
-	desc = "This spell causes you to turn into a hulk and gain telekinesis for a short while."
-
-	school = "transmutation"
-	charge_max = 400
-	clothes_req = 1
-	invocation = "BIRUZ BENNAR"
-	invocation_type = "shout"
-	message = "\blue You feel strong! Your mind expands!"
-	range = -1 //can affect only the user by default, but with var editing can be a mutate other spell
-	var/mutate_duration = 300 //in deciseconds
-	var/list/mutation_types = list("hulk","tk") //right now understands only "hulk", "tk", "cold resist", "xray" and "clown"
-
-/obj/spell/mutate/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	var/mob/M
-
-	if(range>=0)
-		M = input("Choose whom to mutate", "ABRAKADABRA") as mob in view(usr,range)
-	else
-		M = usr
-
-	if(!M)
-		return
-
-	invocation()
-
-	M << text("[message]")
-	var/mutation = 0
-	for(var/MT in mutation_types)
-		switch(MT)
-			if("tk")
-				mutation |= 1
-			if("cold resist")
-				mutation |= 2
-			if("xray")
-				mutation |= 4
-			if("hulk")
-				mutation |= 8
-			if("clown")
-				mutation |= 16
-	M.mutations |= mutation
-	spawn (mutate_duration)
-		M.mutations &= ~mutation
-	return
\ No newline at end of file
diff --git a/code/datums/spells/projectile.dm b/code/datums/spells/projectile.dm
new file mode 100644
index 0000000000..2a869b734b
--- /dev/null
+++ b/code/datums/spells/projectile.dm
@@ -0,0 +1,75 @@
+/obj/spell/targeted/projectile
+	name = "Projectile"
+	desc = "This spell summons projectiles which try to hit the targets."
+
+	var/proj_icon = 'projectiles.dmi'
+	var/proj_icon_state = "spell"
+	var/proj_name = "a spell projectile"
+
+	var/proj_trail = 0 //if it leaves a trail
+	var/proj_trail_lifespan = 0 //deciseconds
+	var/proj_trail_icon = 'wizard.dmi'
+	var/proj_trail_icon_state = "trail"
+
+	var/proj_type = "/obj/spell/targeted" //IMPORTANT use only subtypes of this
+
+	var/proj_lingering = 0 //if it lingers or disappears upon hitting an obstacle
+	var/proj_homing = 1 //if it follows the target
+	var/proj_insubstantial = 0 //if it can pass through dense objects or not
+	var/proj_trigger_range = 1 //the range from target at which the projectile triggers cast(target)
+
+	var/proj_lifespan = 15 //in deciseconds * proj_step_delay
+	var/proj_step_delay = 1 //lower = faster
+
+/obj/spell/targeted/projectile/cast(list/targets)
+
+	for(var/mob/target in targets)
+		spawn(0)
+			var/projectile_type = text2path(proj_type)
+			var/obj/spell/targeted/projectile = new projectile_type(usr)
+			projectile.icon = proj_icon
+			projectile.icon_state = proj_icon_state
+			projectile.dir = get_dir(target,projectile)
+			projectile.name = proj_name
+
+			var/current_loc = usr.loc
+
+			for(var/i = 0,i < proj_lifespan,i++)
+				if(!projectile)
+					break
+
+				if(proj_homing)
+					if(proj_insubstantial)
+						projectile.loc = get_step_to(projectile,target)
+					else
+						step_to(projectile,target)
+				else
+					if(proj_insubstantial)
+						projectile.loc = get_step(projectile,dir)
+					else
+						step(projectile,dir)
+
+				if(!proj_lingering && projectile.loc == current_loc) //if it didn't move since last time
+					del(projectile)
+					break
+
+				if(proj_trail && projectile)
+					spawn(0)
+						if(projectile)
+							var/obj/overlay/trail = new /obj/overlay(projectile.loc)
+							trail.icon = proj_trail_icon
+							trail.icon_state = proj_trail_icon_state
+							trail.density = 0
+							spawn(proj_trail_lifespan)
+								del(trail)
+
+				if(projectile.loc in range(target.loc,proj_trigger_range))
+					projectile.perform(list(target))
+					break
+
+				current_loc = projectile.loc
+
+				sleep(proj_step_delay)
+
+			if(projectile)
+				del(projectile)
\ No newline at end of file
diff --git a/code/datums/spells/smoke.dm b/code/datums/spells/smoke.dm
deleted file mode 100644
index 8227eea8a3..0000000000
--- a/code/datums/spells/smoke.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-/obj/spell/smoke
-	name = "Smoke"
-	desc = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb."
-
-	school = "conjuration"
-	charge_max = 120
-	clothes_req = 0
-	invocation = "none"
-	invocation_type = "none"
-	range = -1 //originates from the user and I don't give a shit atm
-	var/smoke_amount = 10 //above 10 gets reduced to 10 anyway by the set_up proc
-
-/obj/spell/smoke/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	invocation()
-
-	var/datum/effects/system/bad_smoke_spread/smoke = new /datum/effects/system/bad_smoke_spread()
-	smoke.set_up(smoke_amount, 0, usr.loc)
-	smoke.start()
\ No newline at end of file
diff --git a/code/datums/spells/teleport.dm b/code/datums/spells/teleport.dm
deleted file mode 100644
index e60bbfab39..0000000000
--- a/code/datums/spells/teleport.dm
+++ /dev/null
@@ -1,64 +0,0 @@
-/obj/spell/teleport
-	name = "Teleport"
-	desc = "This spell teleports you to a type of area of your selection."
-
-	school = "abjuration"
-	charge_max = 600
-	clothes_req = 1
-	invocation = "SCYAR NILA"
-	invocation_type = "none" //hardcoded into the spell due to its specifics
-	range = -1 //can affect only the user by default, but with var editing can be a teleport other spell
-	var/smoke_spread = 1 //if set to 0, no smoke spreads when teleporting
-
-/obj/spell/teleport/Click()
-	..()
-
-	if(!cast_check())
-		return
-
-	var/mob/M
-
-	if(range>=0)
-		M = input("Choose whom to teleport", "ABRAKADABRA") as mob in view(usr,range)
-	else
-		M = usr
-
-	if(!M)
-		return
-
-	invocation()
-
-	var/A
-
-	A = input("Area to jump to", "BOOYEA", A) in teleportlocs
-
-	var/area/thearea = teleportlocs[A]
-
-	usr.say("[invocation] [uppertext(A)]")
-	if(usr.gender=="male")
-		playsound(usr.loc, pick('vs_chant_conj_hm.wav','vs_chant_conj_lm.wav','vs_chant_ench_hm.wav','vs_chant_ench_lm.wav','vs_chant_evoc_hm.wav','vs_chant_evoc_lm.wav','vs_chant_illu_hm.wav','vs_chant_illu_lm.wav','vs_chant_necr_hm.wav','vs_chant_necr_lm.wav'), 100, 1)
-	else
-		playsound(usr.loc, pick('vs_chant_conj_hf.wav','vs_chant_conj_lf.wav','vs_chant_ench_hf.wav','vs_chant_ench_lf.wav','vs_chant_evoc_hf.wav','vs_chant_evoc_lf.wav','vs_chant_illu_hf.wav','vs_chant_illu_lf.wav','vs_chant_necr_hf.wav','vs_chant_necr_lf.wav'), 100, 1)
-
-	var/datum/effects/system/harmless_smoke_spread/smoke = new /datum/effects/system/harmless_smoke_spread()
-
-	if(smoke_spread)
-		smoke.set_up(5, 0, usr.loc)
-		smoke.attach(usr)
-		smoke.start()
-
-	var/list/L = list()
-	for(var/turf/T in get_area_turfs(thearea.type))
-		if(!T.density)
-			var/clear = 1
-			for(var/obj/O in T)
-				if(O.density)
-					clear = 0
-					break
-			if(clear)
-				L+=T
-
-	M.loc = pick(L)
-
-	if(smoke_spread)
-		smoke.start()
\ No newline at end of file
diff --git a/code/datums/spells/turf_teleport.dm b/code/datums/spells/turf_teleport.dm
new file mode 100644
index 0000000000..49d3d6a595
--- /dev/null
+++ b/code/datums/spells/turf_teleport.dm
@@ -0,0 +1,34 @@
+/obj/spell/targeted/turf_teleport
+	name = "Turf Teleport"
+	desc = "This spell teleports the target to the turf in range."
+
+	var/inner_tele_radius = 1
+	var/outer_tele_radius = 2
+
+	var/include_space = 0 //whether it includes space tiles in possible teleport locations
+	var/include_dense = 0 //whether it includes dense tiles in possible teleport locations
+
+/obj/spell/targeted/turf_teleport/cast(list/targets)
+	for(var/mob/target in targets)
+		var/list/turfs = new/list()
+		for(var/turf/T in range(target,outer_tele_radius))
+			if(T in range(target,inner_tele_radius)) continue
+			if(istype(T,/turf/space) && !include_space) continue
+			if(T.density && !include_dense) continue
+			if(T.x>world.maxx-outer_tele_radius || T.x<outer_tele_radius)	continue	//putting them at the edge is dumb
+			if(T.y>world.maxy-outer_tele_radius || T.y<outer_tele_radius)	continue
+			turfs += T
+
+		if(!turfs.len)
+			var/list/turfs_to_pick_from = list()
+			for(var/turf/T in orange(target,outer_tele_radius))
+				if(!(T in orange(target,inner_tele_radius)))
+					turfs_to_pick_from += T
+			turfs += pick(/turf in turfs_to_pick_from)
+
+		var/turf/picked = pick(turfs)
+
+		if(!picked || !isturf(picked))
+			return
+
+		target.loc = picked
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
new file mode 100644
index 0000000000..8f50e10139
--- /dev/null
+++ b/code/datums/spells/wizard.dm
@@ -0,0 +1,183 @@
+/obj/spell/targeted/projectile/fireball
+	name = "Fireball"
+	desc = "This spell fires a fireball at a target and does not require wizard garb."
+
+	school = "evocation"
+	charge_max = 200
+	clothes_req = 0
+	invocation = "ONI SOMA"
+	invocation_type = "shout"
+
+	proj_icon_state = "fireball"
+	proj_name = "a fireball"
+	proj_lingering = 1
+	proj_type = "/obj/spell/targeted/explosion/fireball"
+
+/obj/spell/targeted/explosion/fireball
+	ex_severe = -1
+	ex_heavy = -1
+	ex_light = 3
+	ex_flash = 5
+
+/obj/spell/targeted/projectile/magic_missile
+	name = "Magic Missile"
+	desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
+
+	school = "evocation"
+	charge_max = 100
+	clothes_req = 1
+	invocation = "FORTI GY AMA"
+	invocation_type = "shout"
+	range = 7
+
+	max_targets = 0
+
+	proj_icon_state = "magicm"
+	proj_name = "a magic missile"
+	proj_lingering = 1
+	proj_type = "/obj/spell/targeted/inflict_handler/magic_missile"
+
+	proj_lifespan = 20
+	proj_step_delay = 5
+
+	proj_trail = 1
+	proj_trail_lifespan = 5
+	proj_trail_icon_state = "magicmd"
+
+/obj/spell/targeted/inflict_handler/magic_missile
+	amt_weaken = 5
+	amt_dam_fire = 10
+
+/obj/spell/targeted/genetic/blind //doesn't work properly
+	name = "Blind"
+	desc = "This spell temporarily blinds a single person and does not require wizard garb."
+
+	school = "transmutation"
+	charge_max = 300
+	clothes_req = 0
+	invocation = "STI KALY"
+	invocation_type = "whisper"
+	message = "\blue Your eyes cry out in pain!"
+
+	disabilities = 1
+	duration = 300
+
+/obj/spell/targeted/genetic/mutate
+	name = "Mutate"
+	desc = "This spell causes you to turn into a hulk and gain telekinesis for a short while."
+
+	school = "transmutation"
+	charge_max = 400
+	clothes_req = 1
+	invocation = "BIRUZ BENNAR"
+	invocation_type = "shout"
+	message = "\blue You feel strong! Your mind expands!"
+	range = -1
+	include_usr = 1
+
+	mutations = 9
+	duration = 300
+
+/obj/spell/targeted/inflict_handler/disintegrate
+	name = "Disintegrate"
+	desc = "This spell instantly kills somebody adjacent to you with the vilest of magick."
+
+	school = "evocation"
+	charge_max = 600
+	clothes_req = 1
+	invocation = "EI NATH"
+	invocation_type = "shout"
+	range = 1
+
+	destroys = "disintegrate"
+
+	sparks_spread = 1
+	sparks_amt = 4
+
+/obj/spell/targeted/smoke
+	name = "Smoke"
+	desc = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb."
+
+	school = "conjuration"
+	charge_max = 120
+	clothes_req = 0
+	invocation = "none"
+	invocation_type = "none"
+	range = -1
+	include_usr = 1
+
+	smoke_spread = 2
+	smoke_amt = 10
+
+/obj/spell/targeted/emplosion/disable_tech
+	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
+	include_usr = 1
+
+	emp_heavy = 5
+	emp_light = 7
+
+/obj/spell/targeted/turf_teleport/blink
+	name = "Blink"
+	desc = "This spell randomly teleports you a short distance."
+
+	school = "abjuration"
+	charge_max = 20
+	clothes_req = 1
+	invocation = "none"
+	invocation_type = "none"
+	range = -1
+	include_usr = 1
+
+	smoke_spread = 1
+	smoke_amt = 10
+
+	inner_tele_radius = 0
+	outer_tele_radius = 6
+
+/obj/spell/targeted/area_teleport/teleport
+	name = "Teleport"
+	desc = "This spell teleports you to a type of area of your selection."
+
+	school = "abjuration"
+	charge_max = 600
+	clothes_req = 1
+	invocation = "SCYAR NILA"
+	invocation_type = "shout"
+	range = -1
+	include_usr = 1
+
+	smoke_spread = 1
+	smoke_amt = 5
+
+/obj/spell/aoe_turf/conjure/forcewall
+	name = "Forcewall"
+	desc = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb."
+
+	school = "transmutation"
+	charge_max = 100
+	clothes_req = 0
+	invocation = "TARCOL MINTI ZHERI"
+	invocation_type = "whisper"
+	range = 0
+
+	summon_type = list("/obj/forcefield")
+	summon_lifespan = 300
+
+/obj/spell/aoe_turf/conjure/carp
+	name = "Summon Bigger Carp"
+	desc = "This spell conjures an elite carp."
+
+	school = "conjuration"
+	charge_max = 1200
+	clothes_req = 1
+	invocation = "NOUK FHUNMM SACP RISSKA"
+	invocation_type = "shout"
+	range = 1
+
+	summon_type = list("/obj/livestock/spesscarp/elite")
\ No newline at end of file
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index 45a80f8df1..f7c6880ca2 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -175,7 +175,7 @@
 		wizard_mob.verbs += /client/proc/jaunt
 		wizard_mob.mind.special_verbs += /client/proc/jaunt
 	else
-		wizard_mob.spell_list += new /obj/spell/ethereal_jaunt(usr)
+		wizard_mob.spell_list += new /obj/spell/targeted/ethereal_jaunt(usr)
 
 	//So zards properly get their items when they are admin-made.
 	del(wizard_mob.wear_suit)
@@ -394,43 +394,43 @@
 					if(!already_knows)
 						switch(href_list["spell_choice"])
 							if ("1")
-								usr.spell_list += new /obj/spell/magic_missile(usr)
+								usr.spell_list += new /obj/spell/targeted/projectile/magic_missile(usr)
 								src.temp = "This spell fires several, slow moving, magic projectiles at nearby targets. If they hit a target, it is paralyzed and takes minor damage."
 							if ("2")
-								usr.spell_list += new /obj/spell/fireball(usr)
+								usr.spell_list += new /obj/spell/targeted/projectile/fireball(usr)
 								src.temp = "This spell fires a fireball at a target and does not require wizard garb. Be careful not to fire it at people that are standing next to you."
 							if ("3")
-								usr.spell_list += new /obj/spell/disintegrate(usr)
+								usr.spell_list += new /obj/spell/targeted/inflict_handler/disintegrate(usr)
 								src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown."
 							if ("4")
-								usr.spell_list += new /obj/spell/disable_tech(usr)
+								usr.spell_list += new /obj/spell/targeted/emplosion/disable_tech(usr)
 								src.temp = "This spell disables all weapons, cameras and most other technology in range."
 							if ("5")
-								usr.spell_list += new /obj/spell/smoke(usr)
+								usr.spell_list += new /obj/spell/targeted/smoke(usr)
 								src.temp = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb."
 							if ("6")
-								usr.spell_list += new /obj/spell/blind(usr)
+								usr.spell_list += new /obj/spell/targeted/genetic/blind(usr)
 								src.temp = "This spell temporarly blinds a single person and does not require wizard garb."
 							if ("7")
-								usr.spell_list += new /obj/spell/mind_transfer(usr)
+								usr.spell_list += new /obj/spell/targeted/mind_transfer(usr)
 								src.temp = "This spell allows the user to switch bodies with a target. Careful to not lose your memory in the process."
 							if ("8")
-								usr.spell_list += new /obj/spell/forcewall(usr)
+								usr.spell_list += new /obj/spell/aoe_turf/conjure/forcewall(usr)
 								src.temp = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb."
 							if ("9")
-								usr.spell_list += new /obj/spell/blink(usr)
+								usr.spell_list += new /obj/spell/targeted/turf_teleport/blink(usr)
 								src.temp = "This spell randomly teleports you a short distance. Useful for evasion or getting into areas if you have patience."
 							if ("10")
-								usr.spell_list += new /obj/spell/teleport(usr)
+								usr.spell_list += new /obj/spell/targeted/area_teleport/teleport(usr)
 								src.temp = "This spell teleports you to a type of area of your selection. Very useful if you are in danger, but has a decent cooldown, and is unpredictable."
 							if ("11")
-								usr.spell_list += new /obj/spell/mutate(usr)
+								usr.spell_list += new /obj/spell/targeted/genetic/mutate(usr)
 								src.temp = "This spell causes you to turn into a hulk and gain telekinesis for a short while."
 							if ("12")
-								usr.spell_list += new /obj/spell/ethereal_jaunt(usr)
+								usr.spell_list += new /obj/spell/targeted/ethereal_jaunt(usr)
 								src.temp = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
 							if ("13")
-								usr.spell_list += new /obj/spell/knock(usr)
+								usr.spell_list += new /obj/spell/aoe_turf/knock(usr)
 								src.temp = "This spell opens nearby doors and does not require wizard garb."
 			if (href_list["spell_choice"] == "14")
 				var/area/wizard_station/A = locate()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4032c53ebf..10283bbce2 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -476,7 +476,7 @@
 				src.laws = new /datum/ai_laws/syndicate_override
 				var/time = time2text(world.realtime,"hh:mm:ss")
 				lawchanges.Add("[time] <B>:</B> [user.name]([user.key]) emagged [src.name]([src.key])")
-				set_zeroth_law("Only [usr] is a syndicate operative.")
+				set_zeroth_law("Only [user.name] and people he designates as being such are syndicate agents.")
 				src << "\red ALERT: Foreign software detected."
 				sleep(5)
 				src << "\red Initiating diagnostics..."
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 3857a271881d857573e6872ef0c9c71e5a87b614..d8cd49aab9938c716c0c2f8d59899edc24b039fa 100644
GIT binary patch
literal 6618
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
TSDgB@2GG4}q+PCM_xxV~ZqtM$

literal 3155
zcma)9c~H|?68>>0cmP31KoA1T;empHTyljY2y)9Ihyfir1QdjDm_QPg2`WZp5CH)J
zxeo(!-vON!l*>3kh>!&2FeH#D5J;jS%ht};Zf(tM?H})TRd?5`ey{uW_w{`@7kjDQ
zin{>-ka9R@>#;3owpXv@&h1?}Ig+$32nf%MaND4mpQEow!LLW&1b~Em+~dLBuXRCo
zq<21hSG<24>llLim8NaTU%P6r<OEi)N+-k<?M_r?_)6u+v`;H+@QN!{PwYV*VZv$2
zDe&&uWqdddlXBy=uMPhrcj=ajd2-5tRA`-SNOOy{y5z`++@)w$wb@$DyRMH_y{~$Y
zh3@5%9ppzu&mJ4k(=}9ppG4iPM~3TCA{61*?(+O(TOeU(Tj#!;io5GhZpu&ujcmuS
z3aiKO)@pP2m_I}t-SX&Z0f0TO4z>`_g!~oCX!xNo%KhKia`K4!Xps3))n5ZEJ-!w{
z*)?w*E(x(XXp?e48S&&%oI>;x_;K37eKw~W`&HDFrTZ$h56@7}SE||U(s*1N7^VxC
z`CIBhs&(=2Z&<bVA6a22bX*)&2PD_hMI#f}a=+x}hJ0DtyHiZ8=-Ua-PT&R<5K$AA
zl$5oyx(A3_i-SOiF&H;I(1Dk4$IEARpSGIvALN7mNolnqhKVG$=PQU+9{ic{{<pE+
zp~mw7X7NO#G`#~hzvan}TEEIwkS?imWQ)|$3+UhKtMw#w$x}zIi}5l!xjP^r<wJ+y
zLqmK4s;RrXpynjZMBLes`)%{P9C}!Z?{!AKs~SbInI(p*EAt;gODd;Upo|qa1sv2J
zB>r(TDLQ&zL4N*EpRgyyCQD)EtP_ptU`u@C^fdqdisT)uXkd~;X)Y-_;+v%3n5`4=
z>C-2_Vp8QiG|{&>7X2QTT!G)C2LajM600nsYD-8+6r@{jO@1zREBLHJr_%@G;^Ud8
zBK!OM<p`TN9PSeh9bNcE8THI7O8O#aM`n<T#33A%$YSA@!Qi|XBI>O+zLt`A=pzMZ
zKPDCJ6NjvCOhuBEdJPy|VebxjR3`FPN<zcK2Q7ZAtW2-ytbsgZM{iKwo_vKABL%TY
zCsd)=T=47CrEl~D?#*e%N?q?sRL6G7{iE2bRYR-kwes8@He9#nYcs3Z(b{Bl)p|#+
znX0PopJWRpBAz1oC#LsZhT=0SBezZaV9x1kvLv1Tg%Y-!b8o>TJfDhHP$e@P2OMs`
zJ{O-)wgh3lgCxf|HCBMqRcd|s)8mRWSvX5?cgd$EC{y3C{k=Ocnk_#oo8FmF^^HBs
z>!Z$({%TWiz`1ZfpwkVQ)3P~m`>2%M`J{Q*<F7<u6z=9q>|pChn|e6s_W`%Fn>X$?
zJWspFix#X7Yg&SX6%EU(EgQcq4f6**v@Z*q^p=Izt!fsgNrNpdEz6DZJ;zq{a?~gp
zmP^(;GseNQZL&{LF2>;oi~jWc)ds@Dq1WYD!Wt?XD=6%g&}O#ZYm2zW{k%X%$oK5C
zR1hXQn9rKb5y#v5OuWNNT)mKfmb^3Mr`i?Q_Y6^lUl=+G!h;*=VwJBXv=Ap?XFnpx
zW%#_q)7Y*wx9BSmt4AF|x>3=wrGDPWcFS}0x}S-ju4!cs^S+z5l(0T6bPJ&_c2iU;
zE5D#1mu&n{fU-0dY?6qDLSAyNSB#4yVbQ)KlAKMmcyLEG=M<>Drw3-k-A9=zQ|Ub=
z9!U*)-QZ8Z74#VjMhBG5BfA-b3YtzkvUfg%FtD%N&J4Yk$QPh#+)-{`eD%xr=H{Sa
zLl#f#^Ib@D@R|DC_S2?_I~~Z*+l)`xv{<=r;rf(ksANY^&&`mKkY9Xu4Tn+d>)xx;
zXR>HZu+0~vR9^58e&&^U0xf-FVj|2!vI+}xc>OgCj`wjgVH4bd__(<8w6W}lGslLN
zSYAn|LnoLg5L;_~m$0y--rrh`)3AA&=t~KY{F|4XV<hTpH4wMRQKRg(RM@rIc}M?M
z&k#g&<XfGy7BaP=&;cG_ew?^pD*)YhBj?T{OPC;pakliA(d92rz8bqw|7%#`{e}(>
zb5bZC^{%So#qc!t{H8`Dn3v~4U<h0RCDjW@E-twq31#@S3wH(Dlon<XItu$QOw@%5
zx2w=Wzbs<hG6P>5@V6~3%z%@?NiJ5Px81xdGh!ggUXcI#9=HW+k8(uP7B3*rpYTlt
zZq7#KF<U8l6%{n2c2tR&f)UDVyX=XHIO(EXa+>as7sDK41Wu}md3$qZ5qBv#IBxCj
z%MPSkY*H=OzwlnbgZ2cY$mxbU7ehnRa#d1n!<G2>o4MqYiLrjifoZXx=QtFvW=x{D
zyxHqZ=9TPv3&oQcWO5eQE@qkSR=((7h3xe#+>QV2PVe1)eq1crukhu2I|$}LOpr{@
z^{nT|<#*)TC+#lBr$a9(SaJ9fz14&9;HU{Zw{dG_hRV6iVBAx4%zMr(=0N5eaec7C
zVwz!M^rk$*(hRA$F8C#L#~5cyGX%(FmdLj0IaM?`2Tyu>%(F&LlGcWXmal@g&DFh(
zb18M&x8~5Y*no%NQ{gS`!L9*YTe!{Pp$Q?kvm*HE%{DNMtG^Kws<Rax-9N;NFdY#i
zt+D#m+(?m)q9W>vK?nI;N47PQrXzQ+$uw=v>C9n;bERj%2WlF56$SkpZyL334F^@x
zf`6Hi=z8e3m_^4$=)LMp+%wX*9l~)WP{w@ovd2Lz>x@UNpv5;q>8e@Q&?|0N;4__&
zxAL=MdY!8lGt(d!jhnqb?Rrcz2IuuShZtIgEz-|kF6ekXVERVFz@L$;n~iwwD?W?l
zwW7NMd|n3CrUwtgWf%QjjrW^_AKNX~6#Whw;kACwdosKZ%evQL@$4iisW*tR0Lv$T
z&kNVwlf12Z`6^wb3H;prRp;3w`ud%n`VT@bHkDg=TmLL(ye_c+9jcRar5K++{$Ub$
zYpDDMlE*9|D=PQ4k=!{J41Q=2RN{jZjk_IRL_uF*5fuwvilYpOD!D?^z@jrb<YaQ7
zZtV|7eFthPwyu-7ZgTFOfSn@+3!({eY>{NmBN)tIb?|K{{=?+CTCzkmpx`eF^gf?=
zGEXi5S}qq+F>#%X)E){WpzkZQPG)RMb$mk$NvJugvmzqo%%-9f*4EdNK}lXKWyB2)
z^Nps3x+)~5(2{5CtMc7PC|Ui+Byg(Cmm`;@hPgpv=?69@x0s1Um~eu)Ept$_{{w7-
zVBq>?4iRHmBJt-K^zR$|fn4vvLsQ+<RnAgQFEwlxXfX5M5;8hq28Z|!KsvO9KFhNC
zzRtZcH8~kdN&bzAAjW6-X3#`LJO>Y2)iIr+(y)0M1GTPrb}^+hBzWTk)`qab$20BN
zu|q$xX|df)1H;Tkp)y@;fDdm^%vNZVNnMC=^k!>3%eSm-jhp_Sa~&!=hnNG&nE?NE
z+M9~17|3YdyVc9C#P-c?noDEC6j(ApT!?oIEikpN*?D@2rx#4<QS^8Q>-HcN7>89E
z0gkIc^g)#yZ*d9#!JGankMFxIW~!IsIvLJZX+*Jqv8=!H{^QM}cYKX%&>Jdd+NIw2
zx(Zy&Jb^)Ga)1piO3O?^c)0-b@b0Jx;GE5yJC}-=Uy%~HkT{3;4DYP_;j-BwF9jR#
zJZHbj=glm<9PQ62deSbjS4I<OY0#+K#443|Am$#M4yPlC28mZf7jsOy5y-$I?Of3W
zIwFH$v~>NDz7~84k*RSr+;8Ei%9bWG_4|E-grd68>%#}_X(RoR{4R*I$Uk`B`Uoi=
zVYqTXS@Ydby)oTGrTsC8IzsxW%;2Xs-<>vu{j9<|rZ`6#!00Xbfj=zeI;Xxs1{?a8
zx8kqN^!z+A<(lHs1T}T@Tm)3MkDF?n)zV2EyDi;fw0?FGL7csYiy9Gr@H9Jsn*xEZ
g9#{NdRk@B%QK>2`JciHOo)Q2DI~QBLb>N-915NG~EdT%j

diff --git a/tgstation.dme b/tgstation.dme
index d42aa0902f..21af7e5ff3 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -201,20 +201,19 @@
 #include "code\datums\diseases\xeno_transformation.dm"
 #include "code\datums\helper_datums\construction_datum.dm"
 #include "code\datums\helper_datums\global_iterator.dm"
+#include "code\datums\spells\area_teleport.dm"
 #include "code\datums\spells\blind.dm"
-#include "code\datums\spells\blink.dm"
 #include "code\datums\spells\conjure.dm"
-#include "code\datums\spells\disable_tech.dm"
-#include "code\datums\spells\disintegrate.dm"
+#include "code\datums\spells\emplosion.dm"
 #include "code\datums\spells\ethereal_jaunt.dm"
-#include "code\datums\spells\fireball.dm"
-#include "code\datums\spells\forcewall.dm"
+#include "code\datums\spells\explosion.dm"
+#include "code\datums\spells\genetic.dm"
+#include "code\datums\spells\inflict_handler.dm"
 #include "code\datums\spells\knock.dm"
-#include "code\datums\spells\magic_missile.dm"
 #include "code\datums\spells\mind_transfer.dm"
-#include "code\datums\spells\mutate.dm"
-#include "code\datums\spells\smoke.dm"
-#include "code\datums\spells\teleport.dm"
+#include "code\datums\spells\projectile.dm"
+#include "code\datums\spells\turf_teleport.dm"
+#include "code\datums\spells\wizard.dm"
 #include "code\defines\atom.dm"
 #include "code\defines\client.dm"
 #include "code\defines\global.dm"