Merge pull request #2890 from VitrescentTortoise/bleeding-edge-freeze

Fixed forcewalls spell and xenoarchaeology picksets, also gave nuke team magboots.

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")
+	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

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -22,6 +22,7 @@
 	new /obj/item/weapon/card/id/syndicate(src)
 	new /obj/item/device/multitool(src)
 	new /obj/item/weapon/shield/energy(src)
+	new /obj/item/clothing/shoes/magboots(src)
 
 
 /obj/structure/closet/syndicate/nuclear

code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm

@@ -118,7 +118,7 @@
 	"/obj/item/weapon/pickaxe/five_pick",\
 	"/obj/item/weapon/pickaxe/six_pick",\
 	"/obj/item/weapon/pickaxe/hand")
-	max_combined_w_class = 11
+	max_combined_w_class = 17
 	max_w_class = 4
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
 

html/changelog.html

@@ -59,6 +59,16 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+	<h2 class="date">May 28th, 2013</h2>
+	<h3 class="author">VitrescentTortoise updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Wizard's forcewall now works.</li>
+	</ul>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Xenoarchaeology picksets can now hold everything they started with.</li>
+	</ul>
+</div>
 
 <div class='commit sansserif'>
 	<h2 class='date'>26th May 2013</h2>