From 9ba719e4e1f5f560a858864dcb5d908970c1e2d8 Mon Sep 17 00:00:00 2001
From: VitrescentTortoise <max.blackllama@gmail.com>
Date: Tue, 28 May 2013 18:32:59 -0700
Subject: [PATCH] Fixed forcewalls.

---
 code/datums/spells/conjure.dm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm
index 233b60d31c1..de84db5915b 100644
--- a/code/datums/spells/conjure.dm
+++ b/code/datums/spells/conjure.dm
@@ -61,4 +61,27 @@
 	summon_type = list(/obj/machinery/bot/ed209)
 	summon_amt = 10
 	range = 3
-	newVars = list("emagged" = 1,"name" = "Wizard's Justicebot")
\ No newline at end of file
+	newVars = list("emagged" = 1,"name" = "Wizard's Justicebot")
+
+
+//This was previously left in the old wizard code, not being included.
+//Wasn't sure if I should transfer it here, or to code/datums/spells.dm
+//But I decided because it is a conjuration related object it would fit better here
+//Feel free to change this, I don't know.
+/obj/effect/forcefield
+	desc = "A space wizard's magic wall."
+	name = "FORCEWALL"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "m_shield"
+	anchored = 1.0
+	opacity = 0
+	density = 1
+	unacidable = 1
+
+
+	bullet_act(var/obj/item/projectile/Proj, var/def_zone)
+		var/turf/T = get_turf(src.loc)
+		if(T)
+			for(var/mob/M in T)
+				Proj.on_hit(M,M.bullet_act(Proj, def_zone))
+		return
\ No newline at end of file