The Staff of Change now has its own sprite/in hands.

The Wizard Spellbook has a new subsection: Artefacts. Artefacts are items with special properties that the wizard can purchase as an alternative to spells (one artefact costs as much as one spell)

Currently the only Artefact is the Staff of Change, more to follow.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2739 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/weapon.dm

@@ -1007,7 +1007,7 @@
 	var/uses = 4.0
 	var/temp = null
 	var/spell_type = "verb"
-	var/max_uses = 5
+	var/max_uses = 4
 
 /obj/item/weapon/spellbook/object_type_spells //used for giving out object spells as opposed to verb spells
 	spell_type = "object"

code/game/gamemodes/wizard/spellbook.dm

@@ -26,7 +26,12 @@
 		dat += "<A href='byond://?src=\ref[src];spell_choice=12'>Ethereal Jaunt</A> (60)<BR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=13'>Knock</A> (10)<BR>"
 		dat += "<HR>"
-		dat += "<A href='byond://?src=\ref[src];spell_choice=14'>Re-memorize Spells</A><BR>"
+		dat += "<B>Artefacts:</B><BR>"
+		dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.<BR>"
+		dat += "<HR>"
+		dat += "<A href='byond://?src=\ref[src];spell_choice=14'>Staff of Change</A><BR>"
+		dat += "<HR>"
+		dat += "<A href='byond://?src=\ref[src];spell_choice=15'>Re-memorize Spells</A><BR>"
 	user << browse(dat, "window=radio")
 	onclose(user, "radio")
 	return
@@ -97,6 +102,10 @@
 							usr.verbs += /client/proc/knock
 							usr.mind.special_verbs += /client/proc/knock
 							src.temp = "This spell opens nearby doors and does not require wizard garb."
+						if ("14")
+							new /obj/item/weapon/gun/energy/staff(get_turf(usr))
+							src.temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
+							src.max_uses--
 				else if(spell_type == "object")
 					var/list/available_spells = list("Magic Missile","Fireball","Disintegrate","Disable Tech","Smoke","Blind","Mind Transfer","Forcewall","Blink","Teleport","Mutate","Ethereal Jaunt","Knock")
 					var/already_knows = 0
@@ -147,7 +156,11 @@
 							if ("13")
 								usr.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(usr)
 								src.temp = "This spell opens nearby doors and does not require wizard garb."
-			if (href_list["spell_choice"] == "14")
+							if ("14")
+								new /obj/item/weapon/gun/energy/staff(get_turf(usr))
+								src.temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
+								src.max_uses--
+			if (href_list["spell_choice"] == "15")
 				var/area/wizard_station/A = locate()
 				if(usr in A.contents)
 					src.uses = src.max_uses

code/modules/projectiles/guns/energy/special.dm

@@ -24,9 +24,10 @@ obj/item/weapon/gun/energy/staff
 	name = "staff of change"
 	desc = "an artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
 	icon = 'gun.dmi'
-	icon_state = "staff"
-	item_state = "staff"
+	icon_state = "staffofchange"
+	item_state = "staffofchange"
 	fire_sound = 'emitter.ogg'
+	w_class = 4.0
 	charge_cost = 200
 	projectile_type = "/obj/item/projectile/change"
 	origin_tech = null

html/changelog.html

@@ -69,6 +69,8 @@ should be listed in the changelog upon commit tho. Thanks. -->
    <li><b>Kor updated:</b>
   <ul>
 	<li>Escape pods no longer go to the horrific gibbing chambers. Rather, they will be picked up by a salvage ship in deep space. (This basically changes nothing mechanics wise, just fluff)</li>
+	<li>The wizard can now purchase magic artefacts in addition to spells in a subsection of the spellbook.</li>
+	<li>The first (and currently only) new artefact is the Staff of Change, which functions as a self recharging energy weapon with some special effects.</li>
   </ul>
   </li>
 </ul>

tgstation.dme

@@ -161,7 +161,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"