From 6e3079f077b8803be314df99d7b73299c8dfc87b Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Mon, 19 Dec 2011 11:54:11 +0000 Subject: [PATCH] Tg UPdate: 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 | 2 +- code/game/gamemodes/wizard/wizard.dm | 8 ++++---- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/clothing/suits/robe.dm | 7 +++++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 5457a2832c3..afd7e566b97 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -560,7 +560,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 << "\red You are the Space Wizard!" if("lair") current.loc = pick(wizardstart) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 08c6654f2d9..3105aeb210b 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -50,7 +50,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) @@ -141,7 +141,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) @@ -149,7 +149,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)) @@ -178,7 +178,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("Remember: do not forget to prepare your spells.") return 1 diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 3e03a28f4a5..38735065726 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -388,7 +388,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") diff --git a/code/modules/clothing/suits/robe.dm b/code/modules/clothing/suits/robe.dm index fe5d5ca3c29..f393718186d 100644 --- a/code/modules/clothing/suits/robe.dm +++ b/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."