The Wizard no longer starts with Ethereal Jaunt.

Instead, the spellbook simply starts with an extra use. This will save you the trouble of re-memorizing if you do not want to take ethereal jaunt.

Put an Ion Rifle on the nuke ops shuttle which will hopefully help with nuke teams getting routinely destroyed by sec borgs.

Fixed a wizard spawn message which referred to a no longer existing item (it mentioned "two" artifacts in your pockets,though you no longer spawn with a scrying gem)

Added Magus Helm sprites/object, which as of now does not spawn and is just an alternative wizard hat (counts for spell requirements).

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

code/datums/mind.dm

@@ -556,7 +556,7 @@ datum/mind
 					if(!(src in ticker.mode.wizards))
 						ticker.mode.wizards += src
 						special_role = "Wizard"
-						ticker.mode.learn_basic_spells(current)
+						//ticker.mode.learn_basic_spells(current)
 						current << "<B>\red You are the Space Wizard!</B>"
 				if("lair")
 					current.loc = pick(wizardstart)

code/defines/obj/weapon.dm

@@ -1004,10 +1004,10 @@
 	throw_range = 5
 	w_class = 1.0
 	flags = FPRINT | TABLEPASS
-	var/uses = 4.0
+	var/uses = 5.0
 	var/temp = null
 	var/spell_type = "verb"
-	var/max_uses = 4
+	var/max_uses = 5
 
 /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

@@ -13,7 +13,7 @@
 		dat += "<B>Memorize which spell:</B><BR>"
 		dat += "<I>The number after the spell name is the cooldown time.</I><BR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=1'>Magic Missile</A> (10)<BR>"
-		dat += "<A href='byond://?src=\ref[src];spell_choice=2'>Fireball</A> (10)<BR>"
+		dat += "<A href='byond://?src=\ref[src];spell_choice=2'>Fireball</A> (20)<BR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=3'>Disintegrate</A> (60)<BR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=4'>Disable Technology</A> (60)<BR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=5'>Smoke</A> (10)<BR>"

code/game/gamemodes/wizard/wizard.dm

@@ -47,7 +47,7 @@
 /datum/game_mode/wizard/post_setup()
 	for(var/datum/mind/wizard in wizards)
 		forge_wizard_objectives(wizard)
-		learn_basic_spells(wizard.current)
+		//learn_basic_spells(wizard.current)
 		equip_wizard(wizard.current)
 		name_wizard(wizard.current)
 		greet_wizard(wizard)
@@ -138,7 +138,7 @@
 	return
 
 
-/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
+/*/datum/game_mode/proc/learn_basic_spells(mob/living/carbon/human/wizard_mob)
 	if (!istype(wizard_mob))
 		return
 	if(!config.feature_object_spell_system)
@@ -146,7 +146,7 @@
 		wizard_mob.mind.special_verbs += /client/proc/jaunt
 	else
 		wizard_mob.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(usr)
-
+*/
 
 /datum/game_mode/proc/equip_wizard(mob/living/carbon/human/wizard_mob)
 	if (!istype(wizard_mob))
@@ -175,7 +175,7 @@
 		wizard_mob.equip_if_possible(new /obj/item/weapon/spellbook(wizard_mob), wizard_mob.slot_r_hand)
 
 	wizard_mob << "You will find a list of available spells in your spell book. Choose your magic arsenal carefully."
-	wizard_mob << "In your pockets you will find two more important, magical artifacts. Use them as needed."
+	wizard_mob << "In your pockets you will find a teleport scroll. Use it as needed."
 	wizard_mob.mind.store_memory("<B>Remember:</B> do not forget to prepare your spells.")
 	return 1
 

code/modules/admin/verbs/randomverbs.dm

@@ -403,7 +403,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			ticker.mode.equip_traitor(new_character)
 		if("Wizard")
 			new_character.loc = pick(wizardstart)
-			ticker.mode.learn_basic_spells(new_character)
+			//ticker.mode.learn_basic_spells(new_character)
 			ticker.mode.equip_wizard(new_character)
 		if("Syndicate")
 			var/obj/effect/landmark/synd_spawn = locate("landmark*Syndicate-Spawn")

code/modules/clothing/suits/robe.dm

@@ -19,6 +19,13 @@
 	desc = "Strange-looking hat-wear, makes you want to cast fireballs."
 	icon_state = "marisa"
 
+/obj/item/clothing/head/wizard/magus
+	name = "Magus Helm"
+	desc = "A mysterious helmet that hums with an unearthly power"
+	icon_state = "magus"
+	item_state = "magus"
+
+
 /obj/item/clothing/suit/wizrobe
 	name = "wizard robe"
 	desc = "A magnificant, gem-lined robe that seems to radiate power."